[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - MFH: Make it compile with PHP 5.3 again.

Date: Wed Mar 19 17:01:07 CET 2008
User: Derick Rethans
Directory: xdebug

Log Message:
[0.50]
- MFH: Make it compile with PHP 5.3 again.

Modified files:
           xdebug/xdebug.c (version: 1.400.2.13)
           xdebug/xdebug_handler_dbgp.c (version: 1.125.2.4)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.400.2.12
retrieving revision 1.400.2.13
diff -u -r1.400.2.12 -r1.400.2.13
--- xdebug/xdebug.c:1.400.2.12 Thu Mar 13 13:06:10 2008 GMT
+++ xdebug/xdebug.c Wed Mar 19 15:01:06 2008 GMT
@@ -758,7 +758,7 @@
         }
 
         /* Only enabled extended info when it is not disabled */
- CG(extended_info) = XG(extended_info);
+ CG(compiler_options) = CG(compiler_options) | (XG(extended_info) ? ZEND_COMPILE_EXTENDED_INFO : 0);
 
         if (XG(default_enable)) {
                 zend_error_cb = new_error_cb;

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.125.2.3
retrieving revision 1.125.2.4
diff -u -r1.125.2.3 -r1.125.2.4
--- xdebug/xdebug_handler_dbgp.c:1.125.2.3 Wed Feb 13 11:12:20 2008 GMT
+++ xdebug/xdebug_handler_dbgp.c Wed Mar 19 15:01:06 2008 GMT
@@ -1262,7 +1262,11 @@
                 if (XG(stdout_redirected) != 0) {
                         xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
                 }
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || PHP_MAJOR_VERSION >= 6
+ zend_set_timeout(EG(timeout_seconds), 0);
+#else
                 zend_set_timeout(EG(timeout_seconds));
+#endif
         }
         return XG(stdio).php_header_write(str, str_length TSRMLS_CC);
 }
@@ -1277,7 +1281,11 @@
                 if (XG(stdout_redirected) != 0) {
                         xdebug_send_stream("stdout", str, str_length TSRMLS_CC);
                 }
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || PHP_MAJOR_VERSION >= 6
+ zend_set_timeout(EG(timeout_seconds), 0);
+#else
                 zend_set_timeout(EG(timeout_seconds));
+#endif
         }
         return XG(stdio).php_body_write(str, str_length TSRMLS_CC);
 }
@@ -2202,7 +2210,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.125.2.3 $";
+ return "$Revision: 1.125.2.4 $";
 }
 
 static int xdebug_dbgp_cmdloop(xdebug_con *context, int bail TSRMLS_DC)
Received on Wed Mar 19 2008 - 17:15:02 GMT