/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#include <yaz/matchstr.h>
#include <yaz/zgdu.h>
#include <yaz/base64.h>
+#include <yaz/comstack.h>
static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
char **content_buf, int *content_len)
static void dump_http_package(ODR o, const char *buf, size_t len)
{
- int i;
+ int i, limit = 8192;
for (i = 0; ; i++)
{
if (i == len)
{
- odr_printf(o, "%.*s\n", i, buf);
+ o->op->stream_write(o, o->op->print, ODR_VISIBLESTRING, buf, i);
break;
}
- else if (i > 8192)
+ else if (i >= limit)
{
- odr_printf(o, "%.*s\n", i, buf);
- odr_printf(o, "(truncated\n", (long) len);
+ o->op->stream_write(o, o->op->print, ODR_VISIBLESTRING, buf, i);
+ odr_printf(o, "(truncated from %ld to %d\n", (long) len, i);
break;
}
else if (buf[i] == 0)
{
- odr_printf(o, "%.*s\n", i, buf);
+ o->op->stream_write(o, o->op->print, ODR_VISIBLESTRING, buf, i);
odr_printf(o, "(binary data)\n", (long) len);
break;
}
int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr)
{
Z_HTTP_Header *h;
+ char *cp;
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));
+ cp = strchr(hr->path, '#');
+ odr_write(o, hr->path, cp ? (cp - hr->path) : strlen(hr->path));
odr_write(o, " HTTP/", 6);
odr_write(o, hr->version, strlen(hr->version));
odr_write(o, "\r\n", 2);
return 1;
}
+const char *yaz_check_location(ODR odr, const char *uri, const char *location,
+ int *host_change)
+{
+ if (*location == '/')
+ { /* relative location */
+ char *args = 0;
+ char *nlocation = (char *) odr_malloc(odr, strlen(location)
+ + strlen(uri) + 3);
+ strcpy(nlocation, uri);
+ cs_get_host_args(nlocation, (const char **) &args);
+ if (!args || !*args)
+ args = nlocation + strlen(nlocation);
+ else
+ args--;
+ strcpy(args, location);
+ *host_change = 0;
+ return nlocation;
+ }
+ else
+ {
+ /* we don't check if host is the same as before - yet */
+ *host_change = 1;
+ return location;
+ }
+}
+
/*
* Local variables:
* c-basic-offset: 4