summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2008-03-02 12:59:18 +0000
committerStefan Bühler <stbuehler@web.de>2008-03-02 12:59:18 +0000
commit85b8153dfcbbda0be24b422f16ab5107b7967dbb (patch)
treef3c79864c1bb1880642f53f3d325b98ff5772eb9
parent9ffe08a5833258deb0b70b56bd37fc4a2d1d55ea (diff)
downloadlighttpd-git-85b8153dfcbbda0be24b422f16ab5107b7967dbb.tar.gz
Fix previous merge
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2113 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--src/mod_extforward.c2
-rw-r--r--src/response.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mod_extforward.c b/src/mod_extforward.c
index 78fcf9a5..be7dd0ff 100644
--- a/src/mod_extforward.c
+++ b/src/mod_extforward.c
@@ -329,7 +329,7 @@ struct addrinfo *ipstr_to_sockaddr(const char *host)
static void clean_cond_cache(server *srv, connection *con) {
- config_cond_cache_reset_item(srv, con, COMP_HTTP_REMOTEIP);
+ config_cond_cache_reset_item(srv, con, COMP_HTTP_REMOTE_IP);
}
URIHANDLER_FUNC(mod_extforward_uri_handler) {
diff --git a/src/response.c b/src/response.c
index 91e6df46..bc2bdd10 100644
--- a/src/response.c
+++ b/src/response.c
@@ -191,6 +191,7 @@ handler_t http_response_prepare(server *srv, connection *con) {
config_patch_connection(srv, con, COMP_HTTP_REFERER); /* Referer: */
config_patch_connection(srv, con, COMP_HTTP_USER_AGENT);/* User-Agent: */
config_patch_connection(srv, con, COMP_HTTP_COOKIE); /* Cookie: */
+ config_patch_connection(srv, con, COMP_HTTP_REQUEST_METHOD); /* REQUEST_METHOD */
/** their might be a fragment which has to be cut away */
if (NULL != (qstr = strchr(con->request.uri->ptr, '#'))) {
@@ -276,6 +277,7 @@ handler_t http_response_prepare(server *srv, connection *con) {
*/
config_patch_connection(srv, con, COMP_HTTP_URL); /* HTTPurl */
+ config_patch_connection(srv, con, COMP_HTTP_QUERY_STRING); /* HTTPqs */
/* do we have to downgrade to 1.0 ? */
if (!con->conf.allow_http11) {