httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Fri, 11 Jun 2004 21:05:22 GMT
nd          2004/06/11 14:05:22

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
  Log:
  mod_rewrite no longer turns forward proxy requests into reverse proxy
  requests.
  
  PR: 28125
  Reviewed by: Jeff Trawick, Brad Nicholes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.303 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.302
  retrieving revision 1.988.2.303
  diff -u -u -r1.988.2.302 -r1.988.2.303
  --- CHANGES	11 Jun 2004 20:46:40 -0000	1.988.2.302
  +++ CHANGES	11 Jun 2004 21:05:20 -0000	1.988.2.303
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) mod_rewrite no longer turns forward proxy requests into reverse proxy
  +     requests. PR 28125  [ast domdv.de, André Malo]
  +
     *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
        exported on Win32 and Netware as well (minor MMN bump).  PR 28523.
        [Edward Rudd <eddie omegaware.com>, André Malo]
  
  
  
  1.751.2.920 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.919
  retrieving revision 1.751.2.920
  diff -u -u -r1.751.2.919 -r1.751.2.920
  --- STATUS	11 Jun 2004 20:46:40 -0000	1.751.2.919
  +++ STATUS	11 Jun 2004 21:05:21 -0000	1.751.2.920
  @@ -164,11 +164,6 @@
            http://www.apache.org/~nd/mod_rewrite_fixleak.diff
          +1: nd
   
  -    *) mod_rewrite no longer turns forward proxy requests into reverse proxy
  -       requests. PR 28125
  -         modules/mappers/mod_rewrite.c: r1.255
  -       +1: nd, trawick, bnicholes
  -
       *) (re-)add support for RewriteRules in <Proxy> containers. PR 27985
            modules/mappers/mod_rewrite.c: r1.254
          +1: nd, trawick
  
  
  
  No                   revision
  No                   revision
  1.135.2.26 +6 -2      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.135.2.25
  retrieving revision 1.135.2.26
  diff -u -u -r1.135.2.25 -r1.135.2.26
  --- mod_rewrite.c	9 Feb 2004 20:53:18 -0000	1.135.2.25
  +++ mod_rewrite.c	11 Jun 2004 21:05:22 -0000	1.135.2.26
  @@ -1203,7 +1203,9 @@
               }
   
               /* now make sure the request gets handled by the proxy handler */
  -            r->proxyreq = PROXYREQ_REVERSE;
  +            if (PROXYREQ_NONE == r->proxyreq) {
  +                r->proxyreq = PROXYREQ_REVERSE;
  +            }
               r->handler  = "proxy-server";
   
               rewritelog(r, 1, "go-ahead with proxy request %s [OK]",
  @@ -1465,7 +1467,9 @@
               }
   
               /* now make sure the request gets handled by the proxy handler */
  -            r->proxyreq = PROXYREQ_REVERSE;
  +            if (PROXYREQ_NONE == r->proxyreq) {
  +                r->proxyreq = PROXYREQ_REVERSE;
  +            }
               r->handler  = "proxy-server";
   
               rewritelog(r, 1, "[per-dir %s] go-ahead with proxy request "
  
  
  

Mime
View raw message