* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2016-02-21 19:14 Jason Donenfeld
0 siblings, 0 replies; 8+ messages in thread
From: Jason Donenfeld @ 2016-02-21 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 3e8c33b631035683ce988e0988a06661524164f5
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 19:13:34 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 19:13:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8c33b6
www-servers/nginx: use the nginx utility command for log reopening
www-servers/nginx/files/nginx.logrotate-r1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1
index a78ed7a..23665e5 100644
--- a/www-servers/nginx/files/nginx.logrotate-r1
+++ b/www-servers/nginx/files/nginx.logrotate-r1
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,6 +7,6 @@
delaycompress
sharedscripts
postrotate
- test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
+ nginx -s reopen
endscript
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2016-04-10 0:43 Manuel Rüger
0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2016-04-10 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 1485d02fee0d8d7c5c22f3bedab637af75a9434e
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 00:39:18 2016 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 00:39:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1485d02f
Revert "www-servers/nginx: use the nginx utility command for log reopening"
Gentoo Bug: #576558
This reverts commit 3e8c33b631035683ce988e0988a06661524164f5.
www-servers/nginx/files/nginx.logrotate-r1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1
index 23665e5..a78ed7a 100644
--- a/www-servers/nginx/files/nginx.logrotate-r1
+++ b/www-servers/nginx/files/nginx.logrotate-r1
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,6 +7,6 @@
delaycompress
sharedscripts
postrotate
- nginx -s reopen
+ test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
endscript
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2016-05-18 6:42 Austin English
0 siblings, 0 replies; 8+ messages in thread
From: Austin English @ 2016-05-18 6:42 UTC (permalink / raw
To: gentoo-commits
commit: d2183985140ac071be26d71ccce8a86022faa74c
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:20 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2183985
www-servers/nginx: use #!/sbin/openrc-run instead of #!/sbin/runscript
www-servers/nginx/files/nginx.initd-r2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/nginx/files/nginx.initd-r2 b/www-servers/nginx/files/nginx.initd-r2
index 54605c4..9cd04be 100644
--- a/www-servers/nginx/files/nginx.initd-r2
+++ b/www-servers/nginx/files/nginx.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2018-02-11 22:18 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2018-02-11 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 9907619044963ae63bcc6a85b3006dde06ce31d8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 11 22:17:17 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 22:17:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99076190
www-servers/nginx: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/7023
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../nginx/files/http_echo-nginx-1.11.11+.patch | 59 ------
.../nginx/files/http_lua_nginx-1.11.11+-r1.patch | 214 ---------------------
.../nginx/files/http_security-pr_1158.patch | 103 ----------
.../nginx/files/http_security-pr_1373.patch | 33 ----
4 files changed, 409 deletions(-)
diff --git a/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch b/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch
deleted file mode 100644
index d4f3db80809..00000000000
--- a/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d16babcc09050966f5055df41572429bd84d811a Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 08:43:30 +0300
-Subject: [PATCH] fixed build with nginx/1.11.11
-
-Closes openresty/echo-nginx-module#64
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_echo_request_info.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/ngx_http_echo_request_info.c b/src/ngx_http_echo_request_info.c
-index d28ec4d..27b3c52 100644
---- a/src/ngx_http_echo_request_info.c
-+++ b/src/ngx_http_echo_request_info.c
-@@ -179,6 +179,9 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
- ngx_int_t i, j;
- ngx_buf_t *b, *first = NULL;
- unsigned found;
-+#if defined(nginx_version) && nginx_version >= 1011011
-+ ngx_chain_t *cl;
-+#endif
- ngx_connection_t *c;
- ngx_http_request_t *mr;
- ngx_http_connection_t *hc;
-@@ -215,8 +218,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-
- if (hc->nbusy) {
- b = NULL;
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+ for (cl = hc->busy; cl; /* void */) {
-+ b = cl->buf;
-+ cl = cl->next;
-+#else
- for (i = 0; i < hc->nbusy; i++) {
- b = hc->busy[i];
-+#endif
-
- if (first == NULL) {
- if (mr->request_line.data >= b->pos
-@@ -280,8 +290,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
- }
-
- if (hc->nbusy) {
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+ for (cl = hc->busy; cl; /* void */) {
-+ b = cl->buf;
-+ cl = cl->next;
-+#else
- for (i = 0; i < hc->nbusy; i++) {
- b = hc->busy[i];
-+#endif
-
- if (!found) {
- if (b != first) {
diff --git a/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch b/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch
deleted file mode 100644
index 2a61c03b200..00000000000
--- a/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 07:50:57 +0300
-Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
-
-Note: nginx 1.11.11+ are still not an officially supported target yet.
-More work needed.
-
-Closes openresty/lua-nginx-module#1016
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_lua_common.h | 6 ++++
- src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
- src/ngx_http_lua_headers.h | 3 ++
- src/ngx_http_lua_module.c | 13 ++++++++-
- 4 files changed, 89 insertions(+), 1 deletion(-)
-
-diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
-index 079a4dc..f37d776 100644
---- a/src/ngx_http_lua_common.h
-+++ b/src/ngx_http_lua_common.h
-@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
- of reqeusts */
- ngx_uint_t malloc_trim_req_count;
-
-+#if nginx_version >= 1011011
-+ /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-+ ngx_buf_t **busy_buf_ptrs;
-+ ngx_int_t busy_buf_ptr_count;
-+#endif
-+
- unsigned requires_header_filter:1;
- unsigned requires_body_filter:1;
- unsigned requires_capture_filter:1;
-diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
-index 2392598..6700ce8 100644
---- a/src/ngx_http_lua_headers.c
-+++ b/src/ngx_http_lua_headers.c
-@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
- static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
- static int ngx_http_lua_ngx_req_header_set(lua_State *L);
- static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
-
-
- static int
-@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
- size_t size;
- ngx_buf_t *b, *first = NULL;
- ngx_int_t i, j;
-+#if nginx_version >= 1011011
-+ ngx_buf_t **bb;
-+ ngx_chain_t *cl;
-+ ngx_http_lua_main_conf_t *lmcf;
-+#endif
- ngx_connection_t *c;
- ngx_http_request_t *r, *mr;
- ngx_http_connection_t *hc;
-@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
- return luaL_error(L, "no request object found");
- }
-
-+#if nginx_version >= 1011011
-+ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-+#endif
-+
- ngx_http_lua_check_fake_request(L, r);
-
- mr = r->main;
-@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
- dd("hc->nbusy: %d", (int) hc->nbusy);
-
- if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
-+ hc->busy->buf->last, hc->busy->buf->end);
-+#else
- dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
- hc->busy[0]->last, hc->busy[0]->end);
-+#endif
- }
-
- dd("request line: %p %p", mr->request_line.data,
-@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
- dd("size: %d", (int) size);
-
- if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+ if (hc->nbusy > lmcf->busy_buf_ptr_count) {
-+ if (lmcf->busy_buf_ptrs) {
-+ ngx_free(lmcf->busy_buf_ptrs);
-+ }
-+
-+ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-+ r->connection->log);
-+
-+ if (lmcf->busy_buf_ptrs == NULL) {
-+ return luaL_error(L, "no memory");
-+ }
-+
-+ lmcf->busy_buf_ptr_count = hc->nbusy;
-+ }
-+
-+ bb = lmcf->busy_buf_ptrs;
-+ for (cl = hc->busy; cl; cl = cl->next) {
-+ *bb++ = cl->buf;
-+ }
-+#endif
- b = NULL;
-+
-+#if nginx_version >= 1011011
-+ bb = lmcf->busy_buf_ptrs;
-+ for (i = hc->nbusy; i > 0; i--) {
-+ b = bb[i - 1];
-+#else
- for (i = 0; i < hc->nbusy; i++) {
- b = hc->busy[i];
-+#endif
-
- dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
- b->start);
-@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
- }
-
- if (hc->nbusy) {
-+
-+#if nginx_version >= 1011011
-+ bb = lmcf->busy_buf_ptrs;
-+ for (i = hc->nbusy - 1; i >= 0; i--) {
-+ b = bb[i];
-+#else
- for (i = 0; i < hc->nbusy; i++) {
- b = hc->busy[i];
-+#endif
-
- if (!found) {
- if (b != first) {
-@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
- #endif /* NGX_LUA_NO_FFI_API */
-
-
-+#if nginx_version >= 1011011
-+void
-+ngx_http_lua_ngx_raw_header_cleanup(void *data)
-+{
-+ ngx_http_lua_main_conf_t *lmcf;
-+
-+ lmcf = (ngx_http_lua_main_conf_t *) data;
-+
-+ if (lmcf->busy_buf_ptrs) {
-+ ngx_free(lmcf->busy_buf_ptrs);
-+ lmcf->busy_buf_ptrs = NULL;
-+ }
-+}
-+#endif
-+
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
-index 39f1114..ee4d21c 100644
---- a/src/ngx_http_lua_headers.h
-+++ b/src/ngx_http_lua_headers.h
-@@ -15,6 +15,9 @@
- void ngx_http_lua_inject_resp_header_api(lua_State *L);
- void ngx_http_lua_inject_req_header_api(lua_State *L);
- void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
-
-
- #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
-diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
-index 3dc2817..875f933 100644
---- a/src/ngx_http_lua_module.c
-+++ b/src/ngx_http_lua_module.c
-@@ -28,6 +28,7 @@
- #include "ngx_http_lua_ssl_certby.h"
- #include "ngx_http_lua_ssl_session_storeby.h"
- #include "ngx_http_lua_ssl_session_fetchby.h"
-+#include "ngx_http_lua_headers.h"
-
-
- static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
-@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
- volatile ngx_cycle_t *saved_cycle;
- ngx_http_core_main_conf_t *cmcf;
- ngx_http_lua_main_conf_t *lmcf;
--#ifndef NGX_LUA_NO_FFI_API
-+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
- ngx_pool_cleanup_t *cln;
- #endif
-
-@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
- cln->handler = ngx_http_lua_sema_mm_cleanup;
- #endif
-
-+#if nginx_version >= 1011011
-+ cln = ngx_pool_cleanup_add(cf->pool, 0);
-+ if (cln == NULL) {
-+ return NGX_ERROR;
-+ }
-+
-+ cln->data = lmcf;
-+ cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
-+#endif
-+
- if (lmcf->lua == NULL) {
- dd("initializing lua vm");
-
diff --git a/www-servers/nginx/files/http_security-pr_1158.patch b/www-servers/nginx/files/http_security-pr_1158.patch
deleted file mode 100644
index 92f1094c243..00000000000
--- a/www-servers/nginx/files/http_security-pr_1158.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 2fa8ffea68498e02005e85c27e61bde30718ae3b Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:18:17 +0200
-Subject: [PATCH 1/2] configure: Fix detection whether libcurl is linked
- against gnutls
-
-The find_curl macro is also checking whether libcurl is linked against
-gnutls. However the check depends on "CURL_LIBS" which wasn't defined
-by the macro.
-
-This commit will define "CURL_LIBS" so that the check works as expected.
----
- build/find_curl.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/find_curl.m4 b/build/find_curl.m4
-index 6b23ad6..3310e40 100644
---- a/build/find_curl.m4
-+++ b/build/find_curl.m4
-@@ -2,6 +2,7 @@ dnl Check for CURL Libraries
- dnl CHECK_CURL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
- dnl Sets:
- dnl CURL_CFLAGS
-+dnl CURL_LDADD
- dnl CURL_LIBS
-
- CURL_CONFIG=""
-@@ -57,7 +58,8 @@ if test -n "${curl_path}"; then
- if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi
- CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
- if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi
-- CURL_LDADD="`${CURL_CONFIG} --libs`"
-+ CURL_LIBS="`${CURL_CONFIG} --libs`"
-+ CURL_LDADD="${CURL_LIBS}"
- if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi
-
- dnl # Check version is ok
-
-From 67f98e7da04251a40a0172e3dfac2c5a6ac6f7dd Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:48:58 +0200
-Subject: [PATCH 2/2] configure: Move verbose_output declaration up to the
- beginning
-
-Macros like "find_curl" are using "verbose_output" variable but because some
-of them are called before we define the variable we are seeing errors like
-
- ./configure: line 13855: test: : integer expression expected
-
-This commit will fix the problem by moving the "verbose_output" declaration
-up to the beginning so that the variable is available for every macro.
----
- configure.ac | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7517885..0f32b01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,22 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
-
- ### Configure Options
-
-+# Verbose output
-+AC_ARG_ENABLE(verbose-output,
-+ AS_HELP_STRING([--enable-verbose-output],
-+ [Enable more verbose configure output.]),
-+[
-+ if test "$enableval" != "no"; then
-+ verbose_output=1
-+ else
-+ verbose_output=0
-+ fi
-+],
-+[
-+ verbose_output=0
-+])
-+
-+
- #OS type
-
- AC_CANONICAL_HOST
-@@ -410,20 +426,6 @@ AC_ARG_ENABLE(errors,
- report_errors=1
- ])
-
--# Verbose output
--AC_ARG_ENABLE(verbose-output,
-- AS_HELP_STRING([--enable-verbose-output],
-- [Enable more verbose configure output.]),
--[
-- if test "$enableval" != "no"; then
-- verbose_output=1
-- else
-- verbose_output=0
-- fi
--],
--[
-- verbose_output=0
--])
-
- # Strict Compile
- AC_ARG_ENABLE(strict-compile,
diff --git a/www-servers/nginx/files/http_security-pr_1373.patch b/www-servers/nginx/files/http_security-pr_1373.patch
deleted file mode 100644
index e4069e16330..00000000000
--- a/www-servers/nginx/files/http_security-pr_1373.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d19df159043106a4d6dfd113696900b5b0dae24b Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Mon, 3 Apr 2017 12:52:01 +0300
-Subject: [PATCH] Fix building with nginx >= 1.11.11
-
-Closes SpiderLabs/ModSecurity#1359
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- nginx/modsecurity/ngx_http_modsecurity.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/nginx/modsecurity/ngx_http_modsecurity.c b/nginx/modsecurity/ngx_http_modsecurity.c
-index 7c13953..367b2b8 100644
---- a/nginx/modsecurity/ngx_http_modsecurity.c
-+++ b/nginx/modsecurity/ngx_http_modsecurity.c
-@@ -528,9 +528,15 @@ ngx_http_modsecurity_save_request_body(ngx_http_request_t *r)
-
- hc = r->http_connection;
-
-+#if defined(nginx_version) && nginx_version >= 1011011
-+ if (hc->free && size == cscf->large_client_header_buffers.size) {
-+
-+ buf = hc->free->buf;
-+#else
- if (hc->nfree && size == cscf->large_client_header_buffers.size) {
-
- buf = hc->free[--hc->nfree];
-+#endif
-
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "ModSecurity: use http free large header buffer: %p %uz",
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2020-04-11 21:11 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2020-04-11 21:11 UTC (permalink / raw
To: gentoo-commits
commit: ebd358e0aaa62b455d1eb318f509bb1804fe3285
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 20:45:27 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 21:10:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd358e0
www-servers/nginx: add workaround for race-condition on systemd
Closes: https://bugs.gentoo.org/716700
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
www-servers/nginx/files/nginx.service-r1 | 1 +
1 file changed, 1 insertion(+)
diff --git a/www-servers/nginx/files/nginx.service-r1 b/www-servers/nginx/files/nginx.service-r1
index 797c7edffaf..e160af7625b 100644
--- a/www-servers/nginx/files/nginx.service-r1
+++ b/www-servers/nginx/files/nginx.service-r1
@@ -7,6 +7,7 @@ Type=forking
PIDFile=/run/nginx.pid
ExecStartPre=/usr/sbin/nginx -t
ExecStart=/usr/sbin/nginx
+ExecStartPost=/bin/sleep 0.1
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/bin/kill -QUIT $MAINPID
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2022-07-19 17:10 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-07-19 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 2fa824955dfb482b3abcc3f499d820d476a1013c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 19 15:33:41 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:09:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa82495
www-servers/nginx: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26482
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
| 187 ---------------------
1 file changed, 187 deletions(-)
diff --git a/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch b/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch
deleted file mode 100644
index 4c06315323f3..000000000000
--- a/www-servers/nginx/files/http_headers_more-nginx-1.23.0.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
-index c3eb8f7..84c7525 100644
---- a/src/ngx_http_headers_more_headers_in.c
-+++ b/src/ngx_http_headers_more_headers_in.c
-@@ -158,9 +158,15 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
- ngx_http_set_builtin_header },
- #endif
-
-+#if defined(nginx_version) && nginx_version >= 1023000
-+ { ngx_string("Cookie"),
-+ offsetof(ngx_http_headers_in_t, cookie),
-+ ngx_http_set_builtin_multi_header },
-+#else
- { ngx_string("Cookie"),
- offsetof(ngx_http_headers_in_t, cookies),
- ngx_http_set_builtin_multi_header },
-+#endif
-
- { ngx_null_string, 0, ngx_http_set_header }
- };
-diff --git a/.travis.yml b/.travis.yml
-index 9748a99..bf40b31 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -23,6 +23,7 @@ env:
- matrix:
- - NGINX_VERSION=1.19.3
- - NGINX_VERSION=1.19.9
-+ - NGINX_VERSION=1.23.0
-
- before_install:
- - sudo apt-get update -y
-@@ -51,3 +52,4 @@ script:
- - export NGX_BUILD_CC=$CC
- - sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
- - prove -I. -r t
-+
-diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
-index 84c7525..11447ce 100644
---- a/src/ngx_http_headers_more_headers_in.c
-+++ b/src/ngx_http_headers_more_headers_in.c
-@@ -758,6 +758,50 @@ static ngx_int_t
- ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
- ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
- {
-+#if defined(nginx_version) && nginx_version >= 1023000
-+ ngx_table_elt_t **headers, **ph, *h;
-+ int nelts;
-+
-+ if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
-+ /* must be a 400 Bad Request */
-+ return NGX_OK;
-+ }
-+
-+ headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
-+
-+ if (*headers) {
-+ nelts = 0;
-+ for (h = *headers; h; h = h->next) {
-+ nelts++;
-+ }
-+
-+ *headers = NULL;
-+
-+ dd("clear multi-value headers: %d", nelts);
-+ }
-+
-+ if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
-+ return NGX_ERROR;
-+ }
-+
-+ if (value->len == 0) {
-+ return NGX_OK;
-+ }
-+
-+ dd("new multi-value header: %p", h);
-+
-+ if (*headers) {
-+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
-+ *ph = h;
-+
-+ } else {
-+ *headers = h;
-+ }
-+
-+ h->next = NULL;
-+
-+ return NGX_OK;
-+#else
- ngx_array_t *headers;
- ngx_table_elt_t **v, *h;
-
-@@ -810,6 +854,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
-
- *v = h;
- return NGX_OK;
-+#endif
- }
-
-
-@@ -842,6 +887,7 @@ ngx_http_headers_more_validate_host(ngx_str_t *host, ngx_pool_t *pool,
- if (dot_pos == i - 1) {
- return NGX_DECLINED;
- }
-+
- dot_pos = i;
- break;
-
-diff --git a/src/ngx_http_headers_more_headers_out.c b/src/ngx_http_headers_more_headers_out.c
-index 0f9bc87..9d58ede 100644
---- a/src/ngx_http_headers_more_headers_out.c
-+++ b/src/ngx_http_headers_more_headers_out.c
-@@ -327,6 +327,46 @@ static ngx_int_t
- ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
- ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
- {
-+#if defined(nginx_version) && nginx_version >= 1023000
-+ ngx_table_elt_t **headers, *h, *ho, **ph;
-+
-+ headers = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
-+
-+ if (*headers) {
-+ for (h = (*headers)->next; h; h = h->next) {
-+ h->hash = 0;
-+ h->value.len = 0;
-+ }
-+
-+ h = *headers;
-+
-+ h->value = *value;
-+
-+ if (value->len == 0) {
-+ h->hash = 0;
-+
-+ } else {
-+ h->hash = hv->hash;
-+ }
-+
-+ return NGX_OK;
-+ }
-+
-+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
-+
-+ ho = ngx_list_push(&r->headers_out.headers);
-+ if (ho == NULL) {
-+ return NGX_ERROR;
-+ }
-+
-+ ho->value = *value;
-+ ho->hash = hv->hash;
-+ ngx_str_set(&ho->key, "Cache-Control");
-+ ho->next = NULL;
-+ *ph = ho;
-+
-+ return NGX_OK;
-+#else
- ngx_array_t *pa;
- ngx_table_elt_t *ho, **ph;
- ngx_uint_t i;
-@@ -378,6 +418,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
- *ph = ho;
-
- return NGX_OK;
-+#endif
- }
-
-
-diff --git a/src/ngx_http_headers_more_util.c b/src/ngx_http_headers_more_util.c
-index caf372e..e1f3636 100644
---- a/src/ngx_http_headers_more_util.c
-+++ b/src/ngx_http_headers_more_util.c
-@@ -295,6 +295,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
- if (part->next == NULL) {
- return NGX_ERROR;
- }
-+
- part = part->next;
- }
-
-@@ -338,6 +339,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
- if (part->next == NULL) {
- return NGX_ERROR;
- }
-+
- part = part->next;
- }
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2022-10-26 19:56 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-10-26 19:56 UTC (permalink / raw
To: gentoo-commits
commit: e909e87bf3113e65b22c1e81d55cfbd8b467497e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 24 18:24:30 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 19:46:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e909e87b
www-servers/nginx: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27937
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/http_uploadprogress-issue_50-r1.patch | 31 ----------------------
1 file changed, 31 deletions(-)
diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
deleted file mode 100644
index 42cbd779a8cb..000000000000
--- a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dd138546b16a01e9c09613d02211373baf1cac02 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Thu, 20 Oct 2016 03:09:37 +0200
-Subject: [PATCH] config: Fix ngx_module_type
-
-Since commit 37182ce2f3b6 the module was not present in static builds
-because due to an invalid "ngx_module_type" the module was not added to
-objs/ngx_modules.c.
-
-This commit will fix the problem by setting the correct module type
-"HTTP_FILTER" [Link 1].
-
-Link 1: https://www.nginx.com/resources/wiki/extending/new_config/#key-ngx_module_type
-Gentoo-Bug: https://bugs.gentoo.org/593450
-Fixes: https://github.com/masterzen/nginx-upload-progress-module/issues/50
----
- config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config b/config
-index 364af8c..5f4ade1 100644
---- a/config
-+++ b/config
-@@ -1,6 +1,6 @@
- ngx_addon_name=ngx_http_uploadprogress_module
- if test -n "$ngx_module_link"; then
-- ngx_module_type=FILTER
-+ ngx_module_type=HTTP_FILTER
- ngx_module_name=ngx_http_uploadprogress_module
- ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/
@ 2023-04-22 0:11 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-04-22 0:11 UTC (permalink / raw
To: gentoo-commits
commit: 8fc4f23831d061058c6e3ba2190272340ac5f871
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Apr 21 14:33:28 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 00:10:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc4f238
www-servers/nginx: remove unused patch/files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30682
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/http_javascript_cve_2022-38890.patch | 49 ---------------
www-servers/nginx/files/nginx.conf-r2 | 69 ----------------------
2 files changed, 118 deletions(-)
diff --git a/www-servers/nginx/files/http_javascript_cve_2022-38890.patch b/www-servers/nginx/files/http_javascript_cve_2022-38890.patch
deleted file mode 100644
index 43469b552968..000000000000
--- a/www-servers/nginx/files/http_javascript_cve_2022-38890.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b9aea5854bcf6f2de8f7a7f1550874e392b94be2 Mon Sep 17 00:00:00 2001
-From: Dmitry Volyntsev <xeioex@nginx.com>
-Date: Wed, 31 Aug 2022 18:35:58 -0700
-Subject: [PATCH] Fixed String.prototype.trimEnd() with unicode string.
-
-Previously, when the method was invoked with a string consisting of space
-characters and at least one of them was a Unicode space separator (code
-point above 127) it returned invalid string value with non-zero size
-but zero length.
-
-The fix is to update the size of the resulting string appropriately.
-
-This closes #569 issue on Github.
----
- src/njs_string.c | 1 +
- src/test/njs_unit_test.c | 8 ++++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/njs_string.c b/src/njs_string.c
-index 83cede548..62bece0de 100644
---- a/src/njs_string.c
-+++ b/src/njs_string.c
-@@ -2849,6 +2849,7 @@ njs_string_trim(const njs_value_t *value, njs_string_prop_t *string,
-
- for ( ;; ) {
- if (start == prev) {
-+ end = prev;
- break;
- }
-
-diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
-index 287ddda2d..a717f02a8 100644
---- a/src/test/njs_unit_test.c
-+++ b/src/test/njs_unit_test.c
-@@ -8450,6 +8450,14 @@ static njs_unit_test_t njs_test[] =
- { njs_str("' абв '.trimStart().trimEnd()"),
- njs_str("абв") },
-
-+ { njs_str("["
-+ " String.fromCodePoint(0x2028),"
-+ " String.fromCodePoint(0x20, 0x2028),"
-+ " String.fromCodePoint(0x0009, 0x20, 0x2028),"
-+ " String.fromCodePoint(0xFEFF),"
-+ "].every(v => v.trimEnd() == '')"),
-+ njs_str("true") },
-+
- { njs_str("'\\u2029abc\\uFEFF\\u2028'.trim()"),
- njs_str("abc") },
-
diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2
deleted file mode 100644
index 917c6c1700fb..000000000000
--- a/www-servers/nginx/files/nginx.conf-r2
+++ /dev/null
@@ -1,69 +0,0 @@
-user nginx nginx;
-worker_processes 1;
-
-error_log /var/log/nginx/error_log info;
-
-events {
- worker_connections 1024;
- use epoll;
-}
-
-http {
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
- log_format main
- '$remote_addr - $remote_user [$time_local] '
- '"$request" $status $bytes_sent '
- '"$http_referer" "$http_user_agent" '
- '"$gzip_ratio"';
-
- client_header_timeout 10m;
- client_body_timeout 10m;
- send_timeout 10m;
-
- connection_pool_size 256;
- client_header_buffer_size 1k;
- large_client_header_buffers 4 2k;
- request_pool_size 4k;
-
- gzip off;
-
- output_buffers 1 32k;
- postpone_output 1460;
-
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
-
- keepalive_timeout 75 20;
-
- ignore_invalid_headers on;
-
- index index.html;
-
- server {
- listen 127.0.0.1;
- server_name localhost;
-
- access_log /var/log/nginx/localhost.access_log main;
- error_log /var/log/nginx/localhost.error_log info;
-
- root /var/www/localhost/htdocs;
- }
-
- # SSL example
- #server {
- # listen 127.0.0.1:443;
- # server_name localhost;
-
- # ssl on;
- # ssl_certificate /etc/ssl/nginx/nginx.pem;
- # ssl_certificate_key /etc/ssl/nginx/nginx.key;
-
- # access_log /var/log/nginx/localhost.ssl_access_log main;
- # error_log /var/log/nginx/localhost.ssl_error_log info;
-
- # root /var/www/localhost/htdocs;
- #}
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-04-22 0:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-21 19:14 [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/ Jason Donenfeld
-- strict thread matches above, loose matches on Subject: below --
2016-04-10 0:43 Manuel Rüger
2016-05-18 6:42 Austin English
2018-02-11 22:18 Thomas Deutschmann
2020-04-11 21:11 Thomas Deutschmann
2022-07-19 17:10 Conrad Kostecki
2022-10-26 19:56 Conrad Kostecki
2023-04-22 0:11 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox