php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,875 Commits 547 Branches 1,481 Tags
03dcdf5742e56abe305809ea233ba41301fddc16
Commit Graph

80875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferenc Kovacs
03dcdf5742 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
 2014-07-25 13:16:31 +02:00
Ferenc Kovacs
a68ef0a117 Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. 
This reverts commit aefc8f22b3.

Conflicts:
	NEWS
 2014-07-25 13:15:27 +02:00
Stanislav Malyshev
7abaac41fd Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
 2014-07-24 22:59:01 -07:00
Stanislav Malyshev
3345722354 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
 2014-07-24 22:58:29 -07:00
Stanislav Malyshev
fedc799344 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
 2014-07-24 22:58:06 -07:00
Stanislav Malyshev
d0a244f1f3 update NEWS 2014-07-24 22:55:39 -07:00
Xinchen Hui
51c38a0997 Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) 2014-07-24 22:54:14 -07:00
Xinchen Hui
61e0f8599d Fixed Bug #67538 (SPL Iterators use-after-free) 2014-07-24 22:53:46 -07:00
Xinchen Hui
ec441ff4ed Merge branch 'PHP-5.6' 2014-07-25 10:52:57 +08:00
Xinchen Hui
bad5502ca9 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-25 10:52:46 +08:00
Xinchen Hui
235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Xinchen Hui
4ae1d5d1bd Add CVE no 2014-07-25 10:52:27 +08:00
Johannes Schlüter
0ac3d8d4f4 Merge branch 'PHP-5.6' 2014-07-24 18:02:00 +02:00
Johannes Schlüter
8d1ec3814e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 18:01:35 +02:00
Johannes Schlüter
acfa8c770c BFN 2014-07-24 18:00:58 +02:00
Johannes Schlüter
432bd117a9 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 18:00:06 +02:00
Dmitry Saprykin
d491b2f916 Fix bug #67496 Save command history when exiting interactive shell with control-c 2014-07-24 17:58:39 +02:00
Johannes Schlüter
6fdbb4601f Merge branch 'PHP-5.6' 2014-07-24 16:59:37 +02:00
Johannes Schlüter
210315d5a5 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 16:58:50 +02:00
Johannes Schlüter
899b369e15 BFN 2014-07-24 16:58:05 +02:00
Johannes Schlüter
ffc1d25b37 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-24 16:56:05 +02:00
Johannes Schlüter
71d3a69425 Fix bug #55496 Interactive mode doesn't force a newline before the prompt 2014-07-24 16:53:51 +02:00
Tjerk Meesters
4b41009064 Merge branch 'PHP-5.6' 2014-07-24 14:40:30 +08:00
Tjerk Meesters
aab23cf38e Updated NEWS for #67666 2014-07-24 14:39:18 +08:00
Tjerk Meesters
38e714ece5 Fixed #67666 - Subject altName doesn't match wildcards 2014-07-24 14:36:31 +08:00
Dmitry Stogov
8fb7c4dc08 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Removed second zval_copy_ctor()
 2014-07-24 01:16:28 +04:00
Dmitry Stogov
ea1d5dcacb Removed second zval_copy_ctor() 2014-07-24 01:16:00 +04:00
Dmitry Stogov
39740a33e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed crash on self-referencing constant expression (part of a constant AST)
 2014-07-24 00:59:42 +04:00
Dmitry Stogov
d909b6330e Fixed crash on self-referencing constant expression (part of a constant AST) 2014-07-24 00:37:15 +04:00
Dmitry Stogov
4c37e69957 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
 2014-07-23 22:49:46 +04:00
Dmitry Stogov
c49a06168e Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set) 2014-07-23 22:47:58 +04:00
Anatol Belski
b39f98cf81 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:48:06 +02:00
Anatol Belski
a6ecb873b9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:47:40 +02:00
Anatol Belski
6fcd8e5865 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
 2014-07-21 14:46:57 +02:00
Anatol Belski
dc3a5d783f fix nmake snap when ext name is different in target dll 2014-07-21 14:45:49 +02:00
Anatol Belski
833e466983 Merge branch 'PHP-5.6' 
* PHP-5.6:
  force atoll macro usage on windows
 2014-07-21 10:01:48 +02:00
Anatol Belski
f6d941e4b4 force atoll macro usage on windows 2014-07-21 09:52:52 +02:00
Lior Kaplan
128eda843f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
 2014-07-21 01:50:51 +03:00
Lior Kaplan
b131b03dc2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
 2014-07-21 01:49:31 +03:00
Lior Kaplan
842fde2827 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
 2014-07-21 01:47:19 +03:00
Lior Kaplan
0678dc8d91 Enable $ replacement in exif, ldap, pdo_pgsql and tidy 2014-07-21 01:45:36 +03:00
Remi Collet
a9c8499d4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  See bug #67635
 2014-07-20 11:16:09 +02:00
Remi Collet
d55f23ea5a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  See bug #67635
 2014-07-20 11:15:59 +02:00
Remi Collet
658f7d77f9 See bug #67635 
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
 2014-07-20 11:14:43 +02:00
Remi Collet
6055a53d34 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
 2014-07-19 18:47:32 +02:00
Remi Collet
0ec8f19975 NEWS 2014-07-19 18:47:14 +02:00
Remi Collet
d5d16b6278 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
 2014-07-19 18:46:46 +02:00
Remi Collet
a051d7264d NEWS 2014-07-19 18:46:17 +02:00
Remi Collet
144a083954 improve previous, add message during configure 2014-07-19 18:42:40 +02:00
Remi Collet
7b60315672 Fixed bug #67635 php links to systemd libraries without using pkg-config 
Patch from pacho at gentoo dot org

Rely on pkg-config for systemd >= 209
Failback on old check
 2014-07-19 18:40:20 +02:00