- merged 1.4.48 from PLD, TLDized

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

diff --git a/lighttpd-branding.patch b/lighttpd-branding.patch
index f7e6dd54df3c79e546625a53eaa5669067c5afec..64a9be415fd2d02fc76e0c6f1d63eaaa0cabb3d7 100644 (file)
--- a/lighttpd-branding.patch
+++ b/lighttpd-branding.patch
@@ -1,19 +1,11 @@
---- 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"
+--- lighttpd-1.4.46/src/server.c~      2017-10-21 22:36:29.000000000 +0300
++++ lighttpd-1.4.46/src/server.c       2017-10-22 14:38:39.530007753 +0300
+@@ -25,7 +25,7 @@
+ # define REPO_VERSION ""
+ #endif
  
- #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)"));
-               }
-       }
+-#define PACKAGE_DESC PACKAGE_NAME "/" PACKAGE_VERSION REPO_VERSION
++#define PACKAGE_DESC PACKAGE_NAME "/" PACKAGE_VERSION REPO_VERSION " (TLD Linux)"
  
+ #include <sys/types.h>
+ #include <sys/time.h>