Changeset 477

Timestamp:

07/28/2005 10:22:53 AM (3 years ago)

Author:

jan

Message:

added support to have a PATH_INFO on /prefix if check-local is disabled

Files:

• branches/lighttpd-1.3.x/src/mod_fastcgi.c (modified) (7 diffs)

branches/lighttpd-1.3.x/src/mod_fastcgi.c

@@ -330 +330 @@
         int       fde_ndx;   /* index into the fd-event buffer */
 
-        size_t    path_info_offset; /* start of path_info in uri.path */
-        
         pid_t     pid;
         int       got_proc;
@@ -2970 +2968 @@
         buffer *fn;
         fcgi_extension *extension = NULL;
-        size_t path_info_offset;
         
         /* Possibly, we processed already this request */
@@ -2991 +2988 @@
         }
         
-        path_info_offset = 0;
-        
         /* check if extension matches */
         for (k = 0; k < p->conf.exts->used; k++) {
-                size_t ct_len;
+                size_t ct_len; /* length of the config entry */
                 
                 extension = p->conf.exts->exts[k];
@@ -3007 +3002 @@
                 /* check extension in the form "/fcgi_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;
-                                }
-                        }
                         break;
                 } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
@@ -3053 +3041 @@
                         if (host->check_local == 0) {
                                 handler_ctx *hctx;
+                                char *pathinfo;
+                                
                                 hctx = handler_ctx_init();
                                 
-                                hctx->path_info_offset = path_info_offset;
                                 hctx->remote_conn      = con;
                                 hctx->plugin_data      = p;
@@ -3073 +3062 @@
                                         log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi");
                                 }
+                                
+                                /* the prefix is the SCRIPT_NAME, 
+                                 * everthing from start to the next slash
+                                 * this is important for check-local = "disable"
+                                 * 
+                                 * if prefix = /admin.fcgi
+                                 * 
+                                 * /admin.fcgi/foo/bar
+                                 * 
+                                 * SCRIPT_NAME = /admin.fcgi
+                                 * PATH_INFO   = /foo/bar
+                                 * 
+                                 * if prefix = /fcgi-bin/
+                                 * 
+                                 * /fcgi-bin/foo/bar
+                                 * 
+                                 * SCRIPT_NAME = /fcgi-bin/foo
+                                 * PATH_INFO   = /bar
+                                 * 
+                                 */
+                                
+                                /* the rewrite is only done for /prefix/? matches */
+                                if (extension->key->ptr[0] == '/' &&
+                                    con->uri.path->used > extension->key->used &&
+                                    NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
+                                        /* rewrite uri.path and pathinfo */ 
+                                        
+                                        buffer_copy_string(con->request.pathinfo, pathinfo);
+                                        
+                                        con->uri.path->used -= con->request.pathinfo->used - 1;
+                                        con->uri.path->ptr[con->uri.path->used - 1] = '\0';
+                                }
                         }
                         return HANDLER_GO_ON;
@@ -3079 +3100 @@
                         hctx = handler_ctx_init();
                         
-                        hctx->path_info_offset = path_info_offset;
                         hctx->remote_conn      = con;
                         hctx->plugin_data      = p;