Commit Graph

85994 Commits

Author SHA1 Message Date
Remi Collet
36fef6dcd9 fix phpdbg build when src tree != build tree 2014-10-28 19:12:41 +01:00
Remi Collet
9028846c63 fix phpdbg build when src tree != build tree 2014-10-28 19:12:41 +01:00
Bob Weinand
563f62ac49 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 17:43:15 +01:00
Bob Weinand
2a24763f6c Merge ../phpdbg into PHP-5.6 2014-10-28 17:42:38 +01:00
Bob Weinand
ec53351447 Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
	configure.in
	main/php_version.h
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_prompt.c
2014-10-28 17:40:27 +01:00
Bob Weinand
7561e6b6e3 Remove the ugly hack via a temp file to store breakpoints 2014-10-28 17:25:48 +01:00
Bob Weinand
297baa0c18 Remove the ugly hack via a temp file to store breakpoints 2014-10-28 17:25:48 +01:00
Bob Weinand
82640b7363 Typo (notfoundc => notfound) 2014-10-28 17:25:46 +01:00
Bob Weinand
fd8a70b1ee Typo (notfoundc => notfound) 2014-10-28 17:25:46 +01:00
Bob Weinand
c895fbea22 Fix quitting on a second run 2014-10-28 17:25:46 +01:00
Bob Weinand
76bd799eb7 Fix quitting on a second run 2014-10-28 17:25:46 +01:00
Bob Weinand
b7d83ff8a6 Fix wrong exec length on relative paths 2014-10-28 17:25:45 +01:00
Bob Weinand
c34fd92466 Fix wrong exec length on relative paths 2014-10-28 17:25:45 +01:00
Bob Weinand
a8ac22452d Fix possibly unclosed <stream> tags 2014-10-28 17:25:45 +01:00
Bob Weinand
cc3587f4a3 Fix possibly unclosed <stream> tags 2014-10-28 17:25:45 +01:00
Bob Weinand
9990089f28 Fix potential segfaults and unresolved breaks 2014-10-28 17:25:43 +01:00
Bob Weinand
79c66e7cd2 Fix potential segfaults and unresolved breaks 2014-10-28 17:25:43 +01:00
Bob Weinand
64774c7ddb *Always* clean up and run destructors 2014-10-28 17:25:43 +01:00
Bob Weinand
fe5f5d40f2 *Always* clean up and run destructors 2014-10-28 17:25:43 +01:00
Anatol Belski
efe9cc3a86 rework fix to php_com_do_invoke_byref,
fix crashing function with void arguments
2014-10-28 17:25:09 +01:00
Anatol Belski
05fa1b8ecc fix possible zero deref 2014-10-28 17:25:08 +01:00
Anatol Belski
e2951a191e fix error code upcast on x64 2014-10-28 17:25:06 +01:00
Anatol Belski
26e7e54e78 several fixes to com_dotnet for x64 2014-10-28 17:25:05 +01:00
Anatol Belski
3b6a9a3916 exclude the 32 bit only test 2014-10-28 17:25:04 +01:00
Anatol Belski
1493124e2b initialize the input arg lengths 2014-10-28 17:25:02 +01:00
Anatol Belski
41a505fc7f fix datatype mismatches 2014-10-28 17:25:00 +01:00
Anatol Belski
e4464a8e85 convert API for size_t where zend_string is used under the hood 2014-10-28 17:24:59 +01:00
Anatol Belski
36b64b44d5 fix signature, zend_string is used for function name 2014-10-28 17:24:58 +01:00
Anatol Belski
e7945419dd fix datatype mismatches 2014-10-28 17:24:56 +01:00
Anatol Belski
1770ae641b fix datatype mismatches 2014-10-28 17:24:55 +01:00
Anatol Belski
77ab77fd02 fix datatype mismatch 2014-10-28 17:24:54 +01:00
Anatol Belski
e048426402 fix datatype mismatch 2014-10-28 17:24:53 +01:00
Anatol Belski
5ac84a5a47 fix datatype mismatch warns 2014-10-28 17:24:51 +01:00
Anatol Belski
99d12cf202 fix datatype mismatch 2014-10-28 17:24:50 +01:00
Bob Weinand
49e31265ed Remove the ugly hack via a temp file to store breakpoints 2014-10-28 17:20:21 +01:00
Julien Pauli
c7f074b163 5.6.4 now 2014-10-28 16:00:19 +01:00
Julien Pauli
71e200b338 PHP 5.5.20 now 2014-10-28 15:01:53 +01:00
Bob Weinand
b24640f463 Typo (notfoundc => notfound) 2014-10-28 13:55:56 +01:00
Bob Weinand
b8dd98178c Fix quitting on a second run 2014-10-28 13:55:14 +01:00
Bob Weinand
24a88e3906 Fix wrong exec length on relative paths 2014-10-28 13:27:20 +01:00
Bob Weinand
2b3ea0a2bd Fix possibly unclosed <stream> tags 2014-10-28 13:20:43 +01:00
Bob Weinand
da3d6f3d64 Fix potential segfaults and unresolved breaks 2014-10-28 12:38:07 +01:00
Bob Weinand
cce9550e48 *Always* clean up and run destructors 2014-10-28 12:27:19 +01:00
Xinchen Hui
5190d8fb56 Addtion fix for bug #68252 , forget static variable hanlding 2014-10-28 17:42:06 +08:00
Xinchen Hui
e6fe3127d0 Fixed bug #68252 (segfault in Zend/zend_hash.c in function _zend_hash_del_el)
Don't leave a UNDEF gap in function_table
2014-10-28 17:36:03 +08:00
Remi Collet
2bec5d18b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Ensure we have enough input data before parsing date
2014-10-28 08:51:22 +01:00
Remi Collet
47acdcb176 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Ensure we have enough input data before parsing date
2014-10-28 08:50:48 +01:00
Remi Collet
13a218d328 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.
2014-10-28 08:48:22 +01:00
Stanislav Malyshev
6457c34ad8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #68095 - invalid read in php_getopt()
2014-10-27 19:10:43 -07:00
Stanislav Malyshev
c5659cb8bd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #68095 - invalid read in php_getopt()
2014-10-27 19:09:39 -07:00