summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* set versionsphp-7.1.6PHP-7.1.6Joe Watkins2017-06-071-2/+2
* set versions for 7.1.6RC1php-7.1.6RC1Joe Watkins2017-05-231-2/+2
* Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-05-161-2/+2
|\
| * Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)Xinchen Hui2017-05-161-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Jakub Zelenka2017-04-303-5/+13
|\ \ | |/
| * Fix compiler warnings when compiled against musl libcMichael Heimpold2017-04-303-5/+13
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-04-271-18/+11
|\ \ | |/
| * Revert "Detect invalid port in xp_socket parse ip address"Anatol Belski2017-04-271-18/+11
| * Revert "Follow up patch regarding bug #74216, see bug #74429"Anatol Belski2017-04-271-2/+2
| * move nextAnatol Belski2017-04-251-3/+3
* | bump version after releaseJoe Watkins2017-04-251-3/+3
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-04-251-2/+2
|\ \ | |/
| * Follow up patch regarding bug #74216, see bug #74429Sara Golemon2017-04-251-2/+2
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-04-221-1/+6
|\ \ | |/
| * #74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.cAnton Serbulov2017-04-221-1/+6
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-04-201-1/+1
|\ \ | |/
| * Update php_network.hAlexander Ilyin2017-04-201-1/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-103-7/+7
|\ \ | |/
| * Fixed condition checkXinchen Hui2017-04-103-7/+7
* | another placeXinchen Hui2017-04-101-1/+1
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-101-1/+1
|\ \ | |/
| * Fixed issue #2466 Invalid integer constant expression error in php.hXinchen Hui2017-04-101-1/+1
| * prepare nextAnatol Belski2017-03-281-3/+3
* | prepare nextJoe Watkins2017-03-281-3/+3
* | 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
|\ \ | |/
| * Detect invalid port in xp_socket parse ip addressSara Golemon2017-03-071-11/+18
| * 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
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-02-152-1/+5
|\ \ | |/
| * 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
|\ \ | |/
| * Fixed #73496 (Invalid memory access in zend_inline_hash_func)Xinchen Hui2017-02-121-3/+3
* | 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
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Sara Golemon2017-01-091-4/+4
| |\
| | * Fix open_basedir check for glob:// opendir wrapperSara Golemon2017-01-091-4/+4
| | * 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
| | * Merge branch 'PHP-5.6.27' into PHP-5.6Stanislav Malyshev2016-10-111-7/+8
| | |\