Commit 71e040e8 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Use "Basic" authentication instead of "basic" in ab, as the spec says we 

should.
PR:	7294
Submitted by:	Andre Breiler <andre.breiler@rd.bbc.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88281 13f79535-47bb-0310-9956-ffa450edef68
parent 75d89aa7

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.12-dev



  *) Use "Basic" authentication instead of "basic" in ab, as the spec

     says we should.  [Andre Breiler <andre.breiler@rd.bbc.co.uk>]



  *) Fix a seg fault in mod_userdir.c.  We used to use the pw structure

     without ever filling it out.  This fixes PR 7271.

     [Taketo Kabe <kabe@sra-tohoku.co.jp> and

support/ab.c

+4 −4
Original line number Diff line number Diff line
@@ -903,14 +903,14 @@ static void test(void) 
static void copyright(void)

{

    if (!use_html) {

        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.56 $> apache-2.0");

        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.57 $> apache-2.0");

        printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");

        printf("Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/\n");

        printf("\n");

    }

    else {

        printf("<p>\n");

        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.56 $");

        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.57 $");

        printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");

        printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/<br>\n");

        printf("</p>\n<p>\n");
@@ -1128,7 +1128,7 @@ int main(int argc, const char * const argv[]) 
            l=apr_base64_encode(tmp, optarg, strlen(optarg));

            tmp[l]='\0';

 

            strncat(auth, "Authorization: basic ", sizeof(auth));

            strncat(auth, "Authorization: Basic ", sizeof(auth));

            strncat(auth, tmp, sizeof(auth));

            strncat(auth, "\r\n", sizeof(auth));

            break;
@@ -1141,7 +1141,7 @@ int main(int argc, const char * const argv[]) 
            l=apr_base64_encode(tmp, optarg, strlen(optarg));

            tmp[l]='\0';

 

            strncat(auth, "Proxy-Authorization: basic ", sizeof(auth));

            strncat(auth, "Proxy-Authorization: Basic ", sizeof(auth));

            strncat(auth, tmp, sizeof(auth));

            strncat(auth, "\r\n", sizeof(auth));

            break;