sf at apache
Apr 28, 2012, 3:21 PM
Post #1 of 1
(43 views)
Permalink
|
|
svn commit: r1331844 - in /httpd/httpd/branches/2.4.x: ./ include/httpd.h modules/proxy/ajp_header.c
|
|
Author: sf
Date: Sat Apr 28 22:21:09 2012
New Revision: 1331844
URL: http://svn.apache.org/viewvc?rev=1331844&view=rev
Log:
Merge r1328339:
fix some comments
(no code change)
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/include/httpd.h
httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1328339
Modified: httpd/httpd/branches/2.4.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/httpd.h?rev=1331844&r1=1331843&r2=1331844&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.x/include/httpd.h Sat Apr 28 22:21:09 2012
@@ -595,7 +595,7 @@ AP_DECLARE(const char *) ap_get_server_b
#define M_MKACTIVITY 23
#define M_BASELINE_CONTROL 24
#define M_MERGE 25
-#define M_INVALID 26 /** RFC 3253: WebDAV Versioning */
+#define M_INVALID 26 /** no valid method */
/**
* METHODS needs to be equal to the number of bits
Modified: httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c?rev=1331844&r1=1331843&r2=1331844&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c Sat Apr 28 22:21:09 2012
@@ -139,7 +139,7 @@ static const unsigned char sc_for_req_me
SC_M_PUT,
SC_M_POST,
SC_M_DELETE,
- 0, /* M_DELETE */
+ 0, /* M_CONNECT */
SC_M_OPTIONS,
SC_M_TRACE,
0, /* M_PATCH */
|
