You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/10/02 10:41:23 UTC
svn commit: r1867882 - in /httpd/httpd/trunk/modules/generators:
cgi_common.h mod_cgi.c
Author: jorton
Date: Wed Oct 2 10:41:22 2019
New Revision: 1867882
URL: http://svn.apache.org/viewvc?rev=1867882&view=rev
Log:
* modules/generators/cgi_common.h (cgi_bucket_create):
Disable APR timeout handling here for all callers.
* modules/generators/mod_cgi.c (cgi_handler): ... drop it here.
Modified:
httpd/httpd/trunk/modules/generators/cgi_common.h
httpd/httpd/trunk/modules/generators/mod_cgi.c
Modified: httpd/httpd/trunk/modules/generators/cgi_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/cgi_common.h?rev=1867882&r1=1867881&r2=1867882&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/cgi_common.h (original)
+++ httpd/httpd/trunk/modules/generators/cgi_common.h Wed Oct 2 10:41:22 2019
@@ -49,6 +49,10 @@ static apr_bucket *cgi_bucket_create(req
apr_pollfd_t fd;
struct cgi_bucket_data *data = apr_palloc(r->pool, sizeof *data);
+ /* Disable APR timeout handling since we'll use poll() entirely. */
+ apr_file_pipe_timeout_set(out, 0);
+ apr_file_pipe_timeout_set(err, 0);
+
APR_BUCKET_INIT(b);
b->free = apr_bucket_free;
b->list = list;
Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.c?rev=1867882&r1=1867881&r2=1867882&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.c Wed Oct 2 10:41:22 2019
@@ -772,9 +772,6 @@ static int cgi_handler(request_rec *r)
AP_DEBUG_ASSERT(script_in != NULL);
#if APR_FILES_AS_SOCKETS
- apr_file_pipe_timeout_set(script_in, 0);
- apr_file_pipe_timeout_set(script_err, 0);
-
b = cgi_bucket_create(r, dc->timeout, script_in, script_err, c->bucket_alloc);
if (b == NULL)
return HTTP_INTERNAL_SERVER_ERROR;