Changeset 799

Timestamp:

07/08/07 02:51:35 (1 year ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/handler_cgi_base.c (modified) (4 diffs)
• cherokee/trunk/cherokee/handler_cgi_base.h (modified) (1 diff)
• cherokee/trunk/cherokee/header.c (modified) (1 diff)
• cherokee/trunk/cherokee/header.h (modified) (1 diff)
• cherokee/trunk/qa/140-SCGI-EmptyVars.py (modified) (2 diffs)
• cherokee/trunk/qa/142-SCGI-ExtraVars.py (added)
• cherokee/trunk/qa/Makefile.am (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-07-08  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * qa/142-SCGI-ExtraVars.py, qa/Makefile.am (EXTRA_DIST): New QA
+        test. It checks the new 'pass_req_headers' parameter.
+
+        * cherokee/handler_cgi_base.c (cherokee_handler_cgi_base_build_envp,
+        foreach_header_add_unknown_variable): Added new configuration
+        token 'pass_req_headers' (boolean). It allows to enable to copy
+        all the unknown headers to the CGI-based handler, whether it's
+        SCGI, FastCGI or CGI.
+
+        * cherokee/header.h,
+        cherokee/header.c (cherokee_header_foreach_unknown): Added new
+        method.
+
-2007-07-07  A.D.F  <adefacc@tin.it>
-

cherokee/trunk/cherokee/handler_cgi_base.c

@@ -169 +169 @@
-        props->change_user      = false;
-        props->check_file       = true;
+        props->pass_req_headers = false;
-
-        /* Parse the configuration tree
@@ -197 +198 @@
-                } else if (equal_buf_str (&subconf->key, "check_file")) {
-                        props->check_file = atoi(subconf->val.buf);
+
+                } else if (equal_buf_str (&subconf->key, "pass_req_headers")) {
+                        props->pass_req_headers = atoi(subconf->val.buf);
-                }
-        }
@@ -453 +457 @@
-
-
+static ret_t
+foreach_header_add_unknown_variable (cherokee_buffer_t *header, cherokee_buffer_t *content, void *data)
+{
+        cherokee_handler_cgi_base_t *cgi = HDL_CGI_BASE(data);
+        
+        cgi->add_env_pair (cgi, 
+                           header->buf, header->len, 
+                           content->buf, content->len);
+        return ret_ok;
+}
+
+
-ret_t 
-cherokee_handler_cgi_base_build_envp (cherokee_handler_cgi_base_t *cgi, cherokee_connection_t *conn)
@@ -473 +489 @@
-                                   env->val.buf, env->val.len);
-        }               
+
+        /* Pass request headers.
+         * Usually X-Something..
+         */
+        if (cgi_props->pass_req_headers) {
+                cherokee_header_foreach_unknown (&conn->header, 
+                                                 foreach_header_add_unknown_variable, cgi);
+        }
-
-        /* Add the basic enviroment variables

cherokee/trunk/cherokee/handler_cgi_base.h

@@ -85 +85 @@
-        cherokee_boolean_t                 check_file;  
-        cherokee_boolean_t                 is_error_handler;
+        cherokee_boolean_t                 pass_req_headers;
-} cherokee_handler_cgi_base_props_t;
-

cherokee/trunk/cherokee/header.c

@@ -944 +944 @@
-}
-
+
+ret_t 
+cherokee_header_foreach_unknown (cherokee_header_t *hdr, cherokee_header_foreach_func_t func, void *data)
+{
+        int               i;
+        cherokee_buffer_t tmp_hdr = CHEROKEE_BUF_INIT;
+        cherokee_buffer_t tmp_val = CHEROKEE_BUF_INIT;
+        
+        HEADER_INTERNAL_CHECK(hdr);
+
+        for (i=0; i < hdr->unknowns_len; i++) {
+                char *begin      = hdr->unknowns[i].header_off      + hdr->input_buffer->buf;
+                char *begin_info = hdr->unknowns[i].header_info_off + hdr->input_buffer->buf;
+
+                cherokee_buffer_add (&tmp_hdr, begin, 
+                                     (hdr->unknowns[i].header_info_off - 2) - hdr->unknowns[i].header_off);
+                                     
+                cherokee_buffer_add (&tmp_val, begin_info,
+                                     hdr->unknowns[i].header_info_len);
+
+                func (&tmp_hdr, &tmp_val, data);
+
+                cherokee_buffer_clean (&tmp_hdr);
+                cherokee_buffer_clean (&tmp_val);
+        }
+
+        cherokee_buffer_mrproper (&tmp_hdr);
+        cherokee_buffer_mrproper (&tmp_val);
+        return ret_ok;
+}

cherokee/trunk/cherokee/header.h

@@ -87 +87 @@
-
-ret_t cherokee_header_get_length          (cherokee_header_t *hdr, cuint_t *len);
-_each            (cherokee_header_t *hdr, void *
+each_unknown     (cherokee_header_t *hdr, cherokee_header_foreach_func_t func, void *data
-
-ret_t cherokee_header_copy_request        (cherokee_header_t *hdr, cherokee_buffer_t *request);

cherokee/trunk/qa/140-SCGI-EmptyVars.py

@@ -2 +2 @@
-from base import *
-
-
-
-
+
+
-
-SCRIPT = """
@@ -24 +23 @@
-vserver!default!directory!<dir>!handler!balancer = round_robin
-vserver!default!directory!<dir>!handler!balancer!type = interpreter
-2
-2
+3
+3
-vserver!default!directory!<dir>!priority = 1400
-"""

cherokee/trunk/qa/Makefile.am

@@ -145 +145 @@
-138-ChangeUser-cgi.py \
-139-domain-wildcards1.py \
-
+
+
+
-
-test: