summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* set versionsphp-7.1.4Joe Watkins2017-04-111-2/+2
|
* set versionsphp-7.1.4RC1Joe Watkins2017-03-281-2/+2
|
* Merge branch 'PHP-7.0' into PHP-7.1Bob Weinand2017-03-141-0/+2
|\
| * Fix stream context changes leaking into copies of previous contextBob Weinand2017-03-141-0/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-03-071-11/+18
|\ \ | |/ | | | | | | * PHP-7.0: Detect invalid port in xp_socket parse ip address
| * Detect invalid port in xp_socket parse ip addressSara Golemon2017-03-071-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons, fsockopen() accepts the port and hostname separately: fsockopen('127.0.0.1', 80) However, with the introdcution of stream transports in PHP 4.3, it became possible to include the port in the hostname specifier: fsockopen('127.0.0.1:80') Or more formally: fsockopen('tcp://127.0.0.1:80') Confusing results when these two forms are combined, however. fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting to connect to '127.0.0.1:80:443' which any reasonable stack would consider invalid. Unfortunately, PHP parses the address looking for the first colon (with special handling for IPv6, don't worry) and calls atoi() from there. atoi() in turn, simply stops parsing at the first non-numeric character and returns the value so far. The end result is that the explicitly supplied port is treated as ignored garbage, rather than producing an error. This diff replaces atoi() with strtol() and inspects the stop character. If additional "garbage" of any kind is found, it fails and returns an error.
| * prepare nextAnatol Belski2017-02-281-3/+3
| |
* | prepare 7.1.4Joe Watkins2017-02-281-3/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-251-1/+1
|\ \ | |/
| * Improve fix for bug #73807Nikita Popov2017-02-251-1/+1
| | | | | | | | | | | | At least on some architectures memmove() on FreeBSD does not short-curcuit if src==dst. Check for it explicitly to avoid quadratic copying.
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-02-152-1/+5
|\ \ | |/ | | | | | | * PHP-7.0: Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
| * Fixed bug #74090 stream_get_contents maxlength>-1 returns empty stringAnatol Belski2017-02-152-1/+5
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-02-121-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Fixed #73496 (Invalid memory access in zend_inline_hash_func)
| * Fixed #73496 (Invalid memory access in zend_inline_hash_func)Xinchen Hui2017-02-121-3/+3
| | | | | | | | no test script is added because it requre too much memory
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-122-4/+7
|\ \ | |/
| * Fixed bug #69860Denis Yeldandi2017-02-122-4/+7
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-021-2/+8
|\ \ | |/
| * Fix bug #73807Nikita Popov2017-02-021-2/+8
| |
| * bump versions for next in devAnatol Belski2017-01-311-3/+3
| |
* | bump versionsJoe Watkins2017-01-311-3/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2017-01-091-4/+4
|\ \ | |/ | | | | | | * PHP-7.0: Fix open_basedir check for glob:// opendir wrapper
| * Merge branch 'PHP-5.6' into PHP-7.0Sara Golemon2017-01-091-4/+4
| |\ | | | | | | | | | | | | * PHP-5.6: Fix open_basedir check for glob:// opendir wrapper
| | * Fix open_basedir check for glob:// opendir wrapperSara Golemon2017-01-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | php_check_open_basedir() expects a local filesystem path, but we're handing it a `glob://...` URI instead. Move the check to after the path trim so that we're checking a meaningful pathspec.
| | * 5.6.31 is nextFerenc Kovacs2017-01-061-3/+3
| | |
| | * 5.6.30 will be nextFerenc Kovacs2016-11-241-3/+3
| | |
| | * 5.6.29 will be nextFerenc Kovacs2016-10-271-3/+3
| | |
| | * Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-111-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a userwrapper opener E_ERRORs then FG(user_stream_current_filename) would remain set until the next request and would not be pointing at unallocated memory. Catch the bailout, clear the variable, then continue bailing. Closes https://bugs.php.net/bug.php?id=73188
| | * Merge branch 'PHP-5.6.27' into PHP-5.6Stanislav Malyshev2016-10-111-7/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.27: Fix tests fix tsrm Fix bug #73284 - heap overflow in php_ereg_replace function Fix bug #73276 - crash in openssl_random_pseudo_bytes function Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML() fix bug #73275 - crash in openssl_encrypt function Fix for #73240 - Write out of bounds at number_format Bug #73218: add mitigation for ICU int overflow Add more locale length checks, due to ICU bugs. Fix bug #73208 - another missing length check Fix bug #73190: memcpy negative parameter _bc_new_num_ex Fix bug #73189 - Memcpy negative size parameter php_resolve_path Fixed bug #73174 - heap overflow in php_pcre_replace_impl Fix bug #73150: missing NULL check in dom_document_save_html Fix bug #73147: Use After Free in PHP7 unserialize() Fix bug #73082 Fix bug #73073 - CachingIterator null dereference when convert to string
| | | * Fix bug #73190: memcpy negative parameter _bc_new_num_exStanislav Malyshev2016-10-031-3/+3
| | | |
| | | * Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-09-281-7/+8
| | | |
| | * | 5.6.28 is nextFerenc Kovacs2016-09-291-3/+3
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-072-9/+16
|\ \ \ \ | |/ / /
| * | | Fixed bug #67583Nikita Popov2017-01-072-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | As fcgi_request is an opaque struct as of PHP 7, expose a new API function fcgi_end() which does fcgi_flush() with end=1 and checks/ sets the ->ended flag.
| * | | Rename fcgi_request.closed to .endedNikita Popov2017-01-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "closed" refers to whether FCGI_END_REQUEST has been sent, while the "close" operation does something entirely different. It gets extra confusing when fcgi_is_closed() does not actually return fcgi_request.closed...
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-071-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: add 'e' flag for fopen() to enable CLOEXEC
| * | | add 'e' flag for fopen() to enable CLOEXECEvgeniy Makhrov2017-01-071-0/+6
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-061-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.0: Increase realpath_cache_size default value add UPGRADING note for realpath_cache_size
| * | | updated default per proposalMarkus Staab2017-01-061-1/+1
| | | | | | | | | | | | | | | | TODO: adjust php.ini defaults
| * | | Increase realpath_cache_size default valueMarkus Staab2017-01-061-1/+1
| | | |
| * | | move dev to nextAnatol Belski2017-01-051-3/+3
| | | |
| * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0468-68/+68
| | | |
* | | | wrong versionJoe Watkins2017-01-051-1/+1
| | | |
* | | | bump version after releaseJoe Watkins2017-01-051-2/+2
| | | |
* | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0468-68/+68
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-011-3/+1
|\ \ \ \ | |/ / /
| * | | Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-3/+1
| | | | | | | | | | | | | | | | This allows us to unfork a bunch of tests for Windows.
| * | | move dev to nextAnatol Belski2016-11-221-3/+3
| | | |
| * | | move dev to 7.0.14Anatol Belski2016-10-251-3/+3
| | | |
| * | | Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-10-121-3/+4
| | | | | | | | | | | | | | | | (cherry picked from commit da7e89cde880c66887caacd0a3eae7ecdacf9b2a)
| * | | Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-111-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a userwrapper opener E_ERRORs then FG(user_stream_current_filename) would remain set until the next request and would not be pointing at unallocated memory. Catch the bailout, clear the variable, then continue bailing. Closes https://bugs.php.net/bug.php?id=73188
View Lorry Controller Status