starlingx/integ
Code Issues Proposed changes

rebase lighttpd patch to CentOS 7.6 version

Browse Source 
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/627610

Story: 2004522
Task: 28408

Change-Id: I4e179b174ddfb2c1677d8dcd17223127f8242c41
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
This commit is contained in:
Zhe Hu 2018-12-28 14:52:02 +08:00
parent 91fae223de
commit fc0bdf5aa5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/lighttpd/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -16,7 +16,7 @@ index 2f7b261..2553b27 100644
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
Summary: Lightning fast webserver with light system requirements Summary: Lightning fast webserver with light system requirements
Name: lighttpd Name: lighttpd
Version: 1.4.51 Version: 1.4.52
-Release: 1%{?dist} -Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
License: BSD License: BSD

2
base/lighttpd/centos/patches/check-content-length.patch
View File

@ -54,7 +54,7 @@ index 213a87e..8c97f45 100644
static int request_check_hostname(buffer *host) { static int request_check_hostname(buffer *host) {
enum { DOMAINLABEL, TOPLABEL } stage = TOPLABEL; enum { DOMAINLABEL, TOPLABEL } stage = TOPLABEL;
@@ -1149,6 +1178,22 @@ int http_request_parse(server *srv, connection *con) { @@ -1176,6 +1205,22 @@ int http_request_parse(server *srv, connection *con) {
con->http_status = 411; con->http_status = 411;
goto failure; goto failure;
} }

20
base/lighttpd/centos/patches/lighttpd-tpm-support.patch
View File

@ -48,9 +48,9 @@ index 2fe60b6..bddcd01 100644
+ EVP_PKEY *tpm_key; + EVP_PKEY *tpm_key;
+#endif +#endif
buffer *syslog_facility; buffer *syslog_facility;
} server_config;
@@ -384,6 +406,8 @@ struct server { unsigned short compat_module_load;
@@ -386,6 +408,8 @@ struct server {
int con_written; int con_written;
int con_closed; int con_closed;
@ -63,7 +63,7 @@ diff --git a/src/configfile.c b/src/configfile.c
index c3b0f16..dca2a29 100644 index c3b0f16..dca2a29 100644
--- a/src/configfile.c --- a/src/configfile.c
+++ b/src/configfile.c +++ b/src/configfile.c
@@ -273,8 +273,10 @@ static int config_insert(server *srv) { @@ -277,8 +277,10 @@ static int config_insert(server *srv) {
{ "server.syslog-facility", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 80 */ { "server.syslog-facility", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 80 */
{ "server.socket-perms", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 81 */ { "server.socket-perms", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 81 */
{ "server.http-parseopts", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_SERVER }, /* 82 */ { "server.http-parseopts", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_SERVER }, /* 82 */
@ -75,7 +75,7 @@ index c3b0f16..dca2a29 100644
}; };
/* all T_CONFIG_SCOPE_SERVER options */ /* all T_CONFIG_SCOPE_SERVER options */
@@ -315,6 +317,8 @@ static int config_insert(server *srv) { @@ -321,6 +323,8 @@ static int config_insert(server *srv) {
cv[80].destination = srv->srvconf.syslog_facility; cv[80].destination = srv->srvconf.syslog_facility;
http_parseopts = array_init(); http_parseopts = array_init();
cv[82].destination = http_parseopts; cv[82].destination = http_parseopts;
@ -88,7 +88,7 @@ diff --git a/src/mod_openssl.c b/src/mod_openssl.c
index 75e0873..4cb0335 100644 index 75e0873..4cb0335 100644
--- a/src/mod_openssl.c --- a/src/mod_openssl.c
+++ b/src/mod_openssl.c +++ b/src/mod_openssl.c
@@ -444,6 +444,29 @@ error: @@ -451,6 +451,29 @@ error:
return NULL; return NULL;
} }
@ -118,7 +118,7 @@ index 75e0873..4cb0335 100644
static EVP_PKEY * static EVP_PKEY *
evp_pkey_load_pem_file (server *srv, const char *file) evp_pkey_load_pem_file (server *srv, const char *file)
@@ -498,15 +521,23 @@ network_openssl_load_pemfile (server *srv, plugin_config *s, size_t ndx) @@ -505,15 +528,23 @@ network_openssl_load_pemfile (server *srv, plugin_config *s, size_t ndx)
s->ssl_pemfile_x509 = x509_load_pem_file(srv, s->ssl_pemfile->ptr); s->ssl_pemfile_x509 = x509_load_pem_file(srv, s->ssl_pemfile->ptr);
if (NULL == s->ssl_pemfile_x509) return -1; if (NULL == s->ssl_pemfile_x509) return -1;
@ -151,7 +151,7 @@ index 75e0873..4cb0335 100644
} }
return 0; return 0;
@@ -673,6 +704,43 @@ network_init_ssl (server *srv, void *p_d) @@ -680,6 +711,43 @@ network_init_ssl (server *srv, void *p_d)
force_assert(NULL != local_send_buffer); force_assert(NULL != local_send_buffer);
} }
@ -195,7 +195,7 @@ index 75e0873..4cb0335 100644
if (!buffer_string_is_empty(s->ssl_pemfile)) { if (!buffer_string_is_empty(s->ssl_pemfile)) {
#ifdef OPENSSL_NO_TLSEXT #ifdef OPENSSL_NO_TLSEXT
data_config *dc = (data_config *)srv->config_context->data[i]; data_config *dc = (data_config *)srv->config_context->data[i];
@@ -935,29 +1003,36 @@ network_init_ssl (server *srv, void *p_d) @@ -949,29 +1017,36 @@ network_init_ssl (server *srv, void *p_d)
} }
} }
@ -258,7 +258,7 @@ index f6409bb..2ace3f8 100644
CLEAN(tmp_chunk_len); CLEAN(tmp_chunk_len);
#undef CLEAN #undef CLEAN
@@ -348,6 +353,14 @@ static void server_free(server *srv) { @@ -349,6 +354,14 @@ static void server_free(server *srv) {
CLEAN(srvconf.xattr_name); CLEAN(srvconf.xattr_name);
CLEAN(srvconf.syslog_facility); CLEAN(srvconf.syslog_facility);
@ -273,7 +273,7 @@ index f6409bb..2ace3f8 100644
CLEAN(tmp_chunk_len); CLEAN(tmp_chunk_len);
#undef CLEAN #undef CLEAN
@@ -782,7 +795,9 @@ static int log_error_open(server *srv) { @@ -784,7 +797,9 @@ static int log_error_open(server *srv) {
if (-1 == (errfd = fdevent_open_devnull())) { if (-1 == (errfd = fdevent_open_devnull())) {
log_error_write(srv, __FILE__, __LINE__, "ss", log_error_write(srv, __FILE__, __LINE__, "ss",
"opening /dev/null failed:", strerror(errno)); "opening /dev/null failed:", strerror(errno));

2
base/lighttpd/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/lighttpd-1.4.51-1.el7.src.rpm mirror:Source/lighttpd-1.4.52-1.el7.src.rpm