cvs: php4 /sapi/cgi/ cgi_main.c
| From: | Zeev Suraski | Date: | Thu, 25 May 2000 14:43:30 +0000 |
| Subject: | cvs: php4 /sapi/cgi/ cgi_main.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-15749@lists.php.net to get a copy of this message | ||
zeev Thu May 25 16:43:30 2000 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
Only fetch globals if it's necessary (which it usually won't be)
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.45 php4/sapi/cgi/cgi_main.c:1.46
--- php4/sapi/cgi/cgi_main.c:1.45 Thu May 25 09:01:34 2000
+++ php4/sapi/cgi/cgi_main.c Thu May 25 16:43:30 2000
@@ -87,10 +87,11 @@
static int sapi_cgibin_ub_write(const char *str, uint str_length)
{
int ret;
- PLS_FETCH();
ret = fwrite(str, 1, str_length, stdout);
if (ret != str_length) {
+ PLS_FETCH();
+
PG(connection_status) = PHP_CONNECTION_ABORTED;
if (!PG(ignore_user_abort)) {
zend_bailout();
@@ -103,9 +104,9 @@
static void sapi_cgibin_flush(void *server_context)
{
- PLS_FETCH();
+ if (fflush(stdout)==EOF) {
+ PLS_FETCH();
- if (fflush(stdout)) {
PG(connection_status) = PHP_CONNECTION_ABORTED;
if (!PG(ignore_user_abort)) {
zend_bailout();