summaryrefslogtreecommitdiff
path: root/www/nginx-devel/files/extra-patch-fastdfs-src-config
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2019-10-22 18:33:14 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2019-10-22 18:33:14 +0000
commit4d738f27c954ca0e0637dcd82dc9ee5227b4b5b2 (patch)
treeea9d97413ed914cbc7af63f3000f71cd21f384af /www/nginx-devel/files/extra-patch-fastdfs-src-config
parentgraphics/ebsynth: fix build on GCC architectures (diff)
Update nginx from 1.17.4 to 1.17.5.
Update njs module from 0.3.5 to 0.3.6. Sync third-party fastdfs module version with www/nginx. <ChangeLog for nginx 1.17.5> *) Feature: now nginx uses ioctl(FIONREAD), if available, to avoid reading from a fast connection for a long time. *) Bugfix: incomplete escaped characters at the end of the request URI were ignored. *) Bugfix: "/." and "/.." at the end of the request URI were not normalized. *) Bugfix: in the "merge_slashes" directive. *) Bugfix: in the "ignore_invalid_headers" directive. Thanks to Alan Kemp. *) Bugfix: nginx could not be built with MinGW-w64 gcc 8.1 or newer. </ChangeLog> <ChangeLog for njs 0.3.6> nginx modules: *) Improvement: getting special headers from r.headersIn. Core: *) Feature: added new Function() support. *) Feature: added Number.prototype.toFixed(). *) Feature: added Number.prototype.toPrecision(). *) Feature: added Number.prototype.toExponential(). *) Improvement: making "prototype" property of function instances writable. *) Improvement: limiting recursion depth while compiling. *) Improvement: moving global functions to the global object. *) Bugfix: fixed prototype mutation for object literals. *) Bugfix: fixed heap-buffer-overflow while parsing regexp literals. *) Bugfix: fixed integer-overflow while parsing exponent of number literals. *) Bugfix: fixed parseFloat(). *) Bugfix: fixed Array.prototype functions according to the specification. The following functions were fixed: every, includes, indexOf, filter, find, findIndex, forEach, lastIndexOf, map, pop, push, reduce, reduceRight, shift, some, unshift. *) Bugfix: fixed handing of accessor descriptors in Object.freeze(). *) Bugfix: fixed String.prototype.replace() when first argument is not a string. *) Bugfix: fixed stack-use-after-scope in Array.prototype.map(). *) Bugfix: Date.prototype.toUTCString() format was aligned to ES9. *) Bugfix: fixed buffer overflow in Number.prototype.toString(radix). *) Bugfix: fixed Regexp.prototype.test() for regexps with backreferences. *) Bugfix: fixed Array.prototype.map() for objects with nonexistent values. *) Bugfix: fixed Array.prototype.pop() and shift() for sparse objects. *) Bugfix: fixed Date.UTC() according to the specification. *) Bugfix: fixed Date() constructor according to the specification. *) Bugfix: fixed type of Date.prototype. Thanks to Artem S. Povalyukhin. *) Bugfix: fixed Date.prototype.setTime(). Thanks to Artem S. Povalyukhin. *) Bugfix: fixed default number of arguments expected by built-in functions. *) Bugfix: fixed "caller" and "arguments" properties of a function instance. Thanks to Artem S. Povalyukhin. </ChangeLog>
Notes
Notes: svn path=/head/; revision=515207
Diffstat (limited to 'www/nginx-devel/files/extra-patch-fastdfs-src-config')
-rw-r--r--www/nginx-devel/files/extra-patch-fastdfs-src-config12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/nginx-devel/files/extra-patch-fastdfs-src-config b/www/nginx-devel/files/extra-patch-fastdfs-src-config
index e433705d3fb1..236abd7cebc0 100644
--- a/www/nginx-devel/files/extra-patch-fastdfs-src-config
+++ b/www/nginx-devel/files/extra-patch-fastdfs-src-config
@@ -1,11 +1,11 @@
---- ../fastdfs-nginx-module-85347be/src/config.orig 2016-10-12 16:09:34.075804000 +0200
-+++ ../fastdfs-nginx-module-85347be/src/config 2016-10-12 16:10:43.916280000 +0200
+--- ../fastdfs-nginx-module-8796a7d/src/config.orig 2018-07-16 05:05:22.000000000 -0400
++++ ../fastdfs-nginx-module-8796a7d/src/config 2019-10-22 14:20:23.138241000 -0400
@@ -3,16 +3,16 @@
if test -n "${ngx_module_link}"; then
ngx_module_type=HTTP
ngx_module_name=$ngx_addon_name
-- ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
-+ ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
+- ngx_module_incs="/usr/local/include"
++ ngx_module_incs="%%LOCALBASE%%/include"
ngx_module_libs="-lfastcommon -lfdfsclient"
ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
ngx_module_deps=
@@ -15,8 +15,8 @@
else
HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
-- CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
-+ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
+- CORE_INCS="$CORE_INCS /usr/local/include"
++ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include"
CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"