Commit Graph

79886 Commits

Author SHA1 Message Date
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
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
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
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
ea1d5dcacb Removed second zval_copy_ctor() 2014-07-24 01:16:00 +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
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
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
f6d941e4b4 force atoll macro usage on windows 2014-07-21 09:52:52 +02: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
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
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
Xinchen Hui
1d2f232bd2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 17:19:39 +08:00
Xinchen Hui
8ff00e6e85 Improve fix for #66608 2014-07-19 17:19:01 +08:00
Xinchen Hui
9ce1a36af2 Fixed segfault with empty break 2014-07-19 15:30:50 +08:00
Xinchen Hui
cd95347cbc Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-19 13:12:42 +08:00
Xinchen Hui
9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Xinchen Hui
629c1ecd4f Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2014-07-19 13:12:26 +08:00
Xinchen Hui
f604b61e39 New added opcodes don't need to be resloved 2014-07-19 12:53:34 +08:00
Yasuo Ohgaki
f19eb82f7c Update NEWS 2014-07-19 10:13:15 +09:00
Yasuo Ohgaki
9b30b04b32 Update NEWS 2014-07-19 10:12:28 +09:00
Yasuo Ohgaki
ad744263ca Update NEWS 2014-07-19 10:11:42 +09:00
Yasuo Ohgaki
d0d5a1c444 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:59:51 +09:00
Yasuo Ohgaki
f83a6c33b4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:53:04 +09:00
Yasuo Ohgaki
e946de29d2 Fixed bug #66827 Session raises E_NOTICE when session name variable is array 2014-07-19 09:52:31 +09:00
Anatol Belski
47e640164a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:58 +02:00
Anatol Belski
982342b057 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:09 +02:00
Anatol Belski
c5ccaf1d04 implemented copy libs of core exts in phpize mode 2014-07-18 18:38:57 +02:00
Rasmus Lerdorf
f8f6bd7a08 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
  implemented usage of the non core ext deps in phpize mode
  implemented force usage of generated .h and .js deps in phpize mode
  basic routines for phpize mode to
  Easier to read
  Add some trace info as well as update CLIENT_ flags
  Fix my name in the given credit
  Update NEWS for PR#723 merge
  Add ifdef on ecdh for single_ecdh_use
  fix C89 compat
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-18 08:14:08 -07:00
Anatol Belski
f9d5d2abaa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:42:24 +02:00
Anatol Belski
f304fb848f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:40:53 +02:00
Anatol Belski
35b077f53e fix copy the ext dll into the prefix path in phpize mode 2014-07-18 11:39:38 +02:00