The last patch wasn't that good, fix

diff --git a/main/SAPI.c b/main/SAPI.c
index 11e92e8e01f5a9e149632e89afb2fea5afdbe755..006789a474445364d71a2228c759d6957bcc3fd5 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -378,15 +378,13 @@ SAPI_API int sapi_flush()
        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()
 {
        SLS_FETCH();

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index a2421231663c15069d4b3eb3110908d31b440980..86bab41fa20db3f2ef038b4b4f89c5bb50c15897 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -149,11 +149,13 @@ static int sapi_apache_ub_write(const char *str, uint str_length)
 
 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
+       }
 }