[PHP-CVS] cvs: php4(PHP_4_0_5) /ext/standard output.c

[Anil Madhavapeddy]

avsmMon Apr  2 09:48:29 2001 EDT

  Modified files:  (Branch: PHP_4_0_5)
/php4/ext/standard  output.c 
  Log:
  MFH, rev 1.53
  
  
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.48.2.2 php4/ext/standard/output.c:1.48.2.3
--- php4/ext/standard/output.c:1.48.2.2 Sat Mar 31 14:54:07 2001
+++ php4/ext/standard/output.c  Mon Apr  2 09:48:29 2001
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.48.2.2 2001/03/31 22:54:07 zeev Exp $ */
+/* $Id: output.c,v 1.48.2.3 2001/04/02 16:48:29 avsm Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -214,6 +214,7 @@
zend_stack_destroy(OG(ob_buffers));
}
}
+   OG(nesting_level)--;
}
 
if (send_buffer) {
@@ -226,8 +227,6 @@
 
if (!just_flush) {
efree(to_be_destroyed_buffer);
-
-   OG(nesting_level)--;
} else {
OG(active_ob_buffer).text_length = 0;
OG(active_ob_buffer).status |= PHP_OUTPUT_HANDLER_START;



-- 
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]

[PHP-CVS] cvs: php4(PHP_4_0_5) /ext/standard output.c

[Zeev Suraski]

zeevSat Mar 31 14:54:07 2001 EDT

  Modified files:  (Branch: PHP_4_0_5)
/php4/ext/standard  output.c 
  Log:
  MFH - header handling with output buffering
  
  
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.48.2.1 php4/ext/standard/output.c:1.48.2.2
--- php4/ext/standard/output.c:1.48.2.1 Fri Mar 16 19:05:07 2001
+++ php4/ext/standard/output.c  Sat Mar 31 14:54:07 2001
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.48.2.1 2001/03/17 03:05:07 zeev Exp $ */
+/* $Id: output.c,v 1.48.2.2 2001/03/31 22:54:07 zeev Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -447,6 +447,7 @@
OLS_FETCH();
 
if (SG(request_info).headers_only) {
+   php_header();
zend_bailout();
}
if (php_header()) {



-- 
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]

[PHP-CVS] cvs: php4(PHP_4_0_5) /ext/standard output.c

[Zeev Suraski]

zeevFri Mar 16 19:05:07 2001 EDT

  Modified files:  (Branch: PHP_4_0_5)
/php4/ext/standard  output.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.48 php4/ext/standard/output.c:1.48.2.1
--- php4/ext/standard/output.c:1.48 Tue Mar  6 11:38:33 2001
+++ php4/ext/standard/output.c  Fri Mar 16 19:05:07 2001
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.48 2001/03/06 19:38:33 zeev Exp $ */
+/* $Id: output.c,v 1.48.2.1 2001/03/17 03:05:07 zeev Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -157,6 +157,7 @@
orig_buffer-value.str.len = OG(active_ob_buffer).text_length;
orig_buffer-type = IS_STRING;
orig_buffer-refcount=2;/* don't let call_user_function() 
destroy our buffer */
+   orig_buffer-is_ref=1;
 
ALLOC_INIT_ZVAL(z_status);
Z_TYPE_P(z_status) = IS_LONG;



-- 
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]