You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/08/21 00:47:52 UTC
cvs commit: httpd-2.0/modules/generators mod_cgid.c
nd 2003/08/20 15:47:52
Modified: modules/generators mod_cgid.c
Log:
include_cmd doesn't imply the CGI interface. That code seems to be
a c&p accident.
Revision Changes Path
1.153 +10 -48 httpd-2.0/modules/generators/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mod_cgid.c 23 Jun 2003 20:17:00 -0000 1.152
+++ mod_cgid.c 20 Aug 2003 22:47:52 -0000 1.153
@@ -1632,7 +1632,6 @@
request_rec *r, ap_filter_t *f)
{
char **env;
- const char *location;
int sd;
apr_status_t rc = APR_SUCCESS;
int retval;
@@ -1675,53 +1674,16 @@
*/
apr_os_pipe_put(&tempsock, &sd, r->pool);
- if ((retval = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)))
- return retval;
-
- location = apr_table_get(r->headers_out, "Location");
-
- if (location && location[0] == '/' && r->status == 200) {
- char argsbuffer[HUGE_STRING_LEN];
-
- /* Soak up all the script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
- tempsock) == APR_SUCCESS) {
- continue;
- }
- /* This redirect needs to be a GET no matter what the original
- * method was.
- */
- r->method = apr_pstrdup(r->pool, "GET");
- r->method_number = M_GET;
-
- /* We already read the message body (if any), so don't allow
- * the redirected request to think it has one. We can ignore
- * Transfer-Encoding, since we used REQUEST_CHUNKED_ERROR.
- */
- apr_table_unset(r->headers_in, "Content-Length");
-
- ap_internal_redirect_handler(location, r);
- return OK;
- }
- else if (location && r->status == 200) {
- /* XX Note that if a script wants to produce its own Redirect
- * body, it now has to explicitly *say* "Status: 302"
- */
- return HTTP_MOVED_TEMPORARILY;
- }
-
- if (!r->header_only) {
- /* Passing our socket down the filter chain in a pipe bucket
- * gives up the responsibility of closing the socket, so
- * get rid of the cleanup.
- */
- apr_pool_cleanup_kill(r->pool, (void *)sd, close_unix_socket);
-
- bcgi = apr_brigade_create(r->pool, r->connection->bucket_alloc);
- b = apr_bucket_pipe_create(tempsock, r->connection->bucket_alloc);
- APR_BRIGADE_INSERT_TAIL(bcgi, b);
- ap_pass_brigade(f->next, bcgi);
- }
+ /* Passing our socket down the filter chain in a pipe bucket
+ * gives up the responsibility of closing the socket, so
+ * get rid of the cleanup.
+ */
+ apr_pool_cleanup_kill(r->pool, (void *)sd, close_unix_socket);
+
+ bcgi = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+ b = apr_bucket_pipe_create(tempsock, r->connection->bucket_alloc);
+ APR_BRIGADE_INSERT_TAIL(bcgi, b);
+ ap_pass_brigade(f->next, bcgi);
return 0;
}