Commit Graph

99595 Commits

Author SHA1 Message Date
Joe Watkins
c39f71ba9f
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed #72974 imap is undefined service on AIX
2017-01-09 05:15:34 +00:00
Joe Watkins
b8215c0817
Fixed #72974 imap is undefined service on AIX 2017-01-09 05:15:21 +00:00
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
Anatol Belski
d454730407 improve and generalize the recognition of a cli sapi 2017-01-08 23:54:58 +01:00
Joe Watkins
c846daef28
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Use proper file extension for the README
2017-01-08 21:05:24 +00:00
Markus Staab
5b5483dc8e
Use proper file extension for the README 2017-01-08 21:05:06 +00:00
Joe Watkins
230b387e8a
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix 404 links in Litespeed README - Bug 73890
2017-01-08 20:28:05 +00:00
Peter Kokot
7f1247004e
Fix 404 links in Litespeed README - Bug 73890 2017-01-08 20:27:48 +00:00
Anatol Belski
9a4a023771 update NEWS 2017-01-08 20:13:27 +01:00
Anatol Belski
1aa792b44b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2017-01-08 20:12:53 +01:00
Anatol Belski
c75287dc85 update NEWS 2017-01-08 20:11:02 +01:00
Joe Watkins
8961c78524
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  improve FPM tests (mostly for systemd build)
2017-01-08 19:03:10 +00:00
Remi Collet
eb02876e74
improve FPM tests (mostly for systemd build) 2017-01-08 19:02:50 +00:00
Anatol Belski
1f22daeb0f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  [ast] Fix exporting **= in expansion of assign op
2017-01-08 18:54:28 +01:00
Sara Golemon
5df97b339e [ast] Fix exporting **= in expansion of assign op
(cherry picked from commit 9c3865eb6a)
2017-01-08 18:43:47 +01: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
329d487e68 update NEWS 2017-01-08 01:22:00 +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
Nikita Popov
bb2ab75555 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-07 22:54:16 +01:00
Nikita Popov
a46bbdda2e Fixed bug #67583
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.
2017-01-07 22:53:28 +01:00
Nikita Popov
f346bd6ee6 Rename fcgi_request.closed to .ended
"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...
2017-01-07 22:45:19 +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
Joe Watkins
2cb8950cc2
Merge branch '1391' into PHP-7.0
* 1391:
  Adapts the readme to the new test-possibility
2017-01-07 16:45:33 +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
Anatol Belski
2fed175780 update UPGRADING 2017-01-07 12:46:45 +01:00
Anatol Belski
9845155aa2 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix wrong version
  extend UPGRADING
2017-01-07 12:44:56 +01:00
Anatol Belski
80a5ae4f53 fix wrong version 2017-01-07 12:43:56 +01:00
Anatol Belski
49a0c166f3 extend UPGRADING 2017-01-07 12:43:19 +01:00
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