X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fhttp.c;h=4362c757a85d305bdf8ac67406a36808d2259572;hp=60cef68f58b99e09dc09b9dc9c810b235039004d;hb=f15418ee295542935d616a2163377b71e40ce04f;hpb=a94b5a44d632a6df1a1de5dc75e73adc03e8e6b4 diff --git a/src/http.c b/src/http.c index 60cef68..4362c75 100644 --- a/src/http.c +++ b/src/http.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: http.c,v 1.3 2007-09-06 17:11:59 mike Exp $ */ /** @@ -14,6 +12,7 @@ #include #include #include +#include #include #ifdef WIN32 @@ -234,9 +233,9 @@ void z_HTTP_header_add_basic_auth(ODR o, Z_HTTP_Header **hp, return; len = strlen(username) + strlen(password); - tmp = odr_malloc(o, len+2); + tmp = (char *) odr_malloc(o, len+2); sprintf(tmp, "%s:%s", username, password); - buf = odr_malloc(o, (len+1) * 8/6 + 12); + buf = (char *) odr_malloc(o, (len+1) * 8/6 + 12); strcpy(buf, "Basic "); yaz_base64encode(tmp, &buf[strlen(buf)]); z_HTTP_header_add(o, hp, "Authorization", buf); @@ -334,20 +333,21 @@ 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, - "\n" - "\n" - " \n" - " YAZ " YAZ_VERSION "\n" - " \n" - " \n" - "

YAZ " - YAZ_VERSION "

\n" - "

Error: %d

\n" - "

Description: %.50s

\n" - " \n" - "\n", - code, z_HTTP_errmsg(code)); + sprintf(hres->content_buf, + "\n" + "\n" + " \n" + " YAZ " YAZ_VERSION "\n" + " \n" + " \n" + "

YAZ " + YAZ_VERSION "

\n" + "

Error: %d

\n" + "

Description: %.50s

\n" + " \n" + "\n", + code, z_HTTP_errmsg(code)); hres->content_len = strlen(hres->content_buf); z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/html"); } @@ -545,6 +545,7 @@ int yaz_encode_http_request(ODR o, Z_HTTP_Request *hr) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab