From 2a2a531157ed4a0307bb1e454f42cedb4203f0a9 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Sat, 26 Mar 2016 18:18:22 -0700 Subject: [PATCH] patches: match current lighttpd patch state --- patches/lighttpd/q/t_server_idle-timeout.diff | 6 +++--- patches/lighttpd/q/t_server_pid-truncate.diff | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/patches/lighttpd/q/t_server_idle-timeout.diff b/patches/lighttpd/q/t_server_idle-timeout.diff index 018dd6e..622b404 100644 --- a/patches/lighttpd/q/t_server_idle-timeout.diff +++ b/patches/lighttpd/q/t_server_idle-timeout.diff @@ -10,7 +10,7 @@ Signed-off-by: Kyle J. McKay 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/src/server.c b/src/server.c -index 409742e5..1bced192 100644 +index bd65413a..e7b6074f 100644 --- a/src/server.c +++ b/src/server.c @@ -559,6 +559,7 @@ static void show_help (void) { @@ -80,9 +80,9 @@ index 409742e5..1bced192 100644 for (ndx = 0; ndx < srv->joblist->used; ndx++) { connection *con = srv->joblist->ptr[ndx]; handler_t r; -@@ -1583,16 +1606,21 @@ int main (int argc, char **argv) { - if (0 == graceful_shutdown) +@@ -1584,16 +1607,21 @@ int main (int argc, char **argv) { remove_pid_file(srv, &pid_fd); + } + if (timed_out) { + log_error_write(srv, __FILE__, __LINE__, "s", diff --git a/patches/lighttpd/q/t_server_pid-truncate.diff b/patches/lighttpd/q/t_server_pid-truncate.diff index 46be205..097a20d 100644 --- a/patches/lighttpd/q/t_server_pid-truncate.diff +++ b/patches/lighttpd/q/t_server_pid-truncate.diff @@ -17,11 +17,11 @@ pid of a process that is no longer running. Signed-off-by: Kyle J. McKay --- - src/server.c | 70 ++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 42 insertions(+), 28 deletions(-) + src/server.c | 69 ++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/src/server.c b/src/server.c -index c5845e2c..409742e5 100644 +index c5845e2c..bd65413a 100644 --- a/src/server.c +++ b/src/server.c @@ -356,6 +356,34 @@ static void server_free(server *srv) { @@ -125,7 +125,7 @@ index c5845e2c..409742e5 100644 log_error_write(srv, __FILE__, __LINE__, "s", "[note] graceful shutdown started"); } else if (srv->conns->used >= srv->max_conns) { log_error_write(srv, __FILE__, __LINE__, "s", "[note] sockets disabled, connection limit reached"); -@@ -1555,19 +1580,8 @@ int main (int argc, char **argv) { +@@ -1555,18 +1580,8 @@ int main (int argc, char **argv) { srv->joblist->used = 0; } @@ -141,10 +141,9 @@ index c5845e2c..409742e5 100644 - strerror(errno)); - } - } -- } -+ if (0 == graceful_shutdown) ++ if (0 == graceful_shutdown) { + remove_pid_file(srv, &pid_fd); + } #ifdef HAVE_SIGACTION - log_error_write(srv, __FILE__, __LINE__, "sdsd", --- -- 2.11.4.GIT