Update http_redis module from 0.3.0 to 0.3.1.

Cosmetic whitespace fix for Makefile.
Do not bump PORTREVISIONs.

<ChangeLog>

*) Change: return 502 instead of 404 for error.

*) Change: better error messages diagnostics.

*) Bugfix: interoperability with redis; the bug had
   appeared in 0.3.0.

</ChangeLog>

3 files changed, 4 insertions, 53 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 7c93ea3c7d93..5088cae3e47d 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -224,7 +224,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
 .endif
 
 .if defined(WITH_HTTP_REDIS_MODULE)
-NGINX_REDIS_MODULE_VERSION=	0.3.0
+NGINX_REDIS_MODULE_VERSION=	0.3.1
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:redis/}
 MASTER_SITE_SUBDIR+=	osa/:redis
 DISTFILES+=	ngx_http_redis-${NGINX_REDIS_MODULE_VERSION}.tar.gz:redis
@@ -389,10 +389,6 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
-.if defined(WITH_HTTP_REDIS_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_redis_module.c
-.endif
 .if defined(WITH_HTTP_UPLOAD_PROGRESS)
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index dc5cbfdc8269..b6322bae4f1f 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -25,9 +25,9 @@ SIZE (nginx-notice-2.tar.gz) = 3253
 MD5 (nginx_http_push_module-0.69.tar.gz) = 5722ac1ec726194a480bd19ad7e99996
 SHA256 (nginx_http_push_module-0.69.tar.gz) = 2384ff752115b5f959abf17ca466217a675796e295ba5c46d20270923fe286ec
 SIZE (nginx_http_push_module-0.69.tar.gz) = 28345
-MD5 (ngx_http_redis-0.3.0.tar.gz) = 4167df3410e4446ebaee46d3f9e51197
-SHA256 (ngx_http_redis-0.3.0.tar.gz) = fb46c5415ec35e8865912f4a37257c39db7574ac717b05c1af40bd24d5e63928
-SIZE (ngx_http_redis-0.3.0.tar.gz) = 5907
+MD5 (ngx_http_redis-0.3.1.tar.gz) = c731d6ac14b4c8a99fda2c7e89356a8f
+SHA256 (ngx_http_redis-0.3.1.tar.gz) = b66291bf7a034baf351fc4d0e57558d672bed0582fcfa9008eba4acf6b4486c4
+SIZE (ngx_http_redis-0.3.1.tar.gz) = 6012
 MD5 (ngx_http_response-0.3.tar.gz) = 178a8f13a41388ef50b3726fa9fede50
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
diff --git a/www/nginx/files/extra-patch-ngx_http_redis_module.c b/www/nginx/files/extra-patch-ngx_http_redis_module.c
deleted file mode 100644
index 57d944b6d3a0..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_redis_module.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- ../ngx_http_redis-0.3.0/ngx_http_redis_module.c.orig	2009-12-23 16:55:12.000000000 +0300
-+++ ../ngx_http_redis-0.3.0/ngx_http_redis_module.c	2009-12-24 18:09:13.000000000 +0300
-@@ -343,17 +343,29 @@
- ngx_http_redis_process_header(ngx_http_request_t *r)
- {
-     u_char                    *p, *len;
--    u_int                      c = 0;
-+    u_int                      c, try;
-     ngx_str_t                  line;
-     ngx_http_upstream_t       *u;
-     ngx_http_redis_ctx_t      *ctx;
- 
-+    c = try = 0;
-+
-     u = r->upstream;
- 
-+    p = u->buffer.pos;
-+
-+    if (*p == '+') {
-+        try = 2;
-+    } else if (*p == '-') {
-+        try = 1;
-+    } else {
-+        goto no_valid;
-+    }
-+
-     for (p = u->buffer.pos; p < u->buffer.last; p++) {
-         if (*p == LF) {
-             c++;
--            if (c == 2) {
-+            if (c == try) {
-                 goto found;
-             }
-         }
-@@ -379,8 +391,8 @@
-         ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
-                       "error was received from redis");
- 
--        u->headers_in.status_n = 404;
--        u->state->status = 404;
-+        u->headers_in.status_n = 502;
-+        u->state->status = 502;
- 
-         return NGX_OK;
-     }