- PLD merge

[packages/lighttpd.git] / lighttpd-branding.patch

diff --git a/lighttpd-branding.patch b/lighttpd-branding.patch
index c0e00629782e825a700f13339a0035c67931a2e2..a3f634ce7c3cb6fb9eeb8b6dc8001978b4045e1c 100644 (file)
--- a/lighttpd-branding.patch
+++ b/lighttpd-branding.patch
@@ -1,11 +1,11 @@
---- lighttpd-1.4.22/src/response.c~    2009-04-17 00:50:21.000000000 +0300
-+++ lighttpd-1.4.22/src/response.c     2009-04-17 00:51:22.174367972 +0300
-@@ -105,7 +105,7 @@
+--- lighttpd-1.4.36/src/response.c~    2015-07-26 13:36:36.000000000 +0300
++++ lighttpd-1.4.36/src/response.c     2015-07-26 18:29:48.302220417 +0300
+@@ -109,7 +109,7 @@
  
        if (!have_server) {
                if (buffer_is_empty(con->conf.server_tag)) {
 -                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC));
 +                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (TLD Linux)"));
-               } else if (con->conf.server_tag->used > 1) {
+               } else if (!buffer_string_is_empty(con->conf.server_tag)) {
                        buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: "));
                        buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);