clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,425 Commits 494 Branches 1,367 Tags 802 MiB
12844292b8
Commit Graph

79425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
12844292b8 Merge branch 'PHP-5.6' 2014-04-14 00:10:25 +02:00
Bob Weinand
a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +02:00
Daniel Lowrey
f1aa39c1af Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately
 2014-04-13 15:19:23 -06:00
Daniel Lowrey
0e023e9784 Bug #66840: Fix broken build when extension built separately 2014-04-13 15:17:50 -06:00
Bob Weinand
bf3edbada6 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 23:03:53 +02:00
Bob Weinand
beda5093b4 Reverted to 5a0da281e5 
Discussion: http://news.php.net/php.cvs/76836
 2014-04-13 23:01:31 +02:00
Bob Weinand
e8728b4999 Merge branch 'PHP-5.6' 2014-04-13 19:41:27 +02:00
Bob Weinand
3636a91adc Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:40:39 +02:00
Bob Weinand
191d9fc227 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:37:06 +02:00
Bob Weinand
f07e37c96d Forgot title in phpt for bug #67064 2014-04-13 19:34:17 +02:00
Bob Weinand
2f3056fecc Updated NEWS 2014-04-13 19:32:51 +02:00
Bob Weinand
ef214aa3c0 Merge branch 'PHP-5.6' 2014-04-13 19:28:32 +02:00
Bob Weinand
fb99409f89 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:27:43 +02:00
Bob Weinand
eca0644e0a Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5 Fix bug #67064 in a BC safe way 
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
 2014-04-13 19:24:12 +02:00
Bob Weinand
d86c297659 Merge branch 'PHP-5.6' 2014-04-13 11:42:30 +02:00
Bob Weinand
a3eafe535f Added UPGRAING notice for bug #66015 in BC break section 2014-04-13 11:38:52 +02:00
Nikita Popov
099c070f18 Merge branch 'PHP-5.6' 2014-04-13 10:49:38 +02:00
Nikita Popov
fb5d5d9700 Add new zend_hash_* APIs to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Nikita Popov
57b88ba6ea Add str_* macros to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Ferenc Kovacs
c459805cb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly
 2014-04-13 10:48:42 +02:00
Ferenc Kovacs
20036525e2 Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly 2014-04-13 10:45:46 +02:00
Matteo Beccati
0175bbb767 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir
 2014-04-13 08:55:13 +02:00
Matteo Beccati
7fd9898a2d Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir 2014-04-13 08:53:21 +02:00
Ferenc Kovacs
fdbf467d2e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66568: the second arg for unserialize is optional.
 2014-04-13 02:50:03 +02:00
Ferenc Kovacs
aefc8f22b3 Fix bug #66568: the second arg for unserialize is optional. 2014-04-13 02:49:35 +02:00
Ferenc Kovacs
fb326bbd9b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
 2014-04-13 01:57:49 +02:00
Ferenc Kovacs
51cbb85ea9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo
 2014-04-13 01:57:15 +02:00
Ferenc Kovacs
2876bde634 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo
 2014-04-13 01:56:47 +02:00
Ferenc Kovacs
5a0da281e5 fix typo 2014-04-13 01:55:55 +02:00
Bob Weinand
eae0f529f2 Merge branch 'PHP-5.6' 2014-04-12 23:55:35 +02:00
Bob Weinand
53b1dce587 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-12 23:54:57 +02:00
Bob Weinand
9302be3754 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-12 23:54:29 +02:00
Bob Weinand
edd90e5ae3 Made usage of php_hash_environment useful by updating instead of just adding argc 2014-04-12 23:53:21 +02:00
Bob Weinand
ca447a8f6f Merge branch 'PHP-5.6' 2014-04-11 20:14:44 +02:00
Bob Weinand
096e40a027 Fixed tests for recent constant array changes 2014-04-11 20:13:24 +02:00
Bob Weinand
ccf863c8ce Merge branch 'PHP-5.6' 2014-04-11 19:35:11 +02:00
Bob Weinand
99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Bob Weinand
35b895fdf0 Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
Bob Weinand
920c5508ef Updated NEWS 2014-04-11 18:30:14 +02:00
Bob Weinand
38ec4d20bf Merge branch 'PHP-5.6' 2014-04-11 18:24:41 +02:00
Bob Weinand
ee2a7c7d41 Fixed disallowal of array usage in constants at run-time 
Added at the same time the possibility of array dereferencing
to complete the set of features (useful application of arrays in constants)
 2014-04-11 18:21:46 +02:00
Bob Weinand
53e71e47b9 Merge branch 'PHP-5.6' 2014-04-11 16:21:15 +02:00
Bob Weinand
ad05d3898e Updated zend_vm_execute.h 2014-04-11 16:18:42 +02:00
Anatol Belski
f0c95cb705 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix syntax error in vc++
 2014-04-11 13:28:13 +02:00
Anatol Belski
5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
Anatol Belski
3af4be482c Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
 2014-04-11 11:02:02 +02:00
Anatol Belski
4c32c8d549 updated NEWS 2014-04-11 11:01:42 +02:00
Anatol Belski
c5181ef6c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
 2014-04-11 11:01:01 +02:00
Anatol Belski
e08172e0d5 Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3 2014-04-11 11:00:10 +02:00