X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fhttp.c;h=0f17df533b598e5f505330ec4795afbb1d04e0ef;hp=96445ed99828bffafc619ec544b8d4af6ad2119e;hb=d606d0d7c6015414a1d5ba065d09b507679be5a3;hpb=e5c4e6d4c245ae26a73953cbc5261929f55c103f diff --git a/src/http.c b/src/http.c index 96445ed..0f17df5 100644 --- a/src/http.c +++ b/src/http.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -16,6 +16,7 @@ #include #include #include +#include static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers, char **content_buf, int *content_len) @@ -553,7 +554,6 @@ static void dump_http_package(ODR o, const char *buf, size_t len) if (i == len) { o->op->stream_write(o, o->op->print, ODR_VISIBLESTRING, buf, i); - odr_printf(o, "%.*s\n", i, buf); break; } else if (i >= limit) @@ -646,6 +646,32 @@ int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr) 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