cvs: php4 /sapi/apache mod_php4.c
| From: | Dan Kalowsky | Date: | Wed, 14 Aug 2002 17:15:50 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13363@lists.php.net to get a copy of this message | ||
kalowsky Wed Aug 14 13:15:50 2002 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Fix for Bug #9280 with regards to an Expect header. patch submitted by
Ilia <ilia@prohost.org>
# someone just give the man his php4 karma please!
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.134 php4/sapi/apache/mod_php4.c:1.135
--- php4/sapi/apache/mod_php4.c:1.134 Fri Jun 21 10:47:58 2002
+++ php4/sapi/apache/mod_php4.c Wed Aug 14 13:15:49 2002
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.134 2002/06/21 14:47:58 sesser Exp $ */
+/* $Id: mod_php4.c,v 1.135 2002/08/14 17:15:49 kalowsky Exp $ */
#include "php_apache_http.h"
@@ -129,6 +129,14 @@
request_rec *r = (request_rec *) SG(server_context);
void (*handler)(int);
+ /*
+ * This handles the situation where the browser sends a Expect: 100-continue header
+ * and needs to recieve confirmation from the server on whether or not it can send
+ * the rest of the request. RFC 2616
+ *
+ */
+ if( !ap_should_client_block(r) ) return total_read_bytes;
+
handler = signal(SIGPIPE, SIG_IGN);
while (total_read_bytes<count_bytes) {
hard_timeout("Read POST information", r); /* start timeout timer */