tony2001 Tue Mar 22 10:09:37 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/cli php_cli.c
Log:
MFH: fix #28803 (enabled debug causes bailout errors with CLI on AIX
because of fflush() called on already closed filedescriptor)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.859&r2=1.1247.2.860&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.859 php-src/NEWS:1.1247.2.860
--- php-src/NEWS:1.1247.2.859 Sat Mar 19 08:56:55 2005
+++ php-src/NEWS Tue Mar 22 10:09:35 2005
@@ -97,6 +97,8 @@
(eggert at gnu dot org)
- Fixed bug #28804 (ini-file section parsing pattern is buggy).
(wendland at scan-plus dot de)
+- Fixed bug #28803 (enabled debug causes bailout errors with CLI on AIX
+ because of fflush() called on already closed filedescriptor). (Tony)
- Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
entries). (Andrei)
- Fixed bug #28086 (crash inside overload() function). (Tony)
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.51.2.36&r2=1.51.2.37&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.36
php-src/sapi/cli/php_cli.c:1.51.2.37
--- php-src/sapi/cli/php_cli.c:1.51.2.36 Sat Jan 22 15:36:35 2005
+++ php-src/sapi/cli/php_cli.c Tue Mar 22 10:09:36 2005
@@ -214,7 +214,10 @@
static void sapi_cli_flush(void *server_context)
{
- if (fflush(stdout)==EOF) {
+ /* Ignore EBADF here, it's caused by the fact that STDIN/STDOUT/STDERR
streams
+ * are/could be closed before fflush() is called.
+ */
+ if (fflush(stdout)==EOF && errno!=EBADF) {
php_handle_aborted_connection();
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
