Update third-party-module:

- echo-nginx-module to c65f5c6
- fastdfs-nginx-module to 8796a7d
- nginx-http-auth-digest to cd86418

-remove needless patch

3 files changed, 12 insertions, 60 deletions

diff --git a/www/nginx/files/extra-patch-fastdfs-src-config b/www/nginx/files/extra-patch-fastdfs-src-config
index e433705d3fb1..2ee64de2c73d 100644
--- a/www/nginx/files/extra-patch-fastdfs-src-config
+++ b/www/nginx/files/extra-patch-fastdfs-src-config
@@ -1,11 +1,6 @@
---- ../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
-@@ -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/"
+--- ../fastdfs-nginx-module-8796a7d/src/config.orig	2018-07-19 07:14:11.958521000 +0200
++++ ../fastdfs-nginx-module-8796a7d/src/config	2018-07-19 07:14:30.433965000 +0200
+@@ -7,12 +7,12 @@ if test -n "${ngx_module_link}"; then
      ngx_module_libs="-lfastcommon -lfdfsclient"
      ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
      ngx_module_deps=
@@ -15,8 +10,7 @@
  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_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\"'"
diff --git a/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf b/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
index e5162a5451b6..7ce2f0d05997 100644
--- a/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
+++ b/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
@@ -1,6 +1,6 @@
---- ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf.orig	2017-09-05 14:19:44.560907000 +0200
-+++ ../fastdfs-nginx-module-85347be/src/mod_fastdfs.conf	2017-09-05 14:24:43.475900000 +0200
-@@ -59,8 +59,8 @@
+--- ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf.orig	2018-07-19 19:22:45.973450000 +0200
++++ ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf	2018-07-19 19:28:48.173589000 +0200
+@@ -59,8 +59,8 @@ store_path_count=1
  # store_path#, based 0, if store_path0 not exists, it's value is base_path
  # the paths must be exist
  # must same as storage.conf
@@ -11,7 +11,7 @@
  
  # standard log level as syslog, case insensitive, value list:
  ### emerg for emergency
-@@ -92,6 +92,14 @@
+@@ -92,6 +92,14 @@ if_alias_prefix=
  # NOTE: #include is an include directive, do NOT remove the # before include
  #include http.conf
  
@@ -20,13 +20,13 @@
 +
 +# MIME types mapping filename
 +# MIME types file format: MIME_type  extensions
-+# such as:  image/jpeg	jpeg jpg jpe
++# such as:  image/jpeg jpeg jpg jpe
 +# you can use apache's MIME file: mime.types
 +http.mime_types_filename=/usr/local/etc/nginx/mime.types
  
  # if support flv
  # default value is false
-@@ -119,8 +127,8 @@
+@@ -119,8 +127,8 @@ group_count = 0
  #group_name=group1
  #storage_server_port=23000
  #store_path_count=2
@@ -37,9 +37,10 @@
  
  # group settings for group #2
  # since v1.14
-@@ -129,5 +137,5 @@
+@@ -129,5 +137,4 @@ group_count = 0
  #group_name=group2
  #storage_server_port=23000
  #store_path_count=1
 -#store_path0=/home/yuqing/fastdfs
+-
 +#store_path0=/var/db/fastdfs/storage
diff --git a/www/nginx/files/extra-patch-ngx_http_echo_request_info.c b/www/nginx/files/extra-patch-ngx_http_echo_request_info.c
deleted file mode 100644
index 87b39d08a5db..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_echo_request_info.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c.orig	2017-04-15 10:03:29.616243000 -0400
-+++ ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c	2017-04-15 10:07:41.329695000 -0400
-@@ -179,6 +179,9 @@
-     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 @@
- 
-     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,14 @@
-     }
- 
-     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) {