httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r371013 - in /httpd/httpd/trunk: CHANGES modules/proxy/ajp_header.c
Date Sat, 21 Jan 2006 11:30:46 GMT
Author: rpluem
Date: Sat Jan 21 03:30:41 2006
New Revision: 371013

URL: http://svn.apache.org/viewcvs?rev=371013&view=rev
Log:
* Fix PR38340 by actual getting the word and thus advancing the message buffer
  pointer to the next data.

Submitted by: Aleksey Pesternikov <apesternikov yahoo.com>
Reviewed by: Ruediger Pluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/ajp_header.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=371013&r1=371012&r2=371013&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jan 21 03:30:41 2006
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
+     PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
+
   *) core: Reject invalid Expect header immediately. PR 38123.
      [Ruediger Pluem]
 
@@ -9,17 +12,17 @@
      authn directives such as 'AuthType', 'AuthName'.  Move the directives
      'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias 
      into mod_authn_core. [Brad Nicholes]
-      
+
   *) Authz: Mark the directives 'Order', 'Allow', 'Deny' and 'Satisfy' as 
      deprecated and move them into the new module mod_access_compat which
      can be loaded to provide backwards compatibility for these directives.
      [Brad Nicholes]
-     
+
   *) Authz: Move the 'Require' directive from the core module as well as 
      add the directives '<SatisfyAll>', '<SatisfyOne>', '<RequireAlias>'

      and 'Reject' to mod_authz_core. The new directives introduce 'AND/OR' 
      logic into the authorization processing. [Brad Nicholes]
-     
+
   *) Authz: Add the new module mod_authz_core which acts as the 
      authorization provider vector and contains common authz 
      directives. [Brad Nicholes]
@@ -33,7 +36,7 @@
 
   *) Authz: Convert all of the authz modules from hook based to 
      provider based. [Brad Nicholes]
-  
+
   *) mod_cache: Add CacheMinExpire directive to set the minimum time in
      seconds to cache a document.
      [Brian Akins <brian.akins turner.com>, Ruediger Pluem]

Modified: httpd/httpd/trunk/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/ajp_header.c?rev=371013&r1=371012&r2=371013&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_header.c Sat Jan 21 03:30:41 2006
@@ -507,7 +507,7 @@
         }
 
         if ((name & 0XFF00) == 0XA000) {
-            ajp_msg_peek_uint16(msg, &name);
+            ajp_msg_get_uint16(msg, &name);
             stringname = long_res_header_for_sc(name);
             if (stringname == NULL) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,



Mime
View raw message