Changeset 1735

Timestamp:

04/10/2007 07:52:58 AM (18 months ago)

Author:

jan

Message:

- fixed crash on url.redirect and url.rewrite if %0 is used in a

global context (fixes #800)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_redirect.c (modified) (2 diffs)
• src/mod_rewrite.c (modified) (2 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -33 +33 @@
   * fixed conditional dir-listing.exclude (#930)
   * reduced default PATH_MAX to 255 (#826)
-  * ECONNABORTED is not known on cygwin (fixes #863)
+  * ECONNABORTED is not known on cygwin (#863)
+  * fixed crash on url.redirect and url.rewrite if %0 is used in a global context
+    (#800)
 
 

branches/lighttpd-1.4.x/src/mod_redirect.c

@@ -141 +141 @@
 
         p->conf.redirect = s->redirect;
+        p->conf.context = NULL;
 
         /* skip the first, the global context */
@@ -230 +231 @@
                                                         buffer_append_string(p->location, list[num]);
                                                 }
+                                        } else if (p->conf.context == NULL) {
+                                                /* we have no context, we are global */
+                                                log_error_write(srv, __FILE__, __LINE__, "sb",
+                                                                "used a rewrite containing a %[0-9]+ in the global scope, ignored:",
+                                                                kv->value);
                                         } else {
                                                 config_append_cond_match_buffer(con, p->conf.context, p->location, num);

branches/lighttpd-1.4.x/src/mod_rewrite.c

@@ -271 +271 @@
         size_t i, j;
         plugin_config *s = p->config_storage[0];
+
         p->conf.rewrite = s->rewrite;
+        p->conf.context = NULL;
 
         /* skip the first, the global context */
@@ -399 +401 @@
                                                         buffer_append_string(con->request.uri, list[num]);
                                                 }
+                                        } else if (p->conf.context == NULL) {
+                                                /* we have no context, we are global */
+                                                log_error_write(srv, __FILE__, __LINE__, "sb",
+                                                                "used a redirect containing a %[0-9]+ in the global scope, ignored:",
+                                                                rule->value);
+
                                         } else {
                                                 config_append_cond_match_buffer(con, p->conf.context, con->request.uri, num);