summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.5.15php-5.5.15PHP-5.5.15Julien Pauli2014-07-233-4/+4
|
* 5.5.15RC1php-5.5.15RC1Julien Pauli2014-07-083-4/+4
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-082-0/+4
|\ | | | | | | | | * PHP-5.4: Fix bug #67587: Redirection loop on nginx with FPM
| * Fix bug #67587: Redirection loop on nginx with FPMChristian Weiske2014-07-082-0/+4
| | | | | | | | | | | | | | | | 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;
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-07-080-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: updated NEWS
| * updated NEWSAnatol Belski2014-07-081-0/+2
| |
* | updated NEWSAnatol Belski2014-07-081-0/+2
| |
* | Backported the patch from bug #67407 into 5.5+Anatol Belski2014-07-081-4/+30
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-07-080-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: Backported the patch from bug #67407 into 5.4
| * Backported the patch from bug #67407 into 5.4Anatol Belski2014-07-081-1/+33
| |
* | NEWSRemi Collet2014-07-081-0/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-07-081-0/+4
|\ \ | |/ | | | | | | | | * PHP-5.4: NEWS Fix Bug #67530 error_log=syslog ignored
| * NEWSRemi Collet2014-07-081-0/+1
| |
| * Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-07-081-0/+4
| | | | | | | | | | As for Bug #64915 Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-07-073-4/+48
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| * Fixed bug #66830 (Empty header causes PHP built-in web server to hang).Adam Harvey2014-07-073-4/+48
| | | | | | | | | | | | | | | | We had an infinite loop in sapi_cli_server_send_headers(): while iterating over the linked list of headers, when an empty header was hit, continue would go to the next iteration of the loop without updating h to be the next value in the linked list. Updating it to always increment regardless of whether the header is actually valid or not fixes the issue.
* | create locales and re-add testStanislav Malyshev2014-07-073-0/+34
| |
* | rm test for nowStanislav Malyshev2014-07-071-25/+0
| |
* | 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
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-070-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: fix format
| * fix formatStanislav Malyshev2014-07-071-1/+1
| |
* | Fix bug #66921 - Wrong argument type hint for function ↵Stanislav Malyshev2014-07-073-3/+20
| | | | | | | | intltz_from_date_time_zone
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-074-1/+34
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
| * Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)Stanislav Malyshev2014-07-074-2/+35
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-07-062-2/+2
|\ \ | |/ | | | | | | | | * PHP-5.4: Make sure the generator script also creates a newline at the end of file Add newline at end of file to prevent compilation warning
| * Make sure the generator script also creates a newline at the end of fileLior Kaplan2014-07-061-1/+1
| | | | | | | | Similar to commit d6713f39 in master
| * Add newline at end of file to prevent compilation warningLior Kaplan2014-07-061-1/+1
| | | | | | | | The newline was removed at commit 50d50c2f
* | Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)Xinchen Hui2014-07-032-10/+9
| |
* | 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
* | Add CVE IDXinchen Hui2014-07-031-1/+1
| |
* | 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-022-1/+6
|\ \ | |/
| * Fix bug #67151: strtr with empty array crashesNikita Popov2014-07-022-0/+5
| |
* | Fix bug #67497: eval with parse error causes segfault in generatorNikita Popov2014-07-023-0/+22
| |
* | Fixed bug #67539 (ArrayIterator use-after-free due to object change during ↵Xinchen Hui2014-07-023-0/+24
| | | | | | | | sorting)
* | Fixed Bug #67538 (SPL Iterators use-after-free)Xinchen Hui2014-07-023-2/+25
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-07-021-1/+2
|\ \ | |/
| * bundle deplister.exe with releasesAnatol Belski2014-07-021-1/+2
| |
* | backported the VC12 fix for ARG_MAXAnatol Belski2014-07-021-3/+10
| |
* | 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-012-1/+5
|\ \ | |/ | | | | | | * PHP-5.4: Fix ext/pgsql builds with libpq < 7.3.
| * Fix ext/pgsql builds with libpq < 7.3.Adam Harvey2014-07-012-1/+5
| | | | | | | | Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
* | updated libs_version.txtAnatol Belski2014-07-011-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-07-010-0/+0
|\ \ | |/ | | | | | | * PHP-5.4: updated libs_version.txt
| * updated libs_version.txtAnatol Belski2014-07-011-1/+1
| |