Changeset 2014

Timestamp:

11/04/2007 05:21:55 PM (8 months ago)

Author:

glen

Message:

- merge Changeset [2012] by glen from 1.4 branch

Files:

• trunk/doc/configuration.txt (modified) (1 diff)
• trunk/src/array.h (modified) (1 diff)
• trunk/src/configfile-glue.c (modified) (1 diff)
• trunk/src/configparser.y (modified) (1 diff)
• trunk/src/response.c (modified) (1 diff)

trunk/doc/configuration.txt

@@ -86 +86 @@
-$HTTP["cookie"]
-  match on cookie
+$HTTP["scheme"]
+  match on scheme
-$HTTP["host"]
-  match on host

trunk/src/array.h

@@ -91 +91 @@
-        COMP_HTTP_USER_AGENT,
-        COMP_HTTP_COOKIE,
+        COMP_HTTP_SCHEME,
-        COMP_HTTP_REMOTE_IP,
-        COMP_HTTP_QUERY_STRING,

trunk/src/configfile-glue.c

@@ -377 +377 @@
-                break;
-        }
+        case COMP_HTTP_SCHEME:
+                l = con->uri.scheme;
+                break;
+
-        case COMP_HTTP_URL:
-                l = con->uri.path;

trunk/src/configparser.y

@@ -423 +423 @@
-    } comps[] = {
-      { COMP_SERVER_SOCKET,      CONST_STR_LEN("SERVER[\"socket\"]"   ) },
+      { COMP_HTTP_SCHEME,        CONST_STR_LEN("HTTP[\"scheme\"]"     ) },
-      { COMP_HTTP_URL,           CONST_STR_LEN("HTTP[\"url\"]"        ) },
-      { COMP_HTTP_HOST,          CONST_STR_LEN("HTTP[\"host\"]"       ) },

trunk/src/response.c

@@ -201 +201 @@
-                buffer_to_lower(con->uri.authority);
-
+                config_patch_connection(srv, con, COMP_HTTP_SCHEME);    /* Scheme:      */
-                config_patch_connection(srv, con, COMP_HTTP_HOST);      /* Host:        */
-                config_patch_connection(srv, con, COMP_HTTP_REMOTE_IP); /* Client-IP */