- updated to 1.4.40, partial PLD merge

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

diff --git a/lighttpd-branding.patch b/lighttpd-branding.patch
index a3f634ce7c3cb6fb9eeb8b6dc8001978b4045e1c..f7e6dd54df3c79e546625a53eaa5669067c5afec 100644 (file)
--- a/lighttpd-branding.patch
+++ b/lighttpd-branding.patch
@@ -1,11 +1,19 @@
---- 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 @@
+--- lighttpd-1.4.40/src/response.c~    2016-07-16 13:06:16.000000000 +0300
++++ lighttpd-1.4.40/src/response.c     2016-07-25 14:16:59.131926942 +0300
+@@ -5,6 +5,7 @@
+ #include "log.h"
+ #include "stat_cache.h"
+ #include "chunk.h"
++#include "version.h"
  
-       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 (!buffer_string_is_empty(con->conf.server_tag)) {
+ #include "configfile.h"
+ 
+@@ -111,6 +111,8 @@
+               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);
++              } else {
++                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (TLD Linux)"));
+               }
+       }
+