You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/07/23 14:16:10 UTC
svn commit: r1364602 - in /httpd/httpd/branches/2.4.x: STATUS
modules/proxy/mod_proxy.c
Author: jim
Date: Mon Jul 23 12:16:10 2012
New Revision: 1364602
URL: http://svn.apache.org/viewvc?rev=1364602&view=rev
Log:
Merge r1345329 from trunk:
remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)
Submitted by: sf
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1364602&r1=1364601&r2=1364602&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jul 23 12:16:10 2012
@@ -127,12 +127,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk patch works
+1: trawick, rjung, jim
- * proxy: Remove obsolete comment.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1345329
- 2.4.x patch: trunk patch works
- +1: rjung, humbedooh, jim
- rjung: sf: you applied it to trunk, care to vote?
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c?rev=1364602&r1=1364601&r2=1364602&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy.c Mon Jul 23 12:16:10 2012
@@ -44,7 +44,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_
* can't trust directory_walk/file_walk since these are
* not in our filesystem. Prevents mod_http from serving
* the TRACE request we will set aside to handle later.
- * type_checker: set type to PROXY_MAGIC_TYPE if filename begins proxy:
* fix_ups: convert the URL stored in the filename to the
* canonical form.
* handler: handle proxy requests