[xdebug-dev] svn: /xdebug/trunk/ php_xdebug.h xdebug_handler_dbgp.c

derick Fri, 14 Jan 2011 22:55:21 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3390&root=xdebug

Log:
- Adjusted the output buffering check for DBGp so that it at least works for
  PHP < 5.3.99.

Changed paths:
    U xdebug/trunk/php_xdebug.h
    U xdebug/trunk/xdebug_handler_dbgp.c

Modified: xdebug/trunk/php_xdebug.h
===================================================================
--- xdebug/trunk/php_xdebug.h 2011-01-10 21:48:05 UTC (rev 3389)
+++ xdebug/trunk/php_xdebug.h 2011-01-14 22:55:21 UTC (rev 3390)
@@ -33,6 +33,12 @@
 #include "xdebug_hash.h"
 #include "xdebug_llist.h"

+#if PHP_VERSION_ID >= 50399
+# define OUTPUTBUFFERING 0
+#else
+# define OUTPUTBUFFERING 1
+#endif
+
 extern zend_module_entry xdebug_module_entry;
 #define phpext_xdebug_ptr &xdebug_module_entry

@@ -260,7 +266,7 @@
         char *lasttransid;

         /* output redirection */
-#ifdef OUTPUTBUFFERING
+#if OUTPUTBUFFERING
         php_output_globals stdio;
 #endif
         int stdout_redirected;

Modified: xdebug/trunk/xdebug_handler_dbgp.c
===================================================================
--- xdebug/trunk/xdebug_handler_dbgp.c 2011-01-10 21:48:05 UTC (rev 3389)
+++ xdebug/trunk/xdebug_handler_dbgp.c 2011-01-14 22:55:21 UTC (rev 3390)
@@ -1244,7 +1244,7 @@
         return 0;
 }

-#ifdef OUTPUTBUFFERING
+#if OUTPUTBUFFERING
 static int xdebug_header_write(const char *str, uint str_length TSRMLS_DC)
 {
         /* nesting_level is zero when final output is sent to sapi */
Received on Fri Jan 14 2011 - 22:55:21 GMT