X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fhttp.c;h=634f3c512cb7d7e8b7a04ae3912968ac99eefdc9;hp=c05dc02109bfb3e682135f8593f742e62ae1a4d4;hb=1346b30779b120691e4145a3578716f77300951e;hpb=f9ee3b9ec26306b6397c37434e8066f084d33b3a diff --git a/src/http.c b/src/http.c index c05dc02..634f3c5 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** @@ -15,62 +15,12 @@ #include #include #include +#include #ifdef WIN32 #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - - -/* - * This function's counterpart, yaz_base64decode(), is in srwutil.c. - * I feel bad that they're not together, but each function is only - * needed in one place, and those places are not together. Maybe one - * day we'll move them into a new httputil.c, and declare them in a - * corresponding httputil.h - */ -static void yaz_base64encode(const char *in, char *out) -{ - static char encoding[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - unsigned char buf[3]; - long n; - - while (*in != 0) { - char *pad = 0; - buf[0] = in[0]; - buf[1] = in[1]; - if (in[1] == 0) { - buf[2] = 0; - pad = "=="; - } else { - buf[2] = in[2]; - if (in[2] == 0) - pad = "="; - } - - /* Treat three eight-bit numbers as on 24-bit number */ - n = (buf[0] << 16) + (buf[1] << 8) + buf[2]; - - /* Write the six-bit chunks out as four encoded characters */ - *out++ = encoding[(n >> 18) & 63]; - *out++ = encoding[(n >> 12) & 63]; - if (in[1] != 0) - *out++ = encoding[(n >> 6) & 63]; - if (in[1] != 0 && in[2] != 0) - *out++ = encoding[n & 63]; - - if (pad != 0) { - while (*pad != 0) - *out++ = *pad++; - break; - } - in += 3; - } - - *out++ = 0; -} - static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, char **content_buf, int *content_len) @@ -109,11 +59,11 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, i++; for (po = i; i < o->size-1 && !strchr("\r\n", o->buf[i]); i++) ; - + (*headers)->value = (char*) odr_malloc(o, i - po + 1); memcpy ((*headers)->value, o->buf + po, i - po); (*headers)->value[i - po] = '\0'; - + if (!strcasecmp((*headers)->name, "Transfer-Encoding") && !strcasecmp((*headers)->value, "chunked")) @@ -133,23 +83,23 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, if (chunked) { int off = 0; - + /* we know buffer will be smaller than o->size - i*/ - *content_buf = (char*) odr_malloc(o, o->size - i); - + *content_buf = (char*) odr_malloc(o, o->size - i); + while (1) { /* chunk length .. */ int chunk_len = 0; for (; i < o->size-2; i++) if (yaz_isdigit(o->buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (o->buf[i] - '0'); else if (yaz_isupper(o->buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (o->buf[i] - ('A'-10)); else if (yaz_islower(o->buf[i])) - chunk_len = chunk_len * 16 + + chunk_len = chunk_len * 16 + (o->buf[i] - ('a'-10)); else break; @@ -192,7 +142,7 @@ static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, *content_buf = 0; *content_len = 0; } - else + else { *content_len = o->size - i; *content_buf = (char*) odr_malloc(o, *content_len + 1); @@ -327,11 +277,11 @@ Z_GDU *z_get_HTTP_Request_uri(ODR odr, const char *uri, const char *args, cp0 = cp0+3; else cp0 = uri; - + cp1 = strchr(cp0, '/'); if (!cp1) cp1 = cp0+strlen(cp0); - + if (cp0 && cp1) { char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1); @@ -378,7 +328,7 @@ Z_GDU *z_get_HTTP_Response(ODR o, int code) if (code != 200) { hres->content_buf = (char*) odr_malloc(o, 400); - sprintf(hres->content_buf, + sprintf(hres->content_buf, "\n" "\n" @@ -386,7 +336,7 @@ Z_GDU *z_get_HTTP_Response(ODR o, int code) " YAZ " YAZ_VERSION "\n" " \n" " \n" - "

YAZ " + "

YAZ " YAZ_VERSION "

\n" "

Error: %d

\n" "

Description: %.50s

\n" @@ -419,11 +369,11 @@ int yaz_decode_http_response(ODR o, Z_HTTP_Response **hr_p) { int i, po; Z_HTTP_Response *hr = (Z_HTTP_Response *) odr_malloc(o, sizeof(*hr)); - + *hr_p = hr; hr->content_buf = 0; hr->content_len = 0; - + po = i = 5; while (i < o->size-2 && !strchr(" \r\n", o->buf[i])) i++; @@ -446,16 +396,16 @@ int yaz_decode_http_response(ODR o, Z_HTTP_Response **hr_p) while (i < o->size-1 && o->buf[i] != '\n') i++; return decode_headers_content(o, i, &hr->headers, - &hr->content_buf, &hr->content_len); + &hr->content_buf, &hr->content_len); } int yaz_decode_http_request(ODR o, Z_HTTP_Request **hr_p) { int i, po; Z_HTTP_Request *hr = (Z_HTTP_Request *) odr_malloc(o, sizeof(*hr)); - + *hr_p = hr; - + /* method .. */ for (i = 0; o->buf[i] != ' '; i++) if (i >= o->size-5 || i > 30) @@ -531,7 +481,7 @@ int yaz_encode_http_response(ODR o, Z_HTTP_Response *hr) } odr_write(o, (unsigned char *) "\r\n", 2); if (hr->content_buf) - odr_write(o, (unsigned char *) + odr_write(o, (unsigned char *) hr->content_buf, hr->content_len); if (o->direction == ODR_PRINT)