diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-10-30 18:19:48 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-30 18:19:48 +0100 |
| commit | 12fba83c488843393db8dd04112927e498dc5cf2 (patch) | |
| tree | 463a439b685de89d4e63a79f0204dbef09fe181c | |
| parent | e6874a9b419db82dcfefa0a260fb289577b414b6 (diff) | |
| parent | 067852ca615bd083e821a08dbc21c21e9d46306f (diff) | |
| download | php-git-12fba83c488843393db8dd04112927e498dc5cf2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
don't try to send in the test results until we restored qa.php.net
Fix uninitialized value...
Don't treat warnings as failures in the junit output
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_bp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d9e11a07d2..655507b83b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,5 +46,5 @@ before_script: # Run PHPs run-tests.php script: - - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 + - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index 311171f72c..cd40510c79 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -227,7 +227,7 @@ PHPDBG_API void phpdbg_set_breakpoint_file(const char *path, long line_num TSRML php_stream_statbuf ssb; char realpath[MAXPATHLEN]; const char *original_path = path; - zend_bool pending; + zend_bool pending = 0; HashTable *broken, *file_breaks = &PHPDBG_G(bp)[PHPDBG_BREAK_FILE]; phpdbg_breakfile_t new_break; |