summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kneschke <jan@kneschke.de>2007-04-13 20:47:40 +0000
committerJan Kneschke <jan@kneschke.de>2007-04-13 20:47:40 +0000
commit310b2aa13e69ade5cf81f867b9ec0021261c7477 (patch)
tree08e89b2c4858365a7ff769313bc7409230ca562a
parentb05d05378f8559a99ff665682030b5dc289dad9f (diff)
downloadlighttpd-git-310b2aa13e69ade5cf81f867b9ec0021261c7477.tar.gz
fixed duplicate headers as reported in the bloglighttpd-1.4.15
- this is a partial revert of [1723] git-svn-id: svn+ssh://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1767 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS4
-rw-r--r--src/response.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 36ed77bc..60f21102 100644
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,9 @@
NEWS
====
-- 1.4.15 - 2007-04-??
+- 1.4.15 - 2007-04-13
- *
+ * fixed broken Set-Cookie headers
- 1.4.14 - 2007-04-13
diff --git a/src/response.c b/src/response.c
index 8687ce20..b8775f06 100644
--- a/src/response.c
+++ b/src/response.c
@@ -66,14 +66,13 @@ int http_response_write_header(server *srv, connection *con) {
BUFFER_APPEND_STRING_CONST(b, "\r\n");
buffer_append_string_buffer(b, ds->key);
BUFFER_APPEND_STRING_CONST(b, ": ");
-
+#if 0
/**
* the value might contain newlines, encode them with at least one white-space
*/
buffer_append_string_encoded(b, CONST_BUF_LEN(ds->value), ENCODING_HTTP_HEADER);
-#if 0
- log_error_write(srv, __FILE__, __LINE__, "bb",
- ds->key, ds->value);
+#else
+ buffer_append_string_buffer(b, ds->value);
#endif
}
}