From: Jim Jagielski <jim@apache.org>
Date: Mon, 23 Jul 2012 12:16:10 +0000 (+0000)
Subject: Merge r1345329 from trunk:
X-Git-Tag: 2.4.3~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0abf9d2612d868f5b7a6939a9b58addf09a2420e;p=apache

Merge r1345329 from trunk:

remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)

Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364602 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 28c4794e69..1f574cf087 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index f9a800907a..431efb87a0 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -44,7 +44,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
  *                  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