[nginx] Upstream: subrequest_in_memory support for SCGI and uwsg...

Maxim Dounin mdounin at mdounin.ru
Fri Sep 27 12:54:39 UTC 2013


details:   http://hg.nginx.org/nginx/rev/1a070e89b97a
branches:  
changeset: 5393:1a070e89b97a
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Sep 27 16:50:34 2013 +0400
description:
Upstream: subrequest_in_memory support for SCGI and uwsgi enabled.

This was missed in 9d59a8eda373 when non-buffered support was added to SCGI
and uwsgi.

diffstat:

 src/http/modules/ngx_http_scgi_module.c  |  7 -------
 src/http/modules/ngx_http_uwsgi_module.c |  7 -------
 2 files changed, 0 insertions(+), 14 deletions(-)

diffs (34 lines):

diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -394,13 +394,6 @@ ngx_http_scgi_handler(ngx_http_request_t
     ngx_http_upstream_t       *u;
     ngx_http_scgi_loc_conf_t  *scf;
 
-    if (r->subrequest_in_memory) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                      "ngx_http_scgi_module does not support "
-                      "subrequests in memory");
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     if (ngx_http_upstream_create(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -427,13 +427,6 @@ ngx_http_uwsgi_handler(ngx_http_request_
     ngx_http_upstream_t        *u;
     ngx_http_uwsgi_loc_conf_t  *uwcf;
 
-    if (r->subrequest_in_memory) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                      "ngx_http_uwsgi_module does not support "
-                      "subrequests in memory");
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
-    }
-
     if (ngx_http_upstream_create(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }



More information about the nginx-devel mailing list