php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,593 Commits 549 Branches 1,485 Tags
3b8dc330bfcb9449b61efa289730bf1efd3f26ab
Commit Graph

43737 Commits

Author SHA1 Message Date
Joe Watkins 3b8dc330bf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix FTP tests for Travis CI.
 2017-01-09 00:36:57 +00:00
Mitch Hagstrand 47007455dc Fix FTP tests for Travis CI. 
This suppresses the errors from stream_socket_server() until
server.inc will not make anymore attempts.
 2017-01-09 00:36:39 +00:00
Nikita Popov b38e6a54cf Merge branch 'PHP-7.0' into PHP-7.1 2017-01-08 13:48:48 +01:00
Nikita Popov b36f4ac708 deflate_add(): Don't add unnecessary +1 to size 
zend_string_realloc will do this by itself.
 2017-01-08 13:47:20 +01:00
Anatol Belski 43b92ed5a8 move various places to the centralized OpenSSL setup routine 2017-01-08 00:25:47 +01:00
Anatol Belski bf14ecc0d8 use the new API for opaque symbol in OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Anatol Belski df1e1fdcb9 implement basic config support for OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Nikita Popov ac46909162 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-08 00:02:33 +01:00
Nikita Popov ec1b7b933d Fix OOB read introduced by previous commit 
Ooops...
 2017-01-08 00:01:05 +01:00
Nikita Popov d48ff0f3f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-07 23:55:48 +01:00
Rowan Collins 5146d9f8ac http_fopen_wrapper.c - Handle HTTP headers with varying white space 
The stream handler assumed all HTTP headers contained exactly one space,
but the standard says there may be zero or more. Should fix Bug #47021,
and any other edge cases caused by a web server sending unusual spacing,
e.g. the MIME type discovered from Content-Type: can no longer contain
leading whitespace.

We strip trailing whitespace from the headers added into
$http_response_header as well.
 2017-01-07 23:54:57 +01:00
Joe Watkins 201e56cd04 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Adapts the readme to the new test-possibility
 2017-01-07 16:46:01 +00:00
Andreas Heigl fc777296bf Adapts the readme to the new test-possibility 
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
 2017-01-07 16:45:10 +00:00
Anatol Belski 901a551bda Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Implement github PR #1736
 2017-01-07 15:40:00 +01:00
Anatol Belski 486fc0424a Implement github PR #1736 
This fixes leak issues on *BSD systems, as described in the PR.
 2017-01-07 15:36:14 +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
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
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 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 0f410f8087 Fixed bug #73877 readlink() returns garbage for UTF-8 paths 2017-01-07 01:09:17 +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
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 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 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
Joe Watkins a49aaf9ab0 Merge branch 'pull-request/1430' into PHP-7.0 
* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430
 2017-01-06 05:39:48 +00:00
Christoph M. Becker e7ce861def Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:51:04 +01:00
Christoph M. Becker 995ecffbb2 Fix #70417: PharData::compress() doesn't close temp file 
According to the comment, it has not been deemed necessary to close compressed
files. However, we don't want to keep unclosed file handles to save ressources.
So we're also closing compressed archives, if they're not aliased.
 2017-01-05 14:12:31 +01:00
Nikita Popov 769e17ce9b Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05 11:38:17 +01:00
Nikita Popov 2022dacb99 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-05 11:38:05 +01:00