httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/aaa mod_auth_digest.c
Date Thu, 29 Jan 2004 19:21:14 GMT
jerenkrantz    2004/01/29 11:21:14

  Modified:    .        CHANGES
               modules/aaa mod_auth_digest.c
  Log:
  Allow mod_auth_digest to work with sub-requests with different methods than
  the original request.
  
  PR: 25040
  Submitted by:	Josh Dady <jpd@indecisive.com>
  Reviewed by:	Justin Erenkrantz, Sander Striker (concept)
  
  Revision  Changes    Path
  1.1384    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1383
  retrieving revision 1.1384
  diff -u -u -r1.1383 -r1.1384
  --- CHANGES	29 Jan 2004 13:46:58 -0000	1.1383
  +++ CHANGES	29 Jan 2004 19:21:13 -0000	1.1384
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Allow mod_auth_digest to work with sub-requests with different
  +     methods than the original request.  PR 25040.
  +     [Josh Dady <jpd@indecisive.com>]
  +
     *) Fixed file extensions for real media files and removed rpm extension
        from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
   
  
  
  
  1.82      +5 -3      httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -u -r1.81 -r1.82
  --- mod_auth_digest.c	1 Jan 2004 13:26:17 -0000	1.81
  +++ mod_auth_digest.c	29 Jan 2004 19:21:13 -0000	1.82
  @@ -188,6 +188,7 @@
       const char           *username;
             char           *nonce;
       const char           *uri;
  +    const char           *method;
       const char           *digest;
       const char           *algorithm;
       const char           *cnonce;
  @@ -1045,6 +1046,7 @@
       resp->raw_request_uri = r->unparsed_uri;
       resp->psd_request_uri = &r->parsed_uri;
       resp->needed_auth = 0;
  +    resp->method = r->method;
       ap_set_module_config(r->request_config, &auth_digest_module, resp);
   
       res = get_digest_rec(r, resp);
  @@ -1529,7 +1531,7 @@
   {
       const char *ha2;
   
  -    ha2 = ap_md5(r->pool, (unsigned char *)apr_pstrcat(r->pool, r->method, ":",
  +    ha2 = ap_md5(r->pool, (unsigned char *)apr_pstrcat(r->pool, resp->method,
":",
                                                          resp->uri, NULL));
       return ap_md5(r->pool,
                     (unsigned char *)apr_pstrcat(r->pool, ha1, ":", resp->nonce,
  @@ -1554,12 +1556,12 @@
       }
   
       if (resp->message_qop && !strcasecmp(resp->message_qop, "auth-int"))
{
  -        a2 = apr_pstrcat(r->pool, r->method, ":", resp->uri, ":",
  +        a2 = apr_pstrcat(r->pool, resp->method, ":", resp->uri, ":",
                            ap_md5(r->pool, (const unsigned char*) ""), NULL);
                            /* TBD */
       }
       else {
  -        a2 = apr_pstrcat(r->pool, r->method, ":", resp->uri, NULL);
  +        a2 = apr_pstrcat(r->pool, resp->method, ":", resp->uri, NULL);
       }
       ha2 = ap_md5(r->pool, (const unsigned char *)a2);
   
  
  
  

Mime
View raw message