summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Remove superfluous allocation checks around ZMM-based functionsThomas Punt2017-04-021-19/+0
* use extra flag to turn on php implementationsAnatol Belski2017-03-193-2/+4
* define corresponding config macros, as we already trick symbolsAnatol Belski2017-03-191-0/+2
* Remove more unnecessary checks on Zend's allocator functionsThomas Punt2017-03-163-26/+9
* Merge branch 'PHP-7.1'Bob Weinand2017-03-141-0/+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.1'Sara Golemon2017-03-071-11/+18
|\ \ \ | |/ /
| * | 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
* | | Interned strings unification for TS/NTSAnatol Belski2017-03-042-6/+13
* | | Merge branch 'PHP-7.1'Nikita Popov2017-02-251-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-251-1/+1
| |\ \ | | |/
| | * Improve fix for bug #73807Nikita Popov2017-02-251-1/+1
* | | Fix PHP_OS_FAMILY for Linux (Joe)Kalle Sommer Nielsen2017-02-221-0/+2
* | | Change PHP_OS_FAMILY slightlyKalle Sommer Nielsen2017-02-222-19/+16
* | | Merge branch 'PHP-7.1'Anatol Belski2017-02-152-1/+5
|\ \ \ | |/ /
| * | 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
* | | refactor php_win32_get_random_bytes(), take 2Anatol Belski2017-02-121-2/+5
* | | Merge branch 'PHP-7.1'Xinchen Hui2017-02-121-1/+1
|\ \ \ | |/ /
| * | 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.1'Nikita Popov2017-02-122-4/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-122-4/+7
| |\ \ | | |/
| | * Fixed bug #69860Denis Yeldandi2017-02-122-4/+7
* | | Revert "refactor php_win32_get_random_bytes()"Anatol Belski2017-02-111-5/+2
* | | refactor php_win32_get_random_bytes()Anatol Belski2017-02-111-2/+5
* | | Revert "move winsock specific stuff into dllmain"Anatol Belski2017-02-111-0/+17
* | | move winsock specific stuff into dllmainAnatol Belski2017-02-111-17/+0
* | | Fixed bug #74053 (Corrupted class entries on shutdown when a destructor spawn...Dmitry Stogov2017-02-101-0/+2
|\ \ \
| * | | Added EG(flags) - executor global flagsJim Zubov2017-02-091-0/+2
|/ / /
* | | Deprecate track_errors / $php_errormsgNikita Popov2017-02-031-1/+2
* | | Arguments array can't make cyclesDmitry Stogov2017-02-031-1/+1
* | | Merge branch 'PHP-7.1'Nikita Popov2017-02-021-2/+8
|\ \ \ | |/ /
| * | 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
* | | Use modern autotools name of configure.ac instead of configure.inBrian Evans2017-01-271-1/+1
* | | add PHP_OS_FAMILY constant to determine on which os we areStricted2017-01-251-1/+17
* | | Enable HT RC assertions with escape-hatchNikita Popov2017-01-231-0/+5
* | | Merge branch 'PHP-7.1'Sara Golemon2017-01-091-4/+4
|\ \ \ | |/ /
| * | 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