mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00
Code Issues Releases Activity

Improve redis protocol support.

Browse Source 
Do not bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin 2009-12-25 09:53:04 +00:00
parent 4ce7c24b00
commit 537b63c326
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=246583
4 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/nginx-devel/Makefile
View File

@ -397,6 +397,10 @@ 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_MODULE)
@${PATCH} ${PATCH_ARGS} < \
${PATCHDIR}/extra-patch-ngx_http_upload_module.c

45
www/nginx-devel/files/extra-patch-ngx_http_redis_module.c Normal file
View File

@ -0,0 +1,45 @@
--- ../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;
}

4
www/nginx/Makefile
View File

@ -385,6 +385,10 @@ 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

45
www/nginx/files/extra-patch-ngx_http_redis_module.c Normal file
View File

@ -0,0 +1,45 @@
--- ../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;
}