Changeset 2220

Timestamp:

27/10/08 23:56:25 (23 months ago)

Author:

aperez

Message:

 

Location:

cherokee/trunk

Files:

• ChangeLog (modified) (1 diff)
• cherokee/connection.c (modified) (1 diff)
• cherokee/handler_cgi_base.c (modified) (1 diff)
• cherokee/handler_common.c (modified) (4 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-10-25  Antonio Perez  <aperez@skarcha.com>
+
+        * cherokee/handler_cgi_base.c, cherokee/handler_common.c,
+        cherokee/connection.c: REQUEST_URI cgi environment variable now
+        contains the correct value.
+
 2008-10-27  Taher Shihadeh  <taher@unixwars.com>
+
         * admin/ModuleBalancer.py, admin/ModuleFcgi.py: fixes bug that
         prevented balancers to be correctly configured when auto-submits

cherokee/trunk/cherokee/connection.c

@@ -2222 +2222 @@
         cherokee_buffer_add_str (buf, str)
 
-        print_cbuf ("        Request", request);
-        print_cbuf ("  Web Directory", web_directory);
-        print_cbuf ("Local Directory", local_directory);
-        print_cbuf ("       Pathinfo", pathinfo);
-        print_cbuf ("       User Dir", userdir);
-        print_cbuf ("   Query string", query_string);
-        print_cbuf ("           Host", host);
-        print_cbuf ("       Redirect", redirect);
-        print_cint ("   Redirect num", respins);
-        print_cint ("      Keepalive", keepalive);
-        print_str  ("          Phase", phase);
-        print_cint ("    Range start", range_start);
-        print_cint ("      Range end", range_end);
+        print_cbuf ("         Request", request);
+        print_cbuf ("Request Original", request_original);
+        print_cbuf ("   Web Directory", web_directory);
+        print_cbuf (" Local Directory", local_directory);
+        print_cbuf ("        Pathinfo", pathinfo);
+        print_cbuf ("        User Dir", userdir);
+        print_cbuf ("    Query string", query_string);
+        print_cbuf ("            Host", host);
+        print_cbuf ("        Redirect", redirect);
+        print_cint ("    Redirect num", respins);
+        print_cint ("       Keepalive", keepalive);
+        print_str  ("           Phase", phase);
+        print_cint ("     Range start", range_start);
+        print_cint ("       Range end", range_end);
 
         /* Options bit fields

cherokee/trunk/cherokee/handler_cgi_base.c

@@ -374 +374 @@
         } 
         else {
-                cherokee_buffer_add_buffer (tmp, &conn->request);
+                if (! cherokee_buffer_is_empty (&conn->request_original))
+                        cherokee_buffer_add_buffer (tmp, &conn->request_original);
+                else
+                        cherokee_buffer_add_buffer (tmp, &conn->request);
+
                 if (! cherokee_buffer_is_empty (&conn->query_string)) {
                         cherokee_buffer_add_char (tmp, '?');

cherokee/trunk/cherokee/handler_common.c

@@ -192 +192 @@
         cherokee_buffer_add_buffer (&conn->local_directory, &conn->request);
         
-        if (use_iocache)                
+        if (use_iocache)
                 iocache = CONN_SRV(conn)->iocache;
 
@@ -233 +233 @@
                 /* Copy the PathInfo and clean the request 
                  */
+                if (cherokee_buffer_is_empty (&conn->request_original)) {
+                        cherokee_buffer_add_buffer (&conn->request_original, &conn->request);
+                }
+
                 cherokee_buffer_add (&conn->pathinfo, pathinfo, pathinfo_len);
                 cherokee_buffer_drop_ending (&conn->request, pathinfo_len);
@@ -313 +317 @@
                                  */
                                 cherokee_buffer_clean (&conn->local_directory);
-                                cherokee_buffer_clean (&conn->request_original);
-                                cherokee_buffer_add_buffer (&conn->request_original, &conn->request);
+                                if (cherokee_buffer_is_empty (&conn->request_original)) {
+                                        cherokee_buffer_add_buffer (&conn->request_original, &conn->request);
+                                }
 
                                 cherokee_buffer_clean (&conn->request);
-                                cherokee_buffer_add (&conn->request, index, index_len);                         
+                                cherokee_buffer_add (&conn->request, index, index_len);
 
                                 TRACE (ENTRIES, "top level index matched %s\n", index);
@@ -344 +349 @@
                         if ((!exists) || (is_dir)) 
                                 continue;
-                        
+
                         /* Add the index file to the request and clean up
                          */
                         cherokee_buffer_drop_ending (&conn->local_directory, conn->request.len);
-                        cherokee_buffer_add (&conn->request, index, index_len); 
+
+                        if (cherokee_buffer_is_empty (&conn->request_original)) {
+                                cherokee_buffer_add_buffer (&conn->request_original, &conn->request);
+                        }
+
+                        cherokee_buffer_add (&conn->request, index, index_len);
 
                         TRACE_CONN(conn);