]>
granicus.if.org Git - php/log
Bob Weinand [Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)]
Merge ../phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/config.m4
Bob Weinand [Tue, 28 Oct 2014 21:14:35 +0000 (22:14 +0100)]
Use serialize instead of json for transfer
Bob Weinand [Tue, 28 Oct 2014 21:11:30 +0000 (22:11 +0100)]
Add webhelper in config.w32
Bob Weinand [Tue, 28 Oct 2014 20:15:47 +0000 (21:15 +0100)]
Merge php-src into phpdbg
Conflicts:
config.m4
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree
Remi Collet [Tue, 28 Oct 2014 18:10:53 +0000 (19:10 +0100)]
fix phpdbg build when src tree != build tree
Bob Weinand [Tue, 28 Oct 2014 16:42:38 +0000 (17:42 +0100)]
Merge ../phpdbg into PHP-5.6
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Bob Weinand [Tue, 28 Oct 2014 16:20:21 +0000 (17:20 +0100)]
Remove the ugly hack via a temp file to store breakpoints
Julien Pauli [Tue, 28 Oct 2014 15:00:19 +0000 (16:00 +0100)]
5.6.4 now
Bob Weinand [Tue, 28 Oct 2014 12:55:56 +0000 (13:55 +0100)]
Typo (notfoundc => notfound)
Bob Weinand [Tue, 28 Oct 2014 12:55:14 +0000 (13:55 +0100)]
Fix quitting on a second run
Bob Weinand [Tue, 28 Oct 2014 12:27:20 +0000 (13:27 +0100)]
Fix wrong exec length on relative paths
Bob Weinand [Tue, 28 Oct 2014 12:20:43 +0000 (13:20 +0100)]
Fix possibly unclosed <stream> tags
Bob Weinand [Tue, 28 Oct 2014 11:38:07 +0000 (12:38 +0100)]
Fix potential segfaults and unresolved breaks
Bob Weinand [Tue, 28 Oct 2014 11:27:19 +0000 (12:27 +0100)]
*Always* clean up and run destructors
Remi Collet [Tue, 28 Oct 2014 07:50:48 +0000 (08:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Ensure we have enough input data before parsing date
Remi Collet [Tue, 28 Oct 2014 07:48:22 +0000 (08:48 +0100)]
Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=
ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
Stanislav Malyshev [Tue, 28 Oct 2014 02:07:32 +0000 (19:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #68095 - invalid read in php_getopt()
Stanislav Malyshev [Tue, 28 Oct 2014 02:04:46 +0000 (19:04 -0700)]
Fix bug #68095 - invalid read in php_getopt()
It's a hacky solution and incomplete, but I don't see other way
without refactoring the whole getopt protocol.
Bob Weinand [Mon, 27 Oct 2014 13:07:26 +0000 (14:07 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Mon, 27 Oct 2014 13:07:26 +0000 (14:07 +0100)]
Merge phpdbg into PHP-5.6
Bob Weinand [Mon, 27 Oct 2014 12:55:20 +0000 (13:55 +0100)]
Fix resolving breakpoints of already loaded files
Bob Weinand [Mon, 27 Oct 2014 12:27:54 +0000 (13:27 +0100)]
Never exist xml mode...
Bob Weinand [Mon, 27 Oct 2014 12:11:13 +0000 (13:11 +0100)]
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
Bob Weinand [Mon, 27 Oct 2014 12:11:13 +0000 (13:11 +0100)]
Merge phpdbg into PHP-5.6
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
Bob Weinand [Mon, 27 Oct 2014 10:02:08 +0000 (11:02 +0100)]
Fix failing quit when quitting during execution
Bob Weinand [Mon, 27 Oct 2014 10:01:43 +0000 (11:01 +0100)]
Fix segfault when cleaning without execution context
Bob Weinand [Mon, 27 Oct 2014 09:44:01 +0000 (10:44 +0100)]
Fix listening on port
Anatol Belski [Mon, 27 Oct 2014 09:19:59 +0000 (10:19 +0100)]
Merge branch 'master' of github.com:krakjoe/phpdbg
Conflicts:
phpdbg_prompt.c
Anatol Belski [Mon, 27 Oct 2014 09:08:58 +0000 (10:08 +0100)]
improve the current sigio handling on win32
Remi Collet [Mon, 27 Oct 2014 06:51:50 +0000 (07:51 +0100)]
NEWS
Remi Collet [Mon, 27 Oct 2014 06:50:42 +0000 (07:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
Remi Collet [Mon, 27 Oct 2014 06:47:18 +0000 (07:47 +0100)]
NEWS
Remi Collet [Mon, 27 Oct 2014 06:45:34 +0000 (07:45 +0100)]
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Drop use of php memory allocators as this raise various conflicts
with other extensions and libraries which use libgmp.
No other solution found.
We cannot for ensure correct use of allocator with shared lib.
Some memory can allocated before php init
Some memory can be freed after php shutdown
Known broken run cases
- php + curl + gnutls + gmp
- mod_gnutls + mod_php + gnutls + gmp
- php + freetds + gnutls + gmp
- php + odbc + freetds + gnutls + gmp
- php + php-mapi (zarafa) + gnutls + gmp
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean
Bob Weinand [Sun, 26 Oct 2014 22:33:54 +0000 (23:33 +0100)]
Do not execute anything after quit or clean command
Bob Weinand [Sun, 26 Oct 2014 21:21:18 +0000 (22:21 +0100)]
Fix last commit, and do not output unnecessary information
Bob Weinand [Sun, 26 Oct 2014 19:43:49 +0000 (20:43 +0100)]
Stabilize execution, always run destructors and extended file breakpoints
Derick Rethans [Sun, 26 Oct 2014 14:54:09 +0000 (10:54 -0400)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Sun, 26 Oct 2014 14:54:07 +0000 (10:54 -0400)]
- Updated to version 2014.9 (2014i)
Bob Weinand [Sun, 26 Oct 2014 09:48:45 +0000 (10:48 +0100)]
Fix nullptr dereference in clean without exec context
krakjoe [Sun, 26 Oct 2014 07:24:35 +0000 (07:24 +0000)]
remove dodgy param parser, bring userland breakpoint api inline with PHP7
krakjoe [Sun, 26 Oct 2014 07:08:29 +0000 (07:08 +0000)]
disable output buffering by default
Bob Weinand [Sun, 26 Oct 2014 02:50:28 +0000 (03:50 +0100)]
Add question to reset execution in run/exec/clean
Bob Weinand [Sat, 25 Oct 2014 16:59:48 +0000 (18:59 +0200)]
Merge phpdbg into PHP-5.6
Bob Weinand [Sat, 25 Oct 2014 16:59:48 +0000 (18:59 +0200)]
Merge phpdbg into PHP-5.6
Bob Weinand [Sat, 25 Oct 2014 16:48:43 +0000 (18:48 +0200)]
Fix phpdbg output when outputting via php with active output handlers
Bob Weinand [Sat, 25 Oct 2014 13:29:54 +0000 (15:29 +0200)]
Set engine back to initial state after fatal-ed ev command
Bob Weinand [Sat, 25 Oct 2014 13:28:41 +0000 (15:28 +0200)]
Fix eventual stack overflow after clean cmd
Bob Weinand [Sat, 25 Oct 2014 13:06:34 +0000 (15:06 +0200)]
Fix listing of files with no absolute path
Anatol Belski [Sat, 25 Oct 2014 11:01:17 +0000 (13:01 +0200)]
stdint will be included in the win32 variant, so don't do it twice
Anatol Belski [Sat, 25 Oct 2014 10:04:27 +0000 (12:04 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libmagic.patch in 5.5
Anatol Belski [Sat, 25 Oct 2014 10:03:49 +0000 (12:03 +0200)]
updated libmagic.patch in 5.6
Anatol Belski [Sat, 25 Oct 2014 10:01:58 +0000 (12:01 +0200)]
updated libmagic.patch in 5.5
Remi Collet [Sat, 25 Oct 2014 09:30:53 +0000 (11:30 +0200)]
NEWS
Remi Collet [Sat, 25 Oct 2014 09:30:29 +0000 (11:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Remi Collet [Sat, 25 Oct 2014 09:29:53 +0000 (11:29 +0200)]
NEWS
Remi Collet [Wed, 22 Oct 2014 13:37:04 +0000 (15:37 +0200)]
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Upstream commit
https://github.com/file/file/commit/
39c7ac1106be844a5296d3eb5971946cc09ffda0
CVE -2014-3710
(cherry picked from commit
1803228597e82218a8c105e67975bc50e6f5bf0d )
Bob Weinand [Fri, 24 Oct 2014 17:26:04 +0000 (19:26 +0200)]
Added some NEWS
Bob Weinand [Fri, 24 Oct 2014 17:22:45 +0000 (19:22 +0200)]
Merge phpdbg into PHP-5.6
Bob Weinand [Fri, 24 Oct 2014 17:22:45 +0000 (19:22 +0200)]
Merge phpdbg into PHP-5.6
Bob Weinand [Fri, 24 Oct 2014 12:42:18 +0000 (14:42 +0200)]
Make xml valid (missing space between attrs)
Bob Weinand [Fri, 24 Oct 2014 12:29:06 +0000 (14:29 +0200)]
Fix info classes file name in xml
Bob Weinand [Fri, 24 Oct 2014 12:18:02 +0000 (14:18 +0200)]
Add note about <eval> tag for errors in xml.md
Bob Weinand [Fri, 24 Oct 2014 12:16:49 +0000 (14:16 +0200)]
Name the tag <eval> if the error id during ev cmd
Bob Weinand [Fri, 24 Oct 2014 11:11:14 +0000 (13:11 +0200)]
Do not print out xml as PHP print...
Bob Weinand [Fri, 24 Oct 2014 10:55:44 +0000 (12:55 +0200)]
Fix output to wrong function
Bob Weinand [Fri, 24 Oct 2014 10:32:48 +0000 (12:32 +0200)]
Fixed parameter order on %.*s
Bob Weinand [Thu, 23 Oct 2014 18:14:12 +0000 (20:14 +0200)]
Too much copypaste...
Bob Weinand [Thu, 23 Oct 2014 15:19:26 +0000 (17:19 +0200)]
Add xml formatted deep dump of return value from ev
Bob Weinand [Thu, 23 Oct 2014 11:23:37 +0000 (13:23 +0200)]
Fix some compiler warnings
Bob Weinand [Thu, 23 Oct 2014 11:16:00 +0000 (13:16 +0200)]
Move phpdbg_print and helper functions to phpdbg_out.*
Bob Weinand [Thu, 23 Oct 2014 11:02:50 +0000 (13:02 +0200)]
Do not use int8_t when it is useless...