mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-11 05:24:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
85,800 Commits 505 Branches 1,389 Tags 856 MiB
770473a648
Commit Graph

85800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
770473a648 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup uneeded json
 2014-10-29 07:26:58 +01:00
Remi Collet
7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand
4fec48d1b0 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 23:07:46 +01:00
Bob Weinand
47fd168fed Move missing zend_hash_* macros from phpdbg.h to zend_hash.h 2014-10-28 23:07:36 +01:00
Bob Weinand
a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand
31ada13463 Removed last HAVE_JSON check 2014-10-28 23:06:32 +01:00
Bob Weinand
66aead4b5f Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg_wait.c
	sapi/phpdbg/phpdbg_webdata_transfer.c
 2014-10-28 23:00:10 +01:00
Bob Weinand
be5d389768 Merge phpdbg into PHP-5.6 2014-10-28 22:44:29 +01:00
Bob Weinand
234df7d2ca Fix versions & config.m4 2014-10-28 22:33:41 +01:00
Bob Weinand
6150d9342c Merge ../phpdbg into PHP-5.6 
Conflicts:
	sapi/phpdbg/config.m4
 2014-10-28 22:15:05 +01:00
Bob Weinand
d25cc7f090 Use serialize instead of json for transfer 2014-10-28 22:14:35 +01:00
Bob Weinand
69b999eb7e Add webhelper in config.w32 2014-10-28 22:11:30 +01:00
Bob Weinand
9ba0654ad7 Merge php-src into phpdbg 
Conflicts:
	config.m4
 2014-10-28 21:15:47 +01:00
Remi Collet
9afb17868c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix phpdbg build when src tree != build tree
 2014-10-28 19:13:27 +01:00
Remi Collet
9028846c63 fix phpdbg build when src tree != build tree 2014-10-28 19:12:41 +01:00
Remi Collet
36fef6dcd9 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