18ff81eb1a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:04:36 +02:00
d02aa44090
NEWS
2014-06-10 14:04:27 +02:00
e77659a8c8
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
...
Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
2014-06-10 14:02:36 +02:00
d440bb3e68
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
2014-06-10 10:32:26 +02:00
95fcf868d3
NEWS
2014-06-10 10:32:15 +02:00
949cab09f2
NEWS
2014-06-10 10:31:17 +02:00
58c6a08e00
Fixed bug #67406 built-in web-server segfaults on startup
...
Reproduce on aarch64.
From select man page:
"select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
2014-06-10 10:28:34 +02:00
954632e9ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:37 -07:00
4b0b032676
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:31 -07:00
62857998c5
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:09 -07:00
af5057bea7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:07 +02:00
5c8c57aa6c
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:05:23 +02:00
1b8d4695e2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:46:12 -07:00
9b5d56fd61
add news
2014-06-08 19:44:27 -07:00
aebb23e4db
Bug 49898
...
__getCookies() method implementation
2014-06-08 19:36:18 -07:00
e07083c378
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix order
2014-06-08 19:04:35 -07:00
7ddbfae022
fix order
2014-06-08 19:04:21 -07:00
e43270cb2a
fix order
2014-06-08 19:03:50 -07:00
8f78c3b9eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug 666222
2014-06-08 19:00:42 -07:00
f47976dd9b
Fix bug 666222
...
This also adds some smaller, isolated tests related to bug 66622.
2014-06-08 18:59:44 -07:00
e030efa4f6
Fix bug 666222
...
This also adds some smaller, isolated tests related to bug 66622.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2014-06-08 18:59:23 -07:00
38343856e1
Merge branch 'PHp-5.4' into PHP-5.5
...
* PHp-5.4:
Fixed identation on file
Fix align indentation
2014-06-08 15:53:26 -07:00
33926b19d0
Fixed identation on file
2014-06-08 14:30:01 -07:00
e51eaaf665
Fix align indentation
2014-06-08 14:28:51 -07:00
4946dc1ab9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:16 -07:00
76a7fd893b
Added support for parsing ssl certificates using GeneralizedTime format.
...
fix bug #65698
fix bug #66636
2014-06-08 14:17:58 -07:00
da6abc8db4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove superfluous echos.
2014-06-08 13:50:41 -07:00
5fd7c2b01d
Remove superfluous echos.
2014-06-08 13:50:22 -07:00
a53b884c47
NEWS
2014-06-06 14:18:29 +02:00
38e11dfaee
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:18:17 +02:00
811f35d0ed
NEWS
2014-06-06 14:17:54 +02:00
91bcadd85e
Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:16:04 +02:00
e31b51f9a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
drop exec perm on doc files
2014-06-05 17:45:41 +02:00
56c9e22c1f
drop exec perm on doc files
2014-06-05 17:45:22 +02:00
67f1a58ac9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
127651e9ae
fix test for 5.4/5.5
2014-06-05 17:33:40 +02:00
ab848ea400
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add test for previous fix
2014-06-05 14:00:15 +02:00
15d8c80ead
add test for previous fix
2014-06-05 14:00:00 +02:00
c61c24ad79
NEWS
2014-06-05 13:46:13 +02:00
9ea9064779
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
3f47368738
NEWS
2014-06-05 13:45:25 +02:00
1fe9f1e4f5
Fix regression introduce in fix for bug #67118
...
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
which is check by DATE_CHECK_INITIALIZED by later method call
Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
4b4a5bc1d3
update news
2014-06-04 01:10:45 -07:00
846e076492
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
2014-06-04 01:10:12 -07:00
e06c4f7fe5
update NEWS
2014-06-04 01:09:37 -07:00
bf50218983
fix gcov data with some locales (again)
2014-06-03 17:22:16 -04:00
e2710310a0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:18 +02:00
20568e5028
Fixed regression introduced by patch for bug #67072
...
This applies to 5.4 and 5.5 only as a legacy fix.
2014-06-03 20:43:58 +02:00
97b86c3c4a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
(re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:21 +02:00
0817a2c767
(re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:07 +02:00
Remi Collet