summaryrefslogtreecommitdiffstats
path: root/modules/arch/win32/mod_isapi.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2006-12-07 20:18:30 +0100
committerWilliam A. Rowe Jr <wrowe@apache.org>2006-12-07 20:18:30 +0100
commit1602c1ffe138267dd2f7e4648d33da8aa8381883 (patch)
tree4767adc9509c76ae19bcf097ff9389c5cef48352 /modules/arch/win32/mod_isapi.c
parentMirror r483555, for GUI environment. Reason for the duplication is to make (diff)
downloadapache2-1602c1ffe138267dd2f7e4648d33da8aa8381883.tar.xz
apache2-1602c1ffe138267dd2f7e4648d33da8aa8381883.zip
Revert a regression introduced in the recent overhauls of mod_isapi.
PR 40470 points out that we no longer handle ate == headlen, where there is a headers-only response from the isapi app to the server. This patch restores the previous behavior of pending those headers until some amount of body response is ready to be sent to the client. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@483613 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/arch/win32/mod_isapi.c')
-rw-r--r--modules/arch/win32/mod_isapi.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 5d18f24e87..21a28947c5 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -930,6 +930,11 @@ int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid,
cid->response_sent = 1;
return (rv == APR_SUCCESS);
}
+ /* Deliberately hold off sending 'just the headers' to begin to
+ * accumulate the body and speed up the overall response, or at
+ * least wait for the end the session.
+ */
+ return 1;
}
case HSE_REQ_DONE_WITH_SESSION:
@@ -1320,8 +1325,13 @@ int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid,
APR_BRIGADE_INSERT_TAIL(bb, b);
rv = ap_pass_brigade(cid->r->output_filters, bb);
cid->response_sent = 1;
+ return (rv == APR_SUCCESS);
}
- return (rv == APR_SUCCESS);
+ /* Deliberately hold off sending 'just the headers' to begin to
+ * accumulate the body and speed up the overall response, or at
+ * least wait for the end the session.
+ */
+ return 1;
}
case HSE_REQ_CLOSE_CONNECTION: /* Added after ISAPI 4.0 */