summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* prepare for 5.6.15php-5.6.15PHP-5.6.15Ferenc Kovacs2015-10-291-2/+2
|
* PHP 5.6.15RC1php-5.6.15RC1Ferenc Kovacs2015-10-151-2/+2
|
* prepare for PHP-5.6.14RC1Ferenc Kovacs2015-09-171-3/+3
|
* 5.6.14 nextFerenc Kovacs2015-08-201-3/+3
|
* Fixed bug #70198 Checking liveness does not work as expectedAnatol Belski2015-08-111-1/+11
|
* Fix #69487: SAPI may truncate POST dataChristoph M. Becker2015-08-111-1/+6
| | | | | | | If SG(request_info).request_body can't be completely written (e.g. due to a full drive), only parts of the POST data will be available. This patch changes this, so that SG(request_info).request_body will be reset in this case, and a warning will be thrown.
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-07-281-1/+9
|\ | | | | | | | | * PHP-5.5: Fixed bug #70002 TS issues with temporary dir handling
| * Fixed bug #70002 TS issues with temporary dir handlingAnatol Belski2015-07-281-1/+9
| |
| * 5.5.27 releaseJulien Pauli2015-07-081-1/+1
| |
| * 5.5.28 now - Security OnlyJulien Pauli2015-06-241-2/+2
| |
| * 5.5.27 nowJulien Pauli2015-06-091-3/+3
| |
* | Fixed bug #69900 Too long timeout on pipesAnatol Belski2015-07-281-3/+3
| |
* | 5.6.13 nowJulien Pauli2015-07-221-3/+3
| |
* | 5.6.12 nextFerenc Kovacs2015-06-251-3/+3
| |
* | move to 5.6.11-devFerenc Kovacs2015-05-281-3/+3
| |
* | increase the internal post data bufferAnatol Belski2015-05-231-3/+9
| | | | | | | | | | This brings speedup and fixes issues with var parsing. Default BUFSIZ on Windows is 512 bytes which causes too much reallocation work.
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-121-24/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/standard/pack.c
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-121-24/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/pack.c ext/standard/tests/dir/opendir_variation1-win32.phpt
| | * Fixed bug #69364 - use smart_str to assemble stringsStanislav Malyshev2015-05-091-24/+27
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-05-122-11/+11
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix for #66048
| * | Fix for #66048Julien Pauli2015-05-122-11/+11
| | |
| * | 5.5.26 nowJulien Pauli2015-04-291-3/+3
| | |
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-04-141-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix type in fix for #69085 fix CVE num Conflicts: configure.in main/php_version.h
| | * 5.4.41 nextStanislav Malyshev2015-04-141-3/+3
| | |
| | * 5.4.40 nextStanislav Malyshev2015-03-171-3/+3
| | |
| | * 5.4.39 nextStanislav Malyshev2015-02-171-3/+3
| | |
| * | 5.5.24RC1php-5.5.24RC1Julien Pauli2015-03-311-2/+2
| | |
* | | 5.6.10 will be nextFerenc Kovacs2015-04-301-3/+3
| | |
* | | 5.6.9 is up nextFerenc Kovacs2015-04-011-3/+3
| | |
* | | oops, no idea how this got inStanislav Malyshev2015-03-171-3/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-171-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Fix bug #69248 - heap overflow vulnerability in regcomp.c add test for bug #68976
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-081-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: added missing parentheses Fix #67626 Fix #63486 Conflicts: main/streams/userspace.c
| * | Merge branch 'pull-request/1106' into PHP-5.5Stanislav Malyshev2015-03-081-1/+11
| |\ \ | | | | | | | | | | | | | | | | * pull-request/1106: Fix #67626
| | * | Fix #67626Julien Pauli2015-02-201-1/+11
| | | |
| * | | 5.5.24 nowJulien Pauli2015-03-051-3/+3
| | | |
* | | | Fix #67626Julien Pauli2015-03-081-1/+11
| | | |
* | | | Fixed bug (#69195 Inconsistent stream crypto values across versions)Daniel Lowrey2015-03-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.6.0 altered the semantics of the following constants: - STREAM_CRYPTO_METHOD_SSLv23_CLIENT - STREAM_CRYPTO_METHOD_SSLv23_SERVER - STREAM_CRYPTO_METHOD_TLS_CLIENT - STREAM_CRYPTO_METHOD_TLS_SERVER Instead of representing the SSLv23_*() handshake methods the v23 constants were changed to allow only SSLv2 or SSLv3 connections. Likewise, the TLS methods were modified from using only the TLSv1 handshake to allowing TLS1,1.1, and 1.2. This created a situation in which users upgrading from previous versions faced a potential security degradation if they did not update code to use different constants. In the interest of compatibility across PHP versions the original semantics have been restored with the following caveat: **IMPORTANT** The SSLv23 client/server methods will no longer negotiate the use of the insecure SSLv2 or SSLv3 protocols by default. Users wishing to allow these protocols must explicitly add them to the method bitmask via the appropriate flags.
* | | | Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-052-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* | | | 5.6.8 up nextFerenc Kovacs2015-03-051-3/+3
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Reeze Xia2015-03-031-10/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Improve fix for bug 67741 Added type checks Added type checks
| * | | Improve fix for bug 67741Reeze Xia2015-03-031-10/+12
| | | | | | | | | | | | | | | | Thanks to laruence.
| * | | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
| | | | | | | | | | | | | | | | This also fixes bug #54081
* | | | Fixed bug #67741 (auto_prepend_file messes up __LINE__)Reeze Xia2015-03-031-1/+14
| | | | | | | | | | | | | | | | This also fixes bug #54081
* | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-2/+1
|\ \ \ \ | |/ / /
| * | | ReorderXinchen Hui2015-02-271-2/+1
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-271-0/+5
|\ \ \ \ | |/ / /
| * | | Fixed bug #69121 (Segfault in get_current_user when script owner is not in ↵Xinchen Hui2015-02-271-0/+5
| | | | | | | | | | | | | | | | passwd with ZTS build)
| * | | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
| |/ / | | | | | | | | | | | | We can't always efree here php_escape_html_entities can return an interned_empty_string
* | | Fix bug #68166Rasmus Lerdorf2015-02-221-1/+1
| | | | | | | | | | | | | | | We can't always efree here php_escape_html_entities can return an interned_empty_string
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2015-02-181-11/+12
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)