aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2009-11-26 06:52:33 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2009-11-26 06:52:33 +0000
commit83270f61f7ef7400089d9facf5af4d626ed6260e (patch)
tree1ee33ed3d87d38dd25d72805e512448eef25c2eb /www
parent38142dc662f02fd404b420c8dda0d568e9158590 (diff)
downloadports-83270f61f7ef7400089d9facf5af4d626ed6260e.tar.gz
ports-83270f61f7ef7400089d9facf5af4d626ed6260e.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/nginx-devel/Makefile4
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_upload_module.c13
2 files changed, 17 insertions, 0 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 8849027fad58..b3bf3a1d6bfe 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -368,6 +368,10 @@ post-patch:
@${PATCH} ${PATCH_ARGS} < \
${PATCHDIR}/extra-patch-ngx_http_redis_module.c
.endif
+.if defined(WITH_HTTP_UPLOAD_MODULE)
+ @${PATCH} ${PATCH_ARGS} < \
+ ${PATCHDIR}/extra-patch-ngx_http_upload_module.c
+.endif
.if defined(WITH_PASSENGER_MODULE)
@${REINPLACE_CMD} 's!g++!${CXX}!' \
${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c b/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
new file mode 100644
index 000000000000..f1c9fc7a8514
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
@@ -0,0 +1,13 @@
+--- ../nginx_upload_module-2.0.11/ngx_http_upload_module.c
++++ ../nginx_upload_module-2.0.11/ngx_http_upload_module.c
+@@ -719,6 +719,10 @@ static ngx_int_t ngx_http_upload_body_handler(ngx_http_request_t *r) { /* {{{ */
+ ngx_sprintf(r->headers_in.content_length->value.data, "%O", r->headers_in.content_length_n)
+ - r->headers_in.content_length->value.data;
+
++#if defined nginx_version && nginx_version >= 8011
++ r->main->count--;
++#endif
++
+ if(uri->len != 0 && uri->data[0] == '/') {
+ rc = ngx_http_internal_redirect(r, uri, &args);
+ }