Changeset 2112

Timestamp:

03/02/2008 11:46:44 AM (6 months ago)

Author:

moo

Message:

merged part of [1528] from trunk: added the new options and added alternative names for user-agent, remote-ip and query-string

Location:

branches/lighttpd-1.4.x/src

Files:

• array.h (modified) (1 diff)
• configfile-glue.c (modified) (4 diffs)
• configparser.y (modified) (1 diff)
• response.c (modified) (2 diffs)

branches/lighttpd-1.4.x/src/array.h

@@ -87 +87 @@
         COMP_HTTP_HOST,
         COMP_HTTP_REFERER,
-        COMP_HTTP_USERAGENT,
+        COMP_HTTP_USER_AGENT,
         COMP_HTTP_COOKIE,
-        COMP_HTTP_REMOTEIP,
-        COMP_HTTP_QUERYSTRING,
+        COMP_HTTP_REMOTE_IP,
+        COMP_HTTP_QUERY_STRING,
         COMP_HTTP_SCHEME,
+        COMP_HTTP_REQUEST_METHOD,
 
         COMP_LAST_ELEMENT

branches/lighttpd-1.4.x/src/configfile-glue.c

@@ -278 +278 @@
                 break;
         }
-        case COMP_HTTP_REMOTEIP: {
+        case COMP_HTTP_REMOTE_IP: {
                 char *nm_slash;
                 /* handle remoteip limitations
@@ -350 +350 @@
                 break;
 
-        case COMP_HTTP_QUERYSTRING:
+        case COMP_HTTP_QUERY_STRING:
                 l = con->uri.query;
                 break;
@@ -377 +377 @@
                 break;
         }
-        case COMP_HTTP_USERAGENT: {
+        case COMP_HTTP_USER_AGENT: {
                 data_string *ds;
                 if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "User-Agent"))) {
@@ -386 +386 @@
                 break;
         }
-
+        case COMP_HTTP_REQUEST_METHOD: {
+                const char *method = get_http_method_name(con->request.http_method);
+
+                /* we only have the request method as const char but we need a buffer for comparing */
+
+                buffer_copy_string(srv->tmp_buf, method);
+
+                l = srv->tmp_buf;
+
+                break;
+        }
         default:
                 return COND_RESULT_FALSE;

branches/lighttpd-1.4.x/src/configparser.y

@@ -422 +422 @@
       { COMP_HTTP_HOST,          CONST_STR_LEN("HTTP[\"host\"]"       ) },
       { COMP_HTTP_REFERER,       CONST_STR_LEN("HTTP[\"referer\"]"    ) },
-      { COMP_HTTP_USERAGENT,     CONST_STR_LEN("HTTP[\"useragent\"]"  ) },
+      { COMP_HTTP_USER_AGENT,    CONST_STR_LEN("HTTP[\"useragent\"]"  ) },
+      { COMP_HTTP_USER_AGENT,    CONST_STR_LEN("HTTP[\"user-agent\"]"  ) },
       { COMP_HTTP_COOKIE,        CONST_STR_LEN("HTTP[\"cookie\"]"     ) },
-      { COMP_HTTP_REMOTEIP,      CONST_STR_LEN("HTTP[\"remoteip\"]"   ) },
-      { COMP_HTTP_QUERYSTRING,   CONST_STR_LEN("HTTP[\"querystring\"]") },
+      { COMP_HTTP_REMOTE_IP,     CONST_STR_LEN("HTTP[\"remoteip\"]"   ) },
+      { COMP_HTTP_REMOTE_IP,     CONST_STR_LEN("HTTP[\"remote-ip\"]"   ) },
+      { COMP_HTTP_QUERY_STRING,  CONST_STR_LEN("HTTP[\"querystring\"]") },
+      { COMP_HTTP_QUERY_STRING,  CONST_STR_LEN("HTTP[\"query-string\"]") },
+      { COMP_HTTP_REQUEST_METHOD, CONST_STR_LEN("HTTP[\"request-method\"]") },
       { COMP_HTTP_SCHEME,        CONST_STR_LEN("HTTP[\"scheme\"]"     ) },
       { COMP_UNSET, NULL, 0 },

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

@@ -188 +188 @@
                 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_REMOTEIP);  /* Client-IP */
+                config_patch_connection(srv, con, COMP_HTTP_REMOTE_IP); /* Client-IP */
                 config_patch_connection(srv, con, COMP_HTTP_REFERER);   /* Referer:     */
-                config_patch_connection(srv, con, COMP_HTTP_USERAGENT); /* User-Agent:  */
+                config_patch_connection(srv, con, COMP_HTTP_USER_AGENT);/* User-Agent:  */
                 config_patch_connection(srv, con, COMP_HTTP_COOKIE);    /* Cookie:  */
 
@@ -277 +277 @@
 
                 config_patch_connection(srv, con, COMP_HTTP_URL); /* HTTPurl */
-                config_patch_connection(srv, con, COMP_HTTP_QUERYSTRING); /* HTTPqs */
 
                 /* do we have to downgrade to 1.0 ? */