[xdebug-dev] svn: /xdebug/trunk/ xdebug.c

derick Wed, 30 Mar 2011 20:36:20 +0000

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

Log:
- Refactor the profiler trigger with the new xdebug_trigger_enabled() function.

Changed paths:
    U xdebug/trunk/xdebug.c

Modified: xdebug/trunk/xdebug.c
===================================================================
--- xdebug/trunk/xdebug.c 2011-03-30 20:36:19 UTC (rev 3433)
+++ xdebug/trunk/xdebug.c 2011-03-30 20:36:20 UTC (rev 3434)
@@ -1236,25 +1236,7 @@
                 /* Check for special GET/POST parameter to start profiling */
                 if (
                         !XG(profiler_enabled) &&
- (
- XG(profiler_enable)
- ||
- (
- XG(profiler_enable_trigger) &&
- (
- (
- PG(http_globals)[TRACK_VARS_GET] &&
- zend_hash_find(PG(http_globals)[TRACK_VARS_GET]->value.ht, "XDEBUG_PROFILE", sizeof("XDEBUG_PROFILE"), (void **) &dummy) == SUCCESS
- ) || (
- PG(http_globals)[TRACK_VARS_POST] &&
- zend_hash_find(PG(http_globals)[TRACK_VARS_POST]->value.ht, "XDEBUG_PROFILE", sizeof("XDEBUG_PROFILE"), (void **) &dummy) == SUCCESS
- ) || (
- PG(http_globals)[TRACK_VARS_COOKIE] &&
- zend_hash_find(PG(http_globals)[TRACK_VARS_COOKIE]->value.ht, "XDEBUG_PROFILE", sizeof("XDEBUG_PROFILE"), (void **) &dummy) == SUCCESS
- )
- )
- )
- )
+ (XG(profiler_enable) || xdebug_trigger_enabled(XG(profiler_enable_trigger), "XDEBUG_PROFILE"))
                 ) {
                         if (xdebug_profiler_init(op_array->filename TSRMLS_CC) == SUCCESS) {
                                 XG(profiler_enabled) = 1;
Received on Wed Mar 30 2011 - 21:36:20 BST