cvs: /php4/ext/standard output.c php_output.h /php4 output.c output.h /php4 Makefile.am internal_functions.c.in internal_functions_win32.c php.h
/php4/ext/standard Makefile.am basic_functions.c basic_functions.h

thies Wed Oct 27 14:31:12 1999 EDT Added files: /php4/ext/standard output.c php_output.h Removed files: /php4 output.c output.h Modified files: /php4 Makefile.am internal_functions.c.in internal_functions_win32.c php.h /php4/ext/standard Makefile.am basic_functions.c basic_functions.h Log: moved output.c into ext/standart and made it thread-safe. moved output-buffering related functions from basic_functions to output.c Win32 project need to be updated to reflect new position. # i'm not really happy with this solution, but it seemed the easiest one! # the whole output code is a bit hard to understand... Index: php4/Makefile.am diff -u php4/Makefile.am:1.8 php4/Makefile.am:1.9 --- php4/Makefile.am:1.8 Fri Oct 15 15:25:04 1999 +++ php4/Makefile.am Wed Oct 27 14:30:40 1999 @@ -11,7 +11,7 @@ libphp4_la_SOURCES = \ main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.y configuration-scanner.l request_info.c \ - safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ + safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c \ php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c Index: php4/internal_functions.c.in diff -u php4/internal_functions.c.in:1.6 php4/internal_functions.c.in:1.7 --- php4/internal_functions.c.in:1.6 Mon Sep 13 11:48:32 1999 +++ php4/internal_functions.c.in Wed Oct 27 14:30:40 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c.in,v 1.6 1999/09/13 15:48:32 thies Exp $ */ +/* $Id: internal_functions.c.in,v 1.7 1999/10/27 18:30:40 thies Exp $ */ #include "php.h" @@ -54,6 +54,7 @@ #include "ext/standard/php3_syslog.h" #include "ext/standard/php_lcg.h" #include "ext/standard/php_metaphone.h" +#include "ext/standard/php_output.h" @EXT_INCLUDE_CODE@ /* SNMP has to be moved to ext */ @@ -79,6 +80,7 @@ phpext_syslog_ptr, phpext_lcg_ptr, phpext_metaphone_ptr, + phpext_output_ptr, @EXT_MODULE_PTRS@ }; Index: php4/internal_functions_win32.c diff -u php4/internal_functions_win32.c:1.14 php4/internal_functions_win32.c:1.15 --- php4/internal_functions_win32.c:1.14 Wed Oct 20 15:16:16 1999 +++ php4/internal_functions_win32.c Wed Oct 27 14:30:40 1999 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.14 1999/10/20 19:16:16 andi Exp $ */ +/* $Id: internal_functions_win32.c,v 1.15 1999/10/27 18:30:40 thies Exp $ */ #include "php.h" @@ -45,6 +45,7 @@ #include "ext/standard/php3_syslog.h" #include "ext/standard/php3_standard.h" #include "ext/standard/php_lcg.h" +#include "ext/standard/php_output.h" #include "ext/COM/php_COM.h" #include "ext/standard/reg.h" #include "ext/pcre/php_pcre.h" @@ -80,7 +81,8 @@ phpext_pcre_ptr, phpext_odbc_ptr, phpext_lcg_ptr, - phpext_session_ptr + phpext_session_ptr, + phpext_output_ptr }; Index: php4/php.h diff -u php4/php.h:1.39 php4/php.h:1.40 --- php4/php.h:1.39 Fri Oct 15 17:23:37 1999 +++ php4/php.h Wed Oct 27 14:30:40 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.39 1999/10/15 21:23:37 andrei Exp $ */ +/* $Id: php.h,v 1.40 1999/10/27 18:30:40 thies Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -318,7 +318,7 @@ /* Output support */ -#include "output.h" +#include "ext/standard/php_output.h" #define PHPWRITE(str, str_len) php_body_write((str), (str_len)) #define PUTS(str) php_body_write((str), strlen((str))) #define PUTC(c) (php_body_write(&(c), 1), (c)) Index: php4/ext/standard/Makefile.am diff -u php4/ext/standard/Makefile.am:1.15 php4/ext/standard/Makefile.am:1.16 --- php4/ext/standard/Makefile.am:1.15 Mon Oct 4 11:18:19 1999 +++ php4/ext/standard/Makefile.am Wed Oct 27 14:30:40 1999 @@ -7,7 +7,7 @@ formatted_print.c fsock.c head.c html.c image.c info.c iptc.c lcg.c \ link.c mail.c math.c md5.c metaphone.c microtime.c pack.c pageinfo.c \ parsedate.y post.c quot_print.c rand.c reg.c soundex.c string.c \ - syslog.c type.c uniqid.c url.c url_scanner.c var.c + syslog.c type.c uniqid.c url.c url_scanner.c var.c output.c $(srcdir)/url_scanner.c: $(srcdir)/url_scanner.re -re2c $< > $@.new && mv $@.new $@ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.109 php4/ext/standard/basic_functions.c:1.110 --- php4/ext/standard/basic_functions.c:1.109 Tue Oct 26 22:19:53 1999 +++ php4/ext/standard/basic_functions.c Wed Oct 27 14:30:40 1999 @@ -304,11 +304,6 @@ PHP_NAMED_FE(show_source, php3_highlight_file, NULL) PHP_FE(highlight_string, NULL) - PHP_FE(ob_start, NULL) - PHP_FE(ob_end_flush, NULL) - PHP_FE(ob_end_clean, NULL) - PHP_FE(ob_get_contents, NULL) - PHP_FE(ini_get, NULL) PHP_FE(ini_alter, NULL) PHP_FE(ini_restore, NULL) @@ -1970,32 +1965,6 @@ test_class_set_property); register_internal_class(&test_class_entry); -} - - -PHP_FUNCTION(ob_start) -{ - php_start_ob_buffering(); -} - - -PHP_FUNCTION(ob_end_flush) -{ - php_end_ob_buffering(1); -} - - -PHP_FUNCTION(ob_end_clean) -{ - php_end_ob_buffering(0); -} - - -PHP_FUNCTION(ob_get_contents) -{ - if (php_ob_get_buffer(return_value)==FAILURE) { - RETURN_FALSE; - } } Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.25 php4/ext/standard/basic_functions.h:1.26 --- php4/ext/standard/basic_functions.h:1.25 Tue Oct 26 15:57:10 1999 +++ php4/ext/standard/basic_functions.h Wed Oct 27 14:30:41 1999 @@ -29,7 +29,7 @@ */ -/* $Id: basic_functions.h,v 1.25 1999/10/26 19:57:10 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.26 1999/10/27 18:30:41 thies Exp $ */ #ifndef _BASIC_FUNCTIONS_H #define _BASIC_FUNCTIONS_H @@ -103,11 +103,6 @@ PHP_FUNCTION(highlight_file); PHP_FUNCTION(highlight_string); ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini); - -PHP_FUNCTION(ob_start); -PHP_FUNCTION(ob_end_flush); -PHP_FUNCTION(ob_end_clean); -PHP_FUNCTION(ob_get_contents); PHP_FUNCTION(ini_get); PHP_FUNCTION(ini_alter);