summaryrefslogtreecommitdiff
path: root/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2009-03-24 10:15:07 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2009-03-24 10:15:07 +0000
commitc232560ac98c0fc72c18cfe63b1f1e8b077eb428 (patch)
tree15184eef23517e69d655dae49e530d5a21ef1c2e /www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
parent- zope27 was switch to python24, chase here (diff)
Update from 0.7.43 to 0.7.44.
Add MAKE_JOBS_SAFE. Add quick fix for nginx_upload_module due to changes in ngx_conf_merge_path_value() function. <ChangeLog> *) Feature: the ngx_http_proxy_module preliminary cache support. *) Feature: the --with-pcre option in the configure. *) Feature: the "try_files" directive is now allowed on the server block level. *) Bugfix: the "try_files" directive handled incorrectly a query string in a fallback parameter. *) Bugfix: the "try_files" directive might test incorrectly directories. *) Bugfix: if there is the single server for given address:port pair, then captures in regular expressions in a "server_name" directive did not work. </ChangeLog>
Diffstat (limited to 'www/nginx-devel/files/extra-patch-ngx_http_upload_module.c')
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_upload_module.c27
1 files changed, 27 insertions, 0 deletions
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..7f2131490168
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
@@ -0,0 +1,27 @@
+--- ../nginx_upload_module-2.0.8/ngx_http_upload_module.c.orig 2009-03-24 10:43:49.000000000 +0300
++++ ../nginx_upload_module-2.0.8/ngx_http_upload_module.c 2009-03-24 11:06:15.000000000 +0300
+@@ -208,6 +208,10 @@
+ void *conf);
+ static void ngx_upload_cleanup_handler(void *data);
+
++static ngx_path_init_t ngx_http_upload_temp_path = {
++ ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
++};
++
+ /*
+ * upload_init_ctx
+ *
+@@ -1145,10 +1149,10 @@
+
+ ngx_conf_merge_str_value(conf->url, prev->url, "");
+
+- ngx_conf_merge_path_value(conf->store_path,
++ ngx_conf_merge_path_value(cf,
++ &conf->store_path,
+ prev->store_path,
+- NGX_HTTP_PROXY_TEMP_PATH, 1, 2, 0,
+- ngx_garbage_collector_temp_handler, cf);
++ &ngx_http_upload_temp_path);
+
+ ngx_conf_merge_uint_value(conf->store_access,
+ prev->store_access, 0600);