432bd117a9
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 18:00:06 +02:00
d491b2f916
Fix bug #67496 Save command history when exiting interactive shell with control-c
2014-07-24 17:58:39 +02:00
ffc1d25b37
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-24 16:56:05 +02:00
71d3a69425
Fix bug #55496 Interactive mode doesn't force a newline before the prompt
2014-07-24 16:53:51 +02:00
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
e946de29d2
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:52:31 +09:00
3e1b749f5e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:04:23 +03:00
2dff153b23
Enable build without atoll (e.g old AIX flavours)
2014-07-17 22:58:36 +03:00
275e41cb12
Test output relies on expose_php being on
2014-07-14 07:21:11 -07:00
050ef52549
1.2 is a problematic float to print out
...
Lower the default display precision for this test
2014-07-14 07:21:10 -07:00
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
cd1130751d
fix unstable test
2014-07-08 15:04:09 -07:00
64e4261c9b
fix unstable test
2014-07-08 14:13:46 -07:00
5312c39cfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67587 : Redirection loop on nginx with FPM
2014-07-08 12:54:20 -07:00
0bf50a8302
Fix bug #67587 : Redirection loop on nginx with FPM
...
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
2014-07-08 12:53:45 -07:00
51f79846bf
Backported the patch from bug #67407 into 5.5+
2014-07-08 09:54:36 +02:00
03214a2aef
Backported the patch from bug #67407 into 5.4
2014-07-08 09:52:35 +02:00
5516963633
create locales and re-add test
2014-07-07 10:34:43 -07:00
0e1599afe0
rm test for now
2014-07-07 09:32:26 -07:00
c402956178
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
change locale - looks like not everybody has sl_SI
2014-07-07 01:36:03 -07:00
a7d1cad4c3
change locale - looks like not everybody has sl_SI
2014-07-07 01:35:25 -07:00
8ba240a70b
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
2014-07-07 00:48:44 -07:00
8ddf9a2dc4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:37:59 -07:00
6c8a570a96
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:36:57 -07:00
2034ace052
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
2014-07-03 14:58:37 +08:00
533b1df732
Add test for bug #67215
...
bjori> writing a testcase making sure you get a fatal error and does not
segfault after that... is difficult
2014-07-03 13:48:59 +08:00
213e9a0a3c
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:40:33 +02:00
18989420b6
Add test for bug #67151
2014-07-02 22:39:54 +02:00
c66a4e84bb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
adding a reproduce script for bug #49184
2014-07-02 22:38:27 +02:00
37a13d2df7
adding a reproduce script for bug #49184
2014-07-02 22:37:58 +02:00
8c4156ed28
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:34:32 +02:00
3cc6bd10ac
Fix bug #67151 : strtr with empty array crashes
2014-07-02 22:33:20 +02:00
22882a9d89
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
2014-07-02 17:57:42 +08:00
df78c48354
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-02 17:45:09 +08:00
1e06c73192
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:55:15 +02:00
34e686c556
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:53:03 +02:00
2e02f18b15
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:23:11 -07:00
899fe3d8af
Fix ext/pgsql builds with libpq < 7.3.
...
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
2014-07-01 13:19:22 -07:00
4965d1c2ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-07-01 10:27:38 +02:00
af5f997a5d
updated libmagic.patch
2014-07-01 10:25:20 +02:00
2ee09835c1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:23:02 -07:00
9d1d25e625
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:21:43 -07:00
e2ed4874b5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349 : Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
2014-06-24 10:25:09 -07:00
3488cf6fd8
Merge branch 'PHP-5.4.30' into PHP-5.4
...
* PHP-5.4.30:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349 : Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
configure.in
main/php_version.h
2014-06-24 10:23:36 -07:00
6d97b4b2b3
Better fix for bug #67072 with more BC provisions
2014-06-23 22:16:25 -07:00
fb0128af2a
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-23 00:22:59 -07:00
342240fd7f
Better fix for bug #67072 with more BC provisions
2014-06-21 21:30:34 -07:00
c42d5cf5de
Better fix for bug #67072 with more BC provisions
2014-06-21 21:29:11 -07:00
88223c5245
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
2014-06-21 19:46:16 -07:00
Johannes Schlüter