svn commit: r126171 - /httpd/httpd/trunk/modules/mappers/mod_rewrite.c

[st...@apache.org]

Author: striker
Date: Sat Jan 22 16:58:30 2005
New Revision: 126171

URL: http://svn.apache.org/viewcvs?view=rev&rev=126171
Log:
More hardcoded schemes in mod_rewrite... :/
Cooked up in a debugging session with Justin Erenkrantz.

* modules/mappers/mod_rewrite.c

  (splitout_queryargs): Don't mess with the query args when dealing
    with ajp or balancer.

  (hook_uri2file): Account for r->filename being NULL.

Modified:
   httpd/httpd/trunk/modules/mappers/mod_rewrite.c

Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?view=diff&rev=126171&p1=httpd/httpd/trunk/modules/mappers/mod_rewrite.c&r1=126170&p2=httpd/httpd/trunk/modules/mappers/mod_rewrite.c&r2=126171
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c	(original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c	Sat Jan 22 16:58:30 2005
@@ -704,7 +704,9 @@
     /* don't touch, unless it's an http or mailto URL.
      * See RFC 1738 and RFC 2368.
      */
-    if (   is_absolute_uri(r->filename)
+    if (is_absolute_uri(r->filename)
+        && strncasecmp(r->filename, "ajp", 3)
+        && strncasecmp(r->filename, "balancer", 8)
         && strncasecmp(r->filename, "http", 4)
         && strncasecmp(r->filename, "mailto", 6)) {
         r->args = NULL; /* forget the query that's still flying around */
@@ -4241,7 +4243,7 @@
             return n;
         }
 
-        flen = strlen(r->filename);
+        flen = r->filename ? strlen(r->filename) : 0;
         if (flen > 6 && strncmp(r->filename, "proxy:", 6) == 0) {
             /* it should be go on as an internal proxy request */