aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/nginx-devel/Makefile5
-rw-r--r--www/nginx-devel/distinfo4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger::build::nginx.rb4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c54
-rw-r--r--www/nginx/Makefile5
-rw-r--r--www/nginx/distinfo4
-rw-r--r--www/nginx/files/extra-patch-passenger::build::nginx.rb4
-rw-r--r--www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c54
-rw-r--r--www/rubygem-passenger/Makefile2
-rw-r--r--www/rubygem-passenger/distinfo4
10 files changed, 15 insertions, 125 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 8bd323fa226d..7a0ce5e2c09a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -465,12 +465,11 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 3.0.8
+PASSENGER_VERSION= 3.0.9
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb \
- ${PATCHDIR}/extra-patch-passenger::ext::nginx::ContentHandler.c
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb
.if !defined(WITH_DEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index ad474d5205ad..531a01978514 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -58,8 +58,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.3.0-0-gdd0d4d0.tar.gz) = bc79060f156f8c4
SIZE (chaoslawful-lua-nginx-module-v0.3.0-0-gdd0d4d0.tar.gz) = 167903
SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
-SHA256 (passenger-3.0.8.tar.gz) = ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
-SIZE (passenger-3.0.8.tar.gz) = 2362561
+SHA256 (passenger-3.0.9.tar.gz) = 40a15c46bd0be13a8d55931cc526c5dae740f7c02d2bfc40a82075967131d7f6
+SIZE (passenger-3.0.9.tar.gz) = 2365647
SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0e086406486675d04283
SIZE (ngx_postgres-0.8.tar.gz) = 40108
SHA256 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
diff --git a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
index f6b0bb80b97a..bad20532f997 100644
--- a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-3.0.8/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.8/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.9/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.9/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
@@ -23,10 +23,7 @@
desc "Build Nginx helper agent"
diff --git a/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c b/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c
deleted file mode 100644
index b71bd650bbb9..000000000000
--- a/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../passenger-3.0.8/ext/nginx/ContentHandler.c.orig 2011-08-10 10:35:24.000000000 +0400
-+++ ../passenger-3.0.8/ext/nginx/ContentHandler.c 2011-08-10 10:36:35.000000000 +0400
-@@ -336,6 +336,7 @@
- ngx_table_elt_t *header;
- ngx_http_script_code_pt code;
- ngx_http_script_engine_t e, le;
-+ ngx_http_core_srv_conf_t *cscf;
- passenger_loc_conf_t *slcf;
- passenger_main_conf_t *main_conf;
- passenger_context_t *context;
-@@ -344,6 +345,7 @@
- ngx_http_ssl_srv_conf_t *ssl_conf;
- #endif
-
-+ cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
- slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
- main_conf = &passenger_main_conf;
- context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
-@@ -415,11 +417,15 @@
- }
-
- /* SERVER_NAME; must be equal to HTTP_HOST without the port part */
-- tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
-- if (tmp == NULL) {
-- server_name_len = r->headers_in.host->value.len;
-+ if (r->headers_in.host != NULL) {
-+ tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
-+ if (tmp == NULL) {
-+ server_name_len = r->headers_in.host->value.len;
-+ } else {
-+ server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
-+ }
- } else {
-- server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
-+ server_name_len = cscf->server_name.len;
- }
- len += sizeof("SERVER_NAME") + server_name_len + 1;
-
-@@ -650,8 +656,13 @@
-
- /* SERVER_NAME */
- b->last = ngx_copy(b->last, "SERVER_NAME", sizeof("SERVER_NAME"));
-- b->last = ngx_copy(b->last, r->headers_in.host->value.data,
-- server_name_len);
-+ if (r->headers_in.host != NULL) {
-+ b->last = ngx_copy(b->last, r->headers_in.host->value.data,
-+ server_name_len);
-+ } else {
-+ b->last = ngx_copy(b->last, cscf->server_name.data,
-+ server_name_len);
-+ }
- b->last = ngx_copy(b->last, "", 1);
-
- /* Various other HTTP headers. */
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index ec66e8c1d3e8..0c198c97a0da 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -465,12 +465,11 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 3.0.8
+PASSENGER_VERSION= 3.0.9
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb \
- ${PATCHDIR}/extra-patch-passenger::ext::nginx::ContentHandler.c
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb
.if !defined(WITH_DEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 42d925cf9ba4..09d619b0e461 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -58,8 +58,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.3.0-0-gdd0d4d0.tar.gz) = bc79060f156f8c4
SIZE (chaoslawful-lua-nginx-module-v0.3.0-0-gdd0d4d0.tar.gz) = 167903
SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
-SHA256 (passenger-3.0.8.tar.gz) = ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
-SIZE (passenger-3.0.8.tar.gz) = 2362561
+SHA256 (passenger-3.0.9.tar.gz) = 40a15c46bd0be13a8d55931cc526c5dae740f7c02d2bfc40a82075967131d7f6
+SIZE (passenger-3.0.9.tar.gz) = 2365647
SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0e086406486675d04283
SIZE (ngx_postgres-0.8.tar.gz) = 40108
SHA256 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
diff --git a/www/nginx/files/extra-patch-passenger::build::nginx.rb b/www/nginx/files/extra-patch-passenger::build::nginx.rb
index f6b0bb80b97a..bad20532f997 100644
--- a/www/nginx/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx/files/extra-patch-passenger::build::nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-3.0.8/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.8/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.9/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.9/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
@@ -23,10 +23,7 @@
desc "Build Nginx helper agent"
diff --git a/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c b/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c
deleted file mode 100644
index b71bd650bbb9..000000000000
--- a/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../passenger-3.0.8/ext/nginx/ContentHandler.c.orig 2011-08-10 10:35:24.000000000 +0400
-+++ ../passenger-3.0.8/ext/nginx/ContentHandler.c 2011-08-10 10:36:35.000000000 +0400
-@@ -336,6 +336,7 @@
- ngx_table_elt_t *header;
- ngx_http_script_code_pt code;
- ngx_http_script_engine_t e, le;
-+ ngx_http_core_srv_conf_t *cscf;
- passenger_loc_conf_t *slcf;
- passenger_main_conf_t *main_conf;
- passenger_context_t *context;
-@@ -344,6 +345,7 @@
- ngx_http_ssl_srv_conf_t *ssl_conf;
- #endif
-
-+ cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
- slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
- main_conf = &passenger_main_conf;
- context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
-@@ -415,11 +417,15 @@
- }
-
- /* SERVER_NAME; must be equal to HTTP_HOST without the port part */
-- tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
-- if (tmp == NULL) {
-- server_name_len = r->headers_in.host->value.len;
-+ if (r->headers_in.host != NULL) {
-+ tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
-+ if (tmp == NULL) {
-+ server_name_len = r->headers_in.host->value.len;
-+ } else {
-+ server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
-+ }
- } else {
-- server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
-+ server_name_len = cscf->server_name.len;
- }
- len += sizeof("SERVER_NAME") + server_name_len + 1;
-
-@@ -650,8 +656,13 @@
-
- /* SERVER_NAME */
- b->last = ngx_copy(b->last, "SERVER_NAME", sizeof("SERVER_NAME"));
-- b->last = ngx_copy(b->last, r->headers_in.host->value.data,
-- server_name_len);
-+ if (r->headers_in.host != NULL) {
-+ b->last = ngx_copy(b->last, r->headers_in.host->value.data,
-+ server_name_len);
-+ } else {
-+ b->last = ngx_copy(b->last, cscf->server_name.data,
-+ server_name_len);
-+ }
- b->last = ngx_copy(b->last, "", 1);
-
- /* Various other HTTP headers. */
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 54d2931f1816..2bd89fb2d720 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 3.0.8
+PORTVERSION= 3.0.9
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 995146082c12..b315289bebc6 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-3.0.8.gem) = 5ae7b247c6dd5c451629ac7647ae9ec83e8cb9786f0659720478fdc2529e7ca7
-SIZE (rubygem/passenger-3.0.8.gem) = 2358784
+SHA256 (rubygem/passenger-3.0.9.gem) = b307be9e34d38503c2ee16967029bffc4d64764e07d7ba4c4a07ec4dec57d7ff
+SIZE (rubygem/passenger-3.0.9.gem) = 2363904
generated by cgit (git 2.34.1) at 2025-03-04 19:53:42 +0800