cvs: /php4 SAPI.c /php4/sapi/apache mod_php4.c
| From: | Zeev Suraski | Date: | Thu, 10 Feb 2000 19:29:51 +0000 |
| Subject: | cvs: /php4 SAPI.c /php4/sapi/apache mod_php4.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10058@lists.php.net to get a copy of this message | ||
zeev Thu Feb 10 11:29:51 2000 EDT
Modified files:
/php4 SAPI.c
/php4/sapi/apache mod_php4.c
Log:
The last patch wasn't that good, fix
Index: php4/SAPI.c
diff -u php4/SAPI.c:1.49 php4/SAPI.c:1.50
--- php4/SAPI.c:1.49 Thu Feb 10 11:28:05 2000
+++ php4/SAPI.c Thu Feb 10 11:29:21 2000
@@ -378,14 +378,12 @@
if (sapi_module.flush) {
SLS_FETCH();
- if (SG(server_context)) {
- sapi_module.flush(SG(server_context));
- return SUCCESS;
- }
+ sapi_module.flush(SG(server_context));
+ return SUCCESS;
+ } else {
+ return FAILURE;
}
- return FAILURE;
}
-
SAPI_API struct stat *sapi_get_stat()
{
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.28 php4/sapi/apache/mod_php4.c:1.29
--- php4/sapi/apache/mod_php4.c:1.28 Thu Feb 10 11:24:44 2000
+++ php4/sapi/apache/mod_php4.c Thu Feb 10 11:29:21 2000
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.28 2000/02/10 19:24:44 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.29 2000/02/10 19:29:21 zeev Exp $ */
#include "zend.h"
#include "php.h"
@@ -149,11 +149,13 @@
static void sapi_apache_flush(void *server_context)
{
+ if (server_context) {
#if MODULE_MAGIC_NUMBER > 19970110
- rflush((request_rec *) server_context);
+ rflush((request_rec *) server_context);
#else
- bflush((request_rec *) server_context->connection->client);
+ bflush((request_rec *) server_context->connection->client);
#endif
+ }
}