Changeset 2035

Timestamp:

01/16/2008 12:26:12 AM (8 months ago)

Author:

glen

Message:

- fix also scgi and proxy modules. #1489

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_proxy.c (modified) (1 diff)
• src/mod_scgi.c (modified) (1 diff)

branches/lighttpd-1.4.x/NEWS

@@ -11 +11 @@
   * fixed case-sensitive check for Auth-Method (#1456)
   * execute fcgi app without /bin/sh if used as argument to spawn-fcgi (#1428)
-  * fixed a bug that made /-prefixed fcgi extensions being handled also when
-    matching the end of the uri (#1489)
+  * fixed a bug that made /-prefixed extensions being handled also when
+    matching the end of the uri in fcgi,scgi and proxy modules (#1489)
   * Print error if X-LIGHTTPD-send-file cannot be done; reset header
     Content-Length for send-file. Patches by Stefan B�

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

@@ -1094 +1094 @@
 
                 /* check extension in the form "/proxy_pattern" */
-                if (*(extension->key->ptr) == '/' && strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
-                        if (s_len > ct_len + 1) {
-                                char *pi_offset;
-
-                                if (0 != (pi_offset = strchr(fn->ptr + ct_len + 1, '/'))) {
-                                        path_info_offset = pi_offset - fn->ptr;
+                if (*(extension->key->ptr) == '/') {
+                        if (strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
+                                if (s_len > ct_len + 1) {
+                                        char *pi_offset;
+
+                                        if (0 != (pi_offset = strchr(fn->ptr + ct_len + 1, '/'))) {
+                                                path_info_offset = pi_offset - fn->ptr;
+                                        }
                                 }
-                        }
-                        break;
+                                break;
+                        }
                 } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
                         /* check extension in the form ".fcg" */

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

@@ -2695 +2695 @@
 
                 /* check extension in the form "/scgi_pattern" */
-                if (*(extension->key->ptr) == '/' && strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
-                        break;
+                if (*(extension->key->ptr) == '/') {
+                        if (strncmp(fn->ptr, extension->key->ptr, ct_len) == 0)
+                                break;
                 } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
                         /* check extension in the form ".fcg" */