summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-071-2/+2
|\ \ | |/ | | | | | | * PHP-5.4: change locale - looks like not everybody has sl_SI
| * change locale - looks like not everybody has sl_SIStanislav Malyshev2014-07-071-2/+2
| |
* | Fix bug #66921 - Wrong argument type hint for function ↵Stanislav Malyshev2014-07-072-1/+16
| | | | | | | | intltz_from_date_time_zone
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-073-1/+30
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
| * Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)Stanislav Malyshev2014-07-073-1/+30
| |
* | Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)Xinchen Hui2014-07-031-9/+4
| |
* | Add test for bug #67215Xinchen Hui2014-07-031-0/+28
| | | | | | | | | | bjori> writing a testcase making sure you get a fatal error and does not segfault after that... is difficult
* | Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2014-07-021-0/+8
|\ \ | |/
| * Add test for bug #67151Nikita Popov2014-07-021-0/+8
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-07-021-0/+22
|\ \ | |/ | | | | | | * PHP-5.4: adding a reproduce script for bug #49184
| * adding a reproduce script for bug #49184Ferenc Kovacs2014-07-021-0/+22
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Nikita Popov2014-07-021-0/+4
|\ \ | |/
| * Fix bug #67151: strtr with empty array crashesNikita Popov2014-07-021-0/+4
| |
* | Fixed bug #67539 (ArrayIterator use-after-free due to object change during ↵Xinchen Hui2014-07-022-0/+22
| | | | | | | | sorting)
* | Fixed Bug #67538 (SPL Iterators use-after-free)Xinchen Hui2014-07-022-2/+22
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-022-5/+17
|\ \ | |/ | | | | | | * PHP-5.4: fix integer overflow in {stream,file}_{get,put}_contents()
| * fix integer overflow in {stream,file}_{get,put}_contents()Michael Wallner2014-07-022-5/+17
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-07-011-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Fix ext/pgsql builds with libpq < 7.3.
| * Fix ext/pgsql builds with libpq < 7.3.Adam Harvey2014-07-011-1/+1
| | | | | | | | Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-07-011-44/+130
|\ \ | |/ | | | | | | * PHP-5.4: updated libmagic.patch
| * updated libmagic.patchAnatol Belski2014-07-011-44/+130
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-06-241-3/+4
|\ \ | |/ | | | | | | * PHP-5.4: Fix test - because of big #67397 we don't allow overlong locales anymore
| * Fix test - because of big #67397 we don't allow overlong locales anymoreStanislav Malyshev2014-06-241-3/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-06-248-12/+62
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'PHP-5.4.30' into PHP-5.4Stanislav Malyshev2014-06-248-13/+63
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Better fix for bug #67072 with more BC provisionsStanislav Malyshev2014-06-233-34/+120
| | |
| | * Fix bug #67498 - phpinfo() Type Confusion Information Leak VulnerabilityStanislav Malyshev2014-06-232-4/+19
| | |
| | * Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type ConfusionStanislav Malyshev2014-06-213-3/+6
| | |
| | * Fix bug #67397 (Buffer overflow in ↵Stanislav Malyshev2014-06-212-1/+30
| | | | | | | | | | | | locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
| | * Fix bug #67349: Locale::parseLocale Double FreeStanislav Malyshev2014-06-212-5/+8
| | |
| | * Fix potential segfault in dns_get_record()Sara Golemon2014-06-151-0/+4
| | | | | | | | | | | | | | | | | | If the remote sends us a packet with a malformed TXT record, we could end up trying to over-consume the packet and wander off into overruns.
| | * Fix bug #66127 (Segmentation fault with ArrayObject unset)php-5.4.30RC1Stanislav Malyshev2014-06-103-1/+28
| | |
| * | Better fix for bug #67072 with more BC provisionsStanislav Malyshev2014-06-213-34/+120
| | |
* | | Better fix for bug #67072 with more BC provisionsStanislav Malyshev2014-06-213-34/+120
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-06-209-17/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed MarinaDB support
| * | Fixed MarinaDB supportDmitry Stogov2014-06-209-17/+17
| | |
* | | Suppress test failure with MySQL 5.7Andrey Hristov2014-06-181-1/+1
| | |
* | | Update copyright year to 2014Lior Kaplan2014-06-182-2/+2
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-167-7/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: Update copyright year for re2c generated files Update copyright year to 2014 Update copyright year for re2c files as well
| * | Update copyright year for re2c generated filesLior Kaplan2014-06-162-2/+2
| | |
| * | Update copyright year for re2c files as wellLior Kaplan2014-06-165-5/+5
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-06-131-655/+655
|\ \ \ | |/ /
| * | - Updated to version 2014.5 (2014e)Derick Rethans2014-06-131-655/+655
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-122-2/+52
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Follow 308 Permanent Redirect responses.
| * | Follow 308 Permanent Redirect responses.Adam Harvey2014-06-122-2/+52
| | | | | | | | | | | | Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-1214-0/+165
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Keep 308-399 HTTP response codes when header('Location:') is called.
| * | Keep 308-399 HTTP response codes when header('Location:') is called.Adam Harvey2014-06-1214-0/+165
| | | | | | | | | | | | | | | Fixes bug #67428 (header('Location: foo') will override a 308-399 response code).
* | | Merge branch 'PHP-5.4' into PHP-5.5Sara Golemon2014-06-111-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fix potential segfault in dns_get_record()
| * | Fix potential segfault in dns_get_record()Sara Golemon2014-06-111-0/+4
| | | | | | | | | | | | | | | | | | If the remote sends us a packet with a malformed TXT record, we could end up trying to over-consume the packet and wander off into overruns.
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-06-103-1/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Conflicts: configure.in main/php_version.h