php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,557 Commits 549 Branches 1,485 Tags
bba09d56e597db1dc136c798fec3392aec71518e
Commit Graph

99557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski bba09d56e5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add 'e' flag for fopen() to enable CLOEXEC
 2017-01-07 12:36:09 +01:00
Evgeniy Makhrov d0279242ce add 'e' flag for fopen() to enable CLOEXEC 2017-01-07 12:10:51 +01:00
Joe Watkins 5ae45ef993 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:15:15 +00:00
Joe Watkins b351ec8baf Merge branch 'pull-request/2283' into PHP-7.0 
* pull-request/2283:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:14:36 +00:00
Leigh 21f287915c Remove superfluous variable reinit 2017-01-07 09:43:05 +00:00
Joe Watkins 58273f631b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  PR #2211 don't supress warnings in tests
 2017-01-07 08:08:09 +00:00
Joe Watkins 574f7bc3d4 Merge branch '2211' into PHP-7.0 
* pull-request/2211:
  PR #2211 don't supress warnings in DOM tests
 2017-01-07 08:07:17 +00:00
Craig Duncan 98c2cd4311 PR #2211 don't supress warnings in tests 2017-01-07 08:06:38 +00:00
Joe Watkins f60ebd13b3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixes for session and fpm tests in PHP7.0 branch
 2017-01-07 07:10:46 +00:00
Joe Watkins 41c1d0291c Merge branch 'pull-request/2284' into PHP-7.0 
* pull-request/2284:
  Fixes for session and fpm tests in PHP7.0 branch
 2017-01-07 07:10:23 +00:00
Mitch Hagstrand 3401f553b9 Fixes for session and fpm tests in PHP7.0 branch 
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
 2017-01-06 19:55:57 -08:00
Anatol Belski 22ed374c9a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  /guard is also a security flag
 2017-01-07 02:48:14 +01:00
Anatol Belski f98d8f6c15 /guard is also a security flag 2017-01-07 02:25:00 +01:00
Anatol Belski f7bb3b5cbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
 2017-01-07 02:05:37 +01:00
Mitch Hagstrand 4568618030 Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1 
This reverts commit e55e93a1e3.
This change should only apply to master. Not PHP-7.0 or PHP-7.1
 2017-01-07 02:04:03 +01:00
Anatol Belski b716a1fbef fix edge case leak 2017-01-07 01:15:49 +01:00
Anatol Belski 0f410f8087 Fixed bug #73877 readlink() returns garbage for UTF-8 paths 2017-01-07 01:09:17 +01:00
Anatol Belski f8518ba1a1 fix typo 2017-01-06 18:55:12 +01:00
Anatol Belski 043d10c345 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix typo
 2017-01-06 18:54:50 +01:00
Anatol Belski 71e84e2c36 fix typo 2017-01-06 18:53:30 +01:00
Anatol Belski dccfd8ee18 update NEWS and UPGRADING 2017-01-06 18:39:47 +01:00
Anatol Belski 841689cafe Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS and UPGRADING
 2017-01-06 18:37:50 +01:00
Anatol Belski 1516132167 update NEWS and UPGRADING 2017-01-06 18:32:33 +01:00
Anatol Belski 847e1f97da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Return integer field types as native integers instead of strings
 2017-01-06 18:12:52 +01:00
Dorin Marcoci 826122fa8e Return integer field types as native integers instead of strings 
Use another define for better compatibility

Test case for #72583 Feature. Small optimisations.

Adjust conditional directives according to coding standards

Add more compatibility for "end of line" on multiple environements

Updated execute.phpt test after switching to integer mapping
 2017-01-06 17:43:46 +01:00
Joe Watkins c50f61b9b0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Test request47456.phpt for PR 1303
 2017-01-06 16:22:58 +00:00
Mitch Hagstrand e55e93a1e3 Test request47456.phpt for PR 1303 
After merging PR 1303 unmatched subpatterns are set to NULL
 2017-01-06 16:22:11 +00:00
Joe Watkins 699ab98f9d fix build broken by #2124 2017-01-06 16:18:24 +00:00
Joe Watkins 46c800948e fix acinclude, messed up by bad merge #2124 2017-01-06 16:13:21 +00:00
Joe Watkins 91cf3269c2 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fix #70103: Fix bug 70103 when ZTS is enabled
 2017-01-06 16:07:12 +00:00
Joe Watkins e114e94c5f fix broken build scripts #2124 2017-01-06 16:06:48 +00:00
Leigh 62e9e1fecd Some commentary, change free method 2017-01-06 15:49:15 +00:00
Leigh 9a0dac124e Conditionally free depending on how assignment happened 2017-01-06 15:24:37 +00:00
Leigh 053b966134 Fix memleaks from #1755 and some pre-existing ones 2017-01-06 14:58:54 +00:00
Christoph M. Becker cc75e8bca5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70103: Fix bug 70103 when ZTS is enabled
 2017-01-06 15:44:31 +01:00
Mitch Hagstrand ad08aa3956 Fix #70103: Fix bug 70103 when ZTS is enabled 
Used snprintf to copy the basename string before it is freed
 2017-01-06 15:26:17 +01:00
Joe Watkins ec0daf7913 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use AX_CHECK_COMPILE_FLAG macro to check for -fvisibility=hidden
 2017-01-06 08:14:29 +00:00
Joe Watkins ba0751a915 Merge branch 'pull-request/1809' 
* pull-request/1809:
  test for function curl_multi_info_read();
 2017-01-06 08:06:38 +00:00
Joe Watkins 3d50172e9e Merge branch 'pull-request/1809' 
* pull-request/1809:
  test for function curl_multi_info_read();
 2017-01-06 08:06:10 +00:00
Joe Watkins 2d42423953 Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:43:59 +00:00
Joe Watkins 0884cffb67 Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:42:57 +00:00
Joe Watkins 1c40eaaee4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add stream_socket_sendto test from PR #1804
 2017-01-06 07:28:56 +00:00
Joe Watkins 3a79f35fdc add stream_socket_sendto test from PR #1804 2017-01-06 07:27:31 +00:00
Joe Watkins e86d355c4c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled
 2017-01-06 06:58:56 +00:00
Joe Watkins ff6b309c6f Merge branch 'pull-request/1588' into PHP-7.0 
* pull-request/1588:
  Fixed #69442 closing of fd incorrect when PTS enabled
 2017-01-06 06:56:50 +00:00
Joe Watkins 811dfaa57b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #69582 session not readable by root in CLI
 2017-01-06 06:07:17 +00:00
Joe Watkins b0ff9ee688 Merge branch 'pull-request/1360' into PHP-7.0 
* pull-request/1360:
  Fixed bug #69582 session not readable by root in CLI
  news entry for PR #1360
 2017-01-06 06:05:17 +00:00
Joe Watkins de3649e2a3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix inappropriate warning in FPM log
 2017-01-06 05:55:14 +00:00
Joe Watkins 6a03b43e5f Merge branch 'pull-request/1311' into PHP-7.0 
* pull-request/1311:
  fix inappropriate warning in FPM log
 2017-01-06 05:54:42 +00:00
Joe Watkins 3f89aec716 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
 2017-01-06 05:40:41 +00:00