Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-07 | 1 | -2/+2 | |
|\ \ | |/ | | | | | | | * PHP-5.4: change locale - looks like not everybody has sl_SI | |||||
| * | change locale - looks like not everybody has sl_SI | Stanislav Malyshev | 2014-07-07 | 1 | -2/+2 | |
| | | ||||||
* | | Fix bug #66921 - Wrong argument type hint for function ↵ | Stanislav Malyshev | 2014-07-07 | 2 | -1/+16 | |
| | | | | | | | | intltz_from_date_time_zone | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-07-07 | 3 | -1/+30 | |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) | |||||
| * | Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) | Stanislav Malyshev | 2014-07-07 | 3 | -1/+30 | |
| | | ||||||
* | | Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) | Xinchen Hui | 2014-07-03 | 1 | -9/+4 | |
| | | ||||||
* | | Add test for bug #67215 | Xinchen Hui | 2014-07-03 | 1 | -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.5 | Nikita Popov | 2014-07-02 | 1 | -0/+8 | |
|\ \ | |/ | ||||||
| * | Add test for bug #67151 | Nikita Popov | 2014-07-02 | 1 | -0/+8 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-07-02 | 1 | -0/+22 | |
|\ \ | |/ | | | | | | | * PHP-5.4: adding a reproduce script for bug #49184 | |||||
| * | adding a reproduce script for bug #49184 | Ferenc Kovacs | 2014-07-02 | 1 | -0/+22 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Nikita Popov | 2014-07-02 | 1 | -0/+4 | |
|\ \ | |/ | ||||||
| * | Fix bug #67151: strtr with empty array crashes | Nikita Popov | 2014-07-02 | 1 | -0/+4 | |
| | | ||||||
* | | Fixed bug #67539 (ArrayIterator use-after-free due to object change during ↵ | Xinchen Hui | 2014-07-02 | 2 | -0/+22 | |
| | | | | | | | | sorting) | |||||
* | | Fixed Bug #67538 (SPL Iterators use-after-free) | Xinchen Hui | 2014-07-02 | 2 | -2/+22 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-07-02 | 2 | -5/+17 | |
|\ \ | |/ | | | | | | | * PHP-5.4: fix integer overflow in {stream,file}_{get,put}_contents() | |||||
| * | fix integer overflow in {stream,file}_{get,put}_contents() | Michael Wallner | 2014-07-02 | 2 | -5/+17 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-07-01 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix ext/pgsql builds with libpq < 7.3. | |||||
| * | Fix ext/pgsql builds with libpq < 7.3. | Adam Harvey | 2014-07-01 | 1 | -1/+1 | |
| | | | | | | | | Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756). | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-07-01 | 1 | -44/+130 | |
|\ \ | |/ | | | | | | | * PHP-5.4: updated libmagic.patch | |||||
| * | updated libmagic.patch | Anatol Belski | 2014-07-01 | 1 | -44/+130 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-06-24 | 1 | -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 anymore | Stanislav Malyshev | 2014-06-24 | 1 | -3/+4 | |
| | | ||||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-06-24 | 8 | -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.4 | Stanislav Malyshev | 2014-06-24 | 8 | -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 provisions | Stanislav Malyshev | 2014-06-23 | 3 | -34/+120 | |
| | | | ||||||
| | * | Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability | Stanislav Malyshev | 2014-06-23 | 2 | -4/+19 | |
| | | | ||||||
| | * | Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion | Stanislav Malyshev | 2014-06-21 | 3 | -3/+6 | |
| | | | ||||||
| | * | Fix bug #67397 (Buffer overflow in ↵ | Stanislav Malyshev | 2014-06-21 | 2 | -1/+30 | |
| | | | | | | | | | | | | locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) | |||||
| | * | Fix bug #67349: Locale::parseLocale Double Free | Stanislav Malyshev | 2014-06-21 | 2 | -5/+8 | |
| | | | ||||||
| | * | Fix potential segfault in dns_get_record() | Sara Golemon | 2014-06-15 | 1 | -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.30RC1 | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 | |
| | | | ||||||
| * | | Better fix for bug #67072 with more BC provisions | Stanislav Malyshev | 2014-06-21 | 3 | -34/+120 | |
| | | | ||||||
* | | | Better fix for bug #67072 with more BC provisions | Stanislav Malyshev | 2014-06-21 | 3 | -34/+120 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2014-06-20 | 9 | -17/+17 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support | |||||
| * | | Fixed MarinaDB support | Dmitry Stogov | 2014-06-20 | 9 | -17/+17 | |
| | | | ||||||
* | | | Suppress test failure with MySQL 5.7 | Andrey Hristov | 2014-06-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Update copyright year to 2014 | Lior Kaplan | 2014-06-18 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-06-16 | 7 | -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 files | Lior Kaplan | 2014-06-16 | 2 | -2/+2 | |
| | | | ||||||
| * | | Update copyright year for re2c files as well | Lior Kaplan | 2014-06-16 | 5 | -5/+5 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-06-13 | 1 | -655/+655 | |
|\ \ \ | |/ / | ||||||
| * | | - Updated to version 2014.5 (2014e) | Derick Rethans | 2014-06-13 | 1 | -655/+655 | |
| | | | ||||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-06-12 | 2 | -2/+52 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Follow 308 Permanent Redirect responses. | |||||
| * | | Follow 308 Permanent Redirect responses. | Adam Harvey | 2014-06-12 | 2 | -2/+52 | |
| | | | | | | | | | | | | Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects). | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-06-12 | 14 | -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 Harvey | 2014-06-12 | 14 | -0/+165 | |
| | | | | | | | | | | | | | | | Fixes bug #67428 (header('Location: foo') will override a 308-399 response code). | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Sara Golemon | 2014-06-11 | 1 | -0/+4 | |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.4: Fix potential segfault in dns_get_record() | |||||
| * | | Fix potential segfault in dns_get_record() | Sara Golemon | 2014-06-11 | 1 | -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.5 | Stanislav Malyshev | 2014-06-10 | 3 | -1/+28 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Conflicts: configure.in main/php_version.h |