cvs: php4(PHP_4_3) / NEWS /sapi/cli php_cli.c

derick Mon May 26 14:33:20 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/cli php_cli.c /php4 NEWS Log: - Fixed a bug in reporting start-up errors with the CLI: No HTTP header shall be shown. Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.51.2.17 php4/sapi/cli/php_cli.c:1.51.2.18 --- php4/sapi/cli/php_cli.c:1.51.2.17 Wed May 21 06:23:31 2003 +++ php4/sapi/cli/php_cli.c Mon May 26 14:33:20 2003 @@ -238,6 +238,13 @@ return NULL; } +static int sapi_cli_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) +{ + /* We do nothing here, this function is needed to prevent that the fallback + * header handling is called. */ + return SAPI_HEADER_SENT_SUCCESSFULLY; +} + static void sapi_cli_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC) { if (sapi_header) { @@ -301,7 +308,7 @@ php_error, /* error handler */ NULL, /* header handler */ - NULL, /* send headers handler */ + sapi_cli_send_headers, /* send headers handler */ sapi_cli_send_header, /* send header handler */ NULL, /* read POST data */ Index: php4/NEWS diff -u php4/NEWS:1.1247.2.214 php4/NEWS:1.1247.2.215 --- php4/NEWS:1.1247.2.214 Sun May 25 23:48:22 2003 +++ php4/NEWS Mon May 26 14:33:20 2003 @@ -32,6 +32,7 @@ - Added KOI8-R, CP866, and CP1251 support for htmlentities(). (Antony Dovgal, Moriyoshi) - Added domdocument->free() to free XML-documents from memory. (Rob Richards) +- Fixed a bug in error reporting with the CLI for start-up errors. (Derick) - Fixed spurious fsync calls during socket communication. (Sascha) - Fixed a possible vhost issue in thttpd. (Sascha, dgl@dgl.cx) - Fixed including from HTTP URLs. (Sascha)