#include <config.h>
#endif
-#include <yaz/odr.h>
+#include "odr-priv.h"
#include <yaz/yaz-version.h>
#include <yaz/yaz-iconv.h>
#include <yaz/matchstr.h>
#include <yaz/zgdu.h>
#include <yaz/base64.h>
-#ifdef WIN32
-#define strncasecmp _strnicmp
-#define strcasecmp _stricmp
-#endif
-
static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
char **content_buf, int *content_len)
{
int i = off;
int chunked = 0;
+ const char *buf = o->op->buf;
+ int size = o->op->size;
*headers = 0;
- while (i < o->size-1 && o->buf[i] == '\n')
+ while (i < size-1 && buf[i] == '\n')
{
int po;
i++;
- if (o->buf[i] == '\r' && i < o->size-1 && o->buf[i+1] == '\n')
+ if (buf[i] == '\r' && i < size-1 && buf[i+1] == '\n')
{
i++;
break;
}
- if (o->buf[i] == '\n')
+ if (buf[i] == '\n')
break;
for (po = i; ; i++)
{
- if (i == o->size)
+ if (i == size)
{
o->error = OHTTP;
return 0;
}
- else if (o->buf[i] == ':')
+ else if (buf[i] == ':')
break;
}
*headers = (Z_HTTP_Header *) odr_malloc(o, sizeof(**headers));
- (*headers)->name = (char*) odr_malloc(o, i - po + 1);
- memcpy ((*headers)->name, o->buf + po, i - po);
- (*headers)->name[i - po] = '\0';
+ (*headers)->name = odr_strdupn(o, buf + po, i - po);
i++;
- while (i < o->size-1 && o->buf[i] == ' ')
+ while (i < size-1 && buf[i] == ' ')
i++;
- for (po = i; i < o->size-1 && !strchr("\r\n", o->buf[i]); i++)
+ for (po = i; i < size-1 && !strchr("\r\n", 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")
+ (*headers)->value = odr_strdupn(o, buf + po, i - po);
+ if (!yaz_strcasecmp((*headers)->name, "Transfer-Encoding")
&&
- !strcasecmp((*headers)->value, "chunked"))
+ !yaz_strcasecmp((*headers)->value, "chunked"))
chunked = 1;
headers = &(*headers)->next;
- if (i < o->size-1 && o->buf[i] == '\r')
+ if (i < size-1 && buf[i] == '\r')
i++;
}
*headers = 0;
- if (o->buf[i] != '\n')
+ if (buf[i] != '\n')
{
o->error = OHTTP;
return 0;
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, size - i);
while (1)
{
/* chunk length .. */
int chunk_len = 0;
- for (; i < o->size-2; i++)
- if (yaz_isdigit(o->buf[i]))
+ for (; i < size-2; i++)
+ if (yaz_isdigit(buf[i]))
chunk_len = chunk_len * 16 +
- (o->buf[i] - '0');
- else if (yaz_isupper(o->buf[i]))
+ (buf[i] - '0');
+ else if (yaz_isupper(buf[i]))
chunk_len = chunk_len * 16 +
- (o->buf[i] - ('A'-10));
- else if (yaz_islower(o->buf[i]))
+ (buf[i] - ('A'-10));
+ else if (yaz_islower(buf[i]))
chunk_len = chunk_len * 16 +
- (o->buf[i] - ('a'-10));
+ (buf[i] - ('a'-10));
else
break;
/* chunk extension ... */
- while (o->buf[i] != '\r' && o->buf[i+1] != '\n')
+ while (buf[i] != '\r' && buf[i+1] != '\n')
{
- if (i >= o->size-2)
+ if (i >= size-2)
{
o->error = OHTTP;
return 0;
i += 2; /* skip CRLF */
if (chunk_len == 0)
break;
- if (chunk_len < 0 || off + chunk_len > o->size)
+ if (chunk_len < 0 || off + chunk_len > size)
{
o->error = OHTTP;
return 0;
}
/* copy chunk .. */
- memcpy (*content_buf + off, o->buf + i, chunk_len);
+ memcpy (*content_buf + off, buf + i, chunk_len);
i += chunk_len + 2; /* skip chunk+CRLF */
off += chunk_len;
}
}
else
{
- if (i > o->size)
+ if (i > size)
{
o->error = OHTTP;
return 0;
}
- else if (i == o->size)
+ else if (i == size)
{
*content_buf = 0;
*content_len = 0;
}
else
{
- *content_len = o->size - i;
- *content_buf = (char*) odr_malloc(o, *content_len + 1);
- memcpy(*content_buf, o->buf + i, *content_len);
- (*content_buf)[*content_len] = '\0';
+ *content_len = size - i;
+ *content_buf = odr_strdupn(o, buf + i, *content_len);
}
}
return 1;
{
while (*hp)
{
- if (!strcmp((*hp)->name, n))
+ if (!yaz_strcasecmp((*hp)->name, n))
{
(*hp)->value = odr_strdup(o, v);
return;
(*hp)->next = 0;
}
+const char *z_HTTP_header_remove(Z_HTTP_Header **hp, const char *n)
+{
+ while (*hp)
+ {
+ if (!yaz_strcasecmp((*hp)->name, n))
+ {
+ const char *v = (*hp)->value;
+ *hp = (*hp)->next;
+ return v;
+ }
+ hp = &(*hp)->next;
+ }
+ return 0;
+}
+
const char *z_HTTP_header_lookup(const Z_HTTP_Header *hp, const char *n)
{
for (; hp; hp = hp->next)
- if (!yaz_matchstr(hp->name, n))
+ if (!yaz_strcasecmp(hp->name, n))
return hp->value;
return 0;
}
if (cp0 && cp1)
{
- char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
- memcpy (h, cp0, cp1 - cp0);
- h[cp1-cp0] = '\0';
- z_HTTP_header_add(odr, &p->u.HTTP_Request->headers,
- "Host", h);
+ char *h = odr_strdupn(odr, cp0, cp1 - cp0);
+ z_HTTP_header_add(odr, &p->u.HTTP_Request->headers, "Host", h);
}
}
return p;
if (cp0 && cp1)
{
- char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
- memcpy (h, cp0, cp1 - cp0);
- h[cp1-cp0] = '\0';
- z_HTTP_header_add(odr, &p->u.HTTP_Request->headers,
- "Host", h);
+ char *h = odr_strdupn(odr, cp0, cp1 - cp0);
+ z_HTTP_header_add(odr, &p->u.HTTP_Request->headers, "Host", h);
}
if (!args)
return p;
}
-Z_GDU *z_get_HTTP_Response(ODR o, int code)
+Z_GDU *z_get_HTTP_Response_server(ODR o, int code, const char *details,
+ const char *server, const char *server_url)
{
Z_GDU *p = (Z_GDU *) odr_malloc(o, sizeof(*p));
Z_HTTP_Response *hres;
hres->content_buf = 0;
hres->code = code;
hres->version = "1.1";
- z_HTTP_header_add(o, &hres->headers, "Server",
- "YAZ/" YAZ_VERSION);
+ z_HTTP_header_add(o, &hres->headers, "Server", server);
if (code != 200)
{
- hres->content_buf = (char*) odr_malloc(o, 400);
+ const char *http_err = z_HTTP_errmsg(code);
+ size_t sz = 400 + strlen(http_err) + (details ?
+ strlen(details) : 0);
+ hres->content_buf = (char*) odr_malloc(o, sz);
sprintf(hres->content_buf,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\""
" \"http://www.w3.org/TR/html4/strict.dtd\">\n"
"<HTML>\n"
" <HEAD>\n"
- " <TITLE>YAZ " YAZ_VERSION "</TITLE>\n"
+ " <TITLE>%s</TITLE>\n"
" </HEAD>\n"
" <BODY>\n"
- " <P><A HREF=\"http://www.indexdata.com/yaz/\">YAZ</A> "
- YAZ_VERSION "</P>\n"
+ " <P><A HREF=\"%s\">%s</A></P>\n"
" <P>Error: %d</P>\n"
- " <P>Description: %.50s</P>\n"
+ " <P>Description: %s</P>\n", server, server_url, server,
+ code, http_err);
+ if (details)
+ {
+ sprintf(hres->content_buf + strlen(hres->content_buf),
+ "<P>Details: %s</P>\n", details);
+ }
+ sprintf(hres->content_buf + strlen(hres->content_buf),
" </BODY>\n"
- "</HTML>\n",
- code, z_HTTP_errmsg(code));
+ "</HTML>\n");
hres->content_len = strlen(hres->content_buf);
z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/html");
}
return p;
}
+Z_GDU *z_get_HTTP_Response_details(ODR o, int code, const char *details)
+{
+ return z_get_HTTP_Response_server(o, code, details, "YAZ/" YAZ_VERSION,
+ "http://www.indexdata.com/yaz");
+}
+
+Z_GDU *z_get_HTTP_Response(ODR o, int code)
+{
+ return z_get_HTTP_Response_details(o, code, 0);
+}
+
const char *z_HTTP_errmsg(int code)
{
switch (code)
{
int i, po;
Z_HTTP_Response *hr = (Z_HTTP_Response *) odr_malloc(o, sizeof(*hr));
+ const char *buf = o->op->buf;
+ int size = o->op->size;
*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]))
+ while (i < size-2 && !strchr(" \r\n", buf[i]))
i++;
- hr->version = (char *) odr_malloc(o, i - po + 1);
- if (i - po)
- memcpy(hr->version, o->buf + po, i - po);
- hr->version[i-po] = 0;
- if (o->buf[i] != ' ')
+ hr->version = odr_strdupn(o, buf + po, i - po);
+ if (buf[i] != ' ')
{
o->error = OHTTP;
return 0;
}
i++;
hr->code = 0;
- while (i < o->size-2 && o->buf[i] >= '0' && o->buf[i] <= '9')
+ while (i < size-2 && buf[i] >= '0' && buf[i] <= '9')
{
- hr->code = hr->code*10 + (o->buf[i] - '0');
+ hr->code = hr->code*10 + (buf[i] - '0');
i++;
}
- while (i < o->size-1 && o->buf[i] != '\n')
+ while (i < size-1 && buf[i] != '\n')
i++;
return decode_headers_content(o, i, &hr->headers,
&hr->content_buf, &hr->content_len);
{
int i, po;
Z_HTTP_Request *hr = (Z_HTTP_Request *) odr_malloc(o, sizeof(*hr));
+ const char *buf = o->op->buf;
+ int size = o->op->size;
+ int lspace = 0;
*hr_p = hr;
-
/* method .. */
- for (i = 0; o->buf[i] != ' '; i++)
- if (i >= o->size-5 || i > 30)
+ for (i = 0; buf[i] != ' '; i++)
+ if (i >= size-5 || i > 30)
{
o->error = OHTTP;
return 0;
}
- hr->method = (char *) odr_malloc(o, i+1);
- memcpy (hr->method, o->buf, i);
- hr->method[i] = '\0';
- /* path */
- po = i+1;
- for (i = po; o->buf[i] != ' '; i++)
- if (i >= o->size-5)
- {
- o->error = OHTTP;
- return 0;
- }
- hr->path = (char *) odr_malloc(o, i - po + 1);
- memcpy (hr->path, o->buf+po, i - po);
- hr->path[i - po] = '\0';
- /* HTTP version */
- i++;
- if (i > o->size-5 || memcmp(o->buf+i, "HTTP/", 5))
+ hr->method = odr_strdupn(o, buf, i);
+ po = ++i;
+ while (i < size && !strchr("\r\n", buf[i]))
+ {
+ if (buf[i] == ' ')
+ lspace = i;
+ i++;
+ }
+ if (!lspace || i >= size || lspace >= size - 5 ||
+ memcmp(buf + lspace + 1, "HTTP/", 5))
{
o->error = OHTTP;
return 0;
}
- i+= 5;
- po = i;
- while (i < o->size && !strchr("\r\n", o->buf[i]))
- i++;
- hr->version = (char *) odr_malloc(o, i - po + 1);
- memcpy(hr->version, o->buf + po, i - po);
- hr->version[i - po] = '\0';
- /* headers */
- if (i < o->size-1 && o->buf[i] == '\r')
+ hr->path = odr_strdupn(o, buf + po, lspace - po);
+ hr->version = odr_strdupn(o, buf + lspace + 6, i - (lspace + 6));
+ if (i < size-1 && buf[i] == '\r')
i++;
- if (o->buf[i] != '\n')
+ if (buf[i] != '\n')
{
o->error = OHTTP;
return 0;
}
+ /* headers */
return decode_headers_content(o, i, &hr->headers,
&hr->content_buf, &hr->content_len);
}
{
char sbuf[80];
Z_HTTP_Header *h;
- int top0 = o->top;
+ int top0 = o->op->top;
sprintf(sbuf, "HTTP/%s %d %s\r\n", hr->version,
hr->code,
z_HTTP_errmsg(hr->code));
- odr_write2(o, sbuf, strlen(sbuf));
+ odr_write(o, sbuf, strlen(sbuf));
/* use content_len for Content-Length */
sprintf(sbuf, "Content-Length: %d\r\n", hr->content_len);
- odr_write2(o, sbuf, strlen(sbuf));
+ odr_write(o, sbuf, strlen(sbuf));
for (h = hr->headers; h; h = h->next)
{
- if (yaz_matchstr(h->name, "Content-Length"))
+ if (yaz_strcasecmp(h->name, "Content-Length")
+ && yaz_strcasecmp(h->name, "Transfer-Encoding"))
{ /* skip Content-Length if given. content_len rules */
- odr_write2(o, h->name, strlen(h->name));
- odr_write2(o, ": ", 2);
- odr_write2(o, h->value, strlen(h->value));
- odr_write2(o, "\r\n", 2);
+ odr_write(o, h->name, strlen(h->name));
+ odr_write(o, ": ", 2);
+ odr_write(o, h->value, strlen(h->value));
+ odr_write(o, "\r\n", 2);
}
}
- odr_write(o, (unsigned char *) "\r\n", 2);
+ odr_write(o, "\r\n", 2);
if (hr->content_buf)
- odr_write2(o, hr->content_buf, hr->content_len);
+ odr_write(o, hr->content_buf, hr->content_len);
if (o->direction == ODR_PRINT)
{
odr_printf(o, "-- HTTP response:\n");
- dump_http_package(o, (const char *) o->buf + top0, o->top - top0);
+ dump_http_package(o, o->op->buf + top0, o->op->top - top0);
odr_printf(o, "--\n");
}
return 1;
int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr)
{
Z_HTTP_Header *h;
- int top0 = o->top;
-
- odr_write2(o, hr->method, strlen(hr->method));
- odr_write2(o, " ", 1);
- odr_write2(o, hr->path, strlen(hr->path));
- odr_write2(o, " HTTP/", 6);
- odr_write2(o, hr->version, strlen(hr->version));
- odr_write2(o, "\r\n", 2);
+ int top0 = o->op->top;
+
+ odr_write(o, hr->method, strlen(hr->method));
+ odr_write(o, " ", 1);
+ odr_write(o, hr->path, strlen(hr->path));
+ odr_write(o, " HTTP/", 6);
+ odr_write(o, hr->version, strlen(hr->version));
+ odr_write(o, "\r\n", 2);
if (hr->content_len &&
!z_HTTP_header_lookup(hr->headers,
"Content-Length"))
char lstr[60];
sprintf(lstr, "Content-Length: %d\r\n",
hr->content_len);
- odr_write2(o, lstr, strlen(lstr));
+ odr_write(o, lstr, strlen(lstr));
}
for (h = hr->headers; h; h = h->next)
{
- odr_write2(o, h->name, strlen(h->name));
- odr_write2(o, ": ", 2);
- odr_write2(o, h->value, strlen(h->value));
- odr_write2(o, "\r\n", 2);
+ odr_write(o, h->name, strlen(h->name));
+ odr_write(o, ": ", 2);
+ odr_write(o, h->value, strlen(h->value));
+ odr_write(o, "\r\n", 2);
}
- odr_write2(o, "\r\n", 2);
+ odr_write(o, "\r\n", 2);
if (hr->content_buf)
- odr_write2(o, hr->content_buf, hr->content_len);
+ odr_write(o, hr->content_buf, hr->content_len);
if (o->direction == ODR_PRINT)
{
odr_printf(o, "-- HTTP request:\n");
- dump_http_package(o, (const char *) o->buf + top0, o->top - top0);
+ dump_http_package(o, o->op->buf + top0, o->op->top - top0);
odr_printf(o, "--\n");
}
return 1;
projects / yaz-moved-to-github.git / blobdiff