zeev Sat Mar 3 17:45:20 2001 EDT
Modified files:
/php4/ext/standard output.c php_output.h
/php4/main main.c
Log:
Fix non-thread safe mode
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.41 php4/ext/standard/output.c:1.42
--- php4/ext/standard/output.c:1.41 Sat Mar 3 17:09:36 2001
+++ php4/ext/standard/output.c Sat Mar 3 17:45:19 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.41 2001/03/04 01:09:36 zeev Exp $ */
+/* $Id: output.c,v 1.42 2001/03/04 01:45:19 zeev Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -68,17 +68,23 @@
PHPAPI void php_output_startup()
{
OLS_FETCH();
- ELS_FETCH();
OG(php_body_write) = php_ub_body_write;
OG(php_header_write) = sapi_module.ub_write;
OG(nesting_level) = 0;
OG(lock) = 0;
+}
+
+void php_output_register_constants()
+{
+ ELS_FETCH();
+
REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_START",
PHP_OUTPUT_HANDLER_START, CONST_CS | CONST_PERSISTENT);
REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CONT",
PHP_OUTPUT_HANDLER_CONT, CONST_CS | CONST_PERSISTENT);
REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_END", PHP_OUTPUT_HANDLER_END,
CONST_CS | CONST_PERSISTENT);
}
+
PHPAPI int php_body_write(const char *str, uint str_length)
{
Index: php4/ext/standard/php_output.h
diff -u php4/ext/standard/php_output.h:1.19 php4/ext/standard/php_output.h:1.20
--- php4/ext/standard/php_output.h:1.19 Sat Mar 3 17:09:36 2001
+++ php4/ext/standard/php_output.h Sat Mar 3 17:45:19 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_output.h,v 1.19 2001/03/04 01:09:36 zeev Exp $ */
+/* $Id: php_output.h,v 1.20 2001/03/04 01:45:19 zeev Exp $ */
#ifndef PHP_OUTPUT_H
#define PHP_OUTPUT_H
@@ -24,6 +24,7 @@
#include "php.h"
PHPAPI void php_output_startup(void);
+void php_output_register_constants(void);
PHPAPI int php_body_write(const char *str, uint str_length);
PHPAPI int php_header_write(const char *str, uint str_length);
PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size);
Index: php4/main/main.c
diff -u php4/main/main.c:1.354 php4/main/main.c:1.355
--- php4/main/main.c:1.354 Sun Feb 25 22:07:31 2001
+++ php4/main/main.c Sat Mar 3 17:45:19 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.354 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: main.c,v 1.355 2001/03/04 01:45:19 zeev Exp $ */
#include <stdio.h>
@@ -850,6 +850,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION,
sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os),
CONST_PERSISTENT | CONST_CS);
+ php_output_register_constants();
if (php_startup_ticks(PLS_C) == FAILURE) {
php_printf("Unable to start PHP ticks\n");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
