Stanislav Malyshev
41448bff7c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
create locales and re-add test
Conflicts:
.travis.yml
2014-07-07 10:42:13 -07:00
Stanislav Malyshev
5516963633
create locales and re-add test
2014-07-07 10:34:43 -07:00
Stanislav Malyshev
31b395ac68
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
rm test for now
2014-07-07 09:33:05 -07:00
Stanislav Malyshev
0e1599afe0
rm test for now
2014-07-07 09:32:26 -07:00
Stanislav Malyshev
432bb7abe5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
change locale - looks like not everybody has sl_SI
2014-07-07 01:36:24 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
a7d1cad4c3
change locale - looks like not everybody has sl_SI
2014-07-07 01:35:25 -07:00
Stanislav Malyshev
04a227dd16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
2014-07-07 00:50:07 -07:00
Stanislav Malyshev
8ba240a70b
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
2014-07-07 00:48:44 -07:00
Stanislav Malyshev
effb2b7a13
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
2014-07-07 00:38:38 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
6c8a570a96
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:36:57 -07:00
Michael Wallner
40bcd909d8
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
2014-07-03 20:40:40 +02:00
Xinchen Hui
4e16054b7a
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-03 14:58:53 +08:00
Xinchen Hui
2034ace052
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
2014-07-03 14:58:37 +08:00
Xinchen Hui
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
Ferenc Kovacs
6ca71b451e
also add Remi to the QA credits
2014-07-02 23:35:31 +02:00
Ferenc Kovacs
58598ead2c
add Stas and Julient to the QA credits
2014-07-02 23:32:50 +02:00
Ferenc Kovacs
3be6f0dc79
update the credits
2014-07-02 23:26:41 +02:00
Nikita Popov
a91d1bb9a3
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 22:40:45 +02:00
Nikita Popov
213e9a0a3c
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:40:33 +02:00
Nikita Popov
18989420b6
Add test for bug #67151
2014-07-02 22:39:54 +02:00
Ferenc Kovacs
1ef67b8486
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
adding a reproduce script for bug #49184
2014-07-02 22:38:53 +02:00
Ferenc Kovacs
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
Ferenc Kovacs
37a13d2df7
adding a reproduce script for bug #49184
2014-07-02 22:37:58 +02:00
Nikita Popov
4827806b9e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 22:35:00 +02:00
Nikita Popov
8c4156ed28
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:34:32 +02:00
Nikita Popov
3cc6bd10ac
Fix bug #67151 : strtr with empty array crashes
2014-07-02 22:33:20 +02:00
Adam Harvey
c580d9b69c
Fix ext/pgsql builds against libpq 7.3.
...
Fixes bug #67555 (Cannot build against libpq 7.3).
2014-07-02 12:30:06 -07:00
Xinchen Hui
f48f311533
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 17:58:11 +08:00
Xinchen Hui
22882a9d89
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
2014-07-02 17:57:42 +08:00
Xinchen Hui
df78c48354
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-02 17:45:09 +08:00
Michael Wallner
122ee0a1cf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:56:05 +02:00
Michael Wallner
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
Michael Wallner
34e686c556
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:53:03 +02:00
Adam Harvey
d1adf55c15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:25:55 -07:00
Adam Harvey
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
Adam Harvey
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
Anatol Belski
3fd792b3b9
updated libmagic.patch in 5.6+
2014-07-01 10:28:43 +02:00
Anatol Belski
4965d1c2ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-07-01 10:27:38 +02:00
Anatol Belski
af5f997a5d
updated libmagic.patch
2014-07-01 10:25:20 +02:00
Xinchen Hui
959a006d61
Fixed test
2014-06-29 18:00:31 +08:00
Stanislav Malyshev
78c3ca105b
remove bug67072_2 test for 5.6+ since we'd have cleaner solution
2014-06-24 11:24:07 -07:00
Stanislav Malyshev
b4c046d156
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:23:48 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
9d1d25e625
Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:21:43 -07:00
Stanislav Malyshev
cfe06eb2b1
Better fix for bug #67072 with more BC provisions
2014-06-24 10:30:03 -07:00
Stanislav Malyshev
84f9fe0fdc
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
2014-06-24 10:29:26 -07:00
Stanislav Malyshev
b03993dde9
Fix bug #67492 : unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
2014-06-24 10:29:26 -07:00
Stanislav Malyshev
f48b8f3339
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
2014-06-24 10:29:25 -07:00