Commit Graph

81879 Commits

Author SHA1 Message Date
Lior Kaplan
2fd74c7f03 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix typo: unitialized -> uninitialized
2015-04-01 18:20:26 +03:00
Lior Kaplan
59c2a55ec7 Fix typo: unitialized -> uninitialized 2015-04-01 18:17:53 +03:00
Ferenc Kovacs
8de838dc26 fix release date 2015-04-01 01:42:12 +02:00
Ferenc Kovacs
a5e68f72a7 5.6.9 is up next 2015-04-01 01:30:51 +02:00
Lior Kaplan
04c9271805 Add changelog entries for #68677, #68739 & #68740 2015-04-01 01:55:35 +03:00
Lior Kaplan
c22543b3f3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
2015-04-01 01:54:53 +03:00
Lior Kaplan
a32c8ba719 Fixed bug #68739 (Missing break / control flow).
Fixed bug #68740 (NULL Pointer Dereference).
Fixed bug #68677 (Use After Free).
2015-04-01 01:45:34 +03:00
Xinchen Hui
1add8401a3 Fixed bug #68739 (Missing break / control flow in curl)
(cherry picked from commit 124fb22a13)
2015-04-01 01:24:26 +03:00
Xinchen Hui
059e774db0 Fixed bug #68740 (NULL Pointer Dereference)
(cherry picked from commit 124fb22a13)
2015-04-01 01:24:26 +03:00
Xinchen Hui
0a8f28b432 Fixed bug #68677 (Use After Free in OPcache)
(cherry picked from commit 777c39f404)
2015-04-01 01:24:16 +03:00
Derick Rethans
2d3868984c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 16:35:10 +01:00
Derick Rethans
ffbd380e44 Fixed bug #69336 (Issues with "last day of <monthname>"). 2015-03-31 16:35:03 +01:00
Julien Pauli
133c57198e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.25 now
2015-03-31 15:57:44 +02:00
Julien Pauli
97a1b34300 5.5.25 now 2015-03-31 15:51:47 +02:00
Derick Rethans
346c8f7331 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-31 11:09:23 +01:00
Derick Rethans
2c117a40a7 Export date_get_immutable_ce() so that extensions can make use of it too. 2015-03-31 11:08:56 +01:00
Lior Kaplan
0c1c7c7ecb Align entries format 2015-03-31 09:26:34 +03:00
Lior Kaplan
b3d4790976 Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710 2015-03-31 09:24:56 +03:00
Lior Kaplan
96e33a7e98 Add CVE for bug #69207 2015-03-31 09:23:34 +03:00
Lior Kaplan
e5fd3fc99d Align NEWS entries with 5.6.7 2015-03-31 09:20:29 +03:00
Lior Kaplan
90329a32dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Align entries format
  Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
  Add CVE for bug #69207
2015-03-31 09:17:13 +03:00
Lior Kaplan
1bc77559f3 Align entries format 2015-03-31 09:14:06 +03:00
Lior Kaplan
8654fdd884 Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710 2015-03-31 09:12:05 +03:00
Lior Kaplan
639f92275a Add CVE for bug #69207 2015-03-31 09:11:21 +03:00
Michael Wallner
b7389f0f07 BFN 2015-03-30 16:27:08 +02:00
Michael Wallner
a4490bb0a2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #64931
2015-03-30 16:25:47 +02:00
Michael Wallner
6480725007 Fixed bug #64931
phar_add_file is too restrive on filename

Check for any of '/', '\\', '\0' after ".phar".
2015-03-30 16:24:19 +02:00
Michael Wallner
a24aefaac2 BFN 2015-03-30 15:41:36 +02:00
Michael Wallner
3c22449649 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #65467
2015-03-30 15:41:03 +02:00
Michael Wallner
6de25c155e Fixed Bug #65467
Call to undefined method cli_arg_typ_string

Use cli_arg_typ_filecontent instead.
2015-03-30 15:39:30 +02:00
Michael Wallner
64d9c98fa9 BFN 2015-03-30 14:43:02 +02:00
Michael Wallner
90a8b59e9c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bug #67761
2015-03-30 14:42:37 +02:00
Michael Wallner
8f7e378b9f fix bug #67761
Phar::mapPhar fails for Phars inside a path containing ".tar".

Strengthen the silly .tar file extension check.
2015-03-30 14:41:30 +02:00
Michael Wallner
3a660bf3a5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit
2015-03-30 13:48:57 +02:00
Michael Wallner
ef52e44053 Fixed bug 64343
PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:20:09 +02:00
Michael Wallner
f4264ebc64 Fixed bug 64343
PharData::extractTo fails for tarball created by BSD tar

Phar did not know about PAX style global/file headers.
Skip them, to be able to read the contents of those archives.
2015-03-30 13:11:06 +02:00
Leigh
a04ab4b54b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL
2015-03-27 13:26:48 +01:00
Leigh
1b2d58a364 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:24:36 +01:00
Lior Kaplan
ebce0d5d5a Add CVE for bug #68901 2015-03-25 19:32:25 +02:00
Lior Kaplan
67c5ad6b6a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add CVE for bug #68901
2015-03-25 19:31:05 +02:00
Lior Kaplan
bc0e5051e3 Add CVE for bug #68901 2015-03-25 19:26:40 +02:00
Xinchen Hui
d380d1cb1b Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)
is_callable returns true for disable_functions, but function_exists
return false for it.
2015-03-25 23:34:02 +08:00
Anatol Belski
7461c52248 updated NEWS 2015-03-25 13:14:42 +01:00
Anatol Belski
c9550e81da Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
  fix dir separator in test
2015-03-25 13:13:42 +01:00
Anatol Belski
1b41dcf9c5 Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3 2015-03-25 13:13:03 +01:00
Anatol Belski
8f9cb39cad fix dir separator in test 2015-03-25 13:11:27 +01:00
Remi Collet
3924548bcb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
2015-03-25 10:33:31 +01:00
Remi Collet
1174b399ad revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared 2015-03-25 10:33:08 +01:00
Xinchen Hui
eb98366642 Fixed typo 2015-03-25 13:54:42 +08:00
Xinchen Hui
3ab1513ac9 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-25 13:54:30 +08:00