1
0
mirror of https://github.com/php/php-src.git synced 2026-04-15 03:51:07 +02:00
Commit Graph

746 Commits

Author SHA1 Message Date
Jakub Zelenka
ab061f95ca Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) 2019-10-20 22:50:04 -07:00
Peter Kokot
113213f027 Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-15 04:29:24 +02:00
Peter Kokot
03f3b8479b Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-14 12:51:01 +02:00
Peter Kokot
7f6387b59a Trim trailing whitespace in source code files 2018-10-13 14:12:55 +02:00
Nikita Popov
69dee5c732 Fixed bug #73342
Directly listen on socket, instead of duping it to STDIN and
listening on that.
2018-06-20 12:28:15 +02:00
Jakub Zelenka
ea592e6b6c Rewrite FPM tests 2018-06-12 17:59:28 +01:00
Michał Górny
4ea7f3467d Support using acl_* functions on *BSD
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
2018-04-13 19:48:13 +01:00
Jakub Zelenka
0be5b9e6b0 Prevent modifying of getenv result 2018-03-30 17:20:19 +01:00
Jacob Hipps
008eb1461c 68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname size 2018-03-30 17:20:19 +01:00
Jacob Hipps
77bf9245d2 Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitting MAX_ARG_STRLEN with a large number of pools 2018-03-30 17:20:19 +01:00
Anatol Belski
6b39c81957 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
2018-03-27 14:20:10 +02:00
Jakub Zelenka
276d19feaa Do not set PR_SET_DUMPABLE by default 2018-03-27 14:19:36 +02:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Joe Watkins
d0cda9d0bd Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Typo in status.html
2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475 Typo in status.html
feet needs -> fit needs
2017-10-03 07:21:53 +01:00
Joe Watkins
b44484b912 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Update copyright year to 2017
2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Xinchen Hui
15dbe775d1 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix typo: exectute => execute
2017-05-09 11:01:52 +08:00
Andrew Marcinkevičius
abad134681 Fix typo: exectute => execute 2017-05-08 13:59:05 +03:00
Joe Watkins
46d0933668 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
2017-02-22 06:48:48 +00:00
Coenraad Loubser
9eaf551c86 pull-request/2393:
stop make install from clobbering default dot d configuration
2017-02-22 06:47:23 +00:00
Nikita Popov
6d5ea20e0b Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 00:06:35 +01:00
Denis Yeldandi
9814be4bc2 Fixed bug #69860 2017-02-12 00:06:04 +01:00
Jakub Zelenka
1dab39b9aa Merge branch 'PHP-7.0' into PHP-7.1 2017-01-29 20:44:51 +00:00
Jakub Zelenka
df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Joe Watkins
9aad38038e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
2017-01-23 16:56:08 +00:00
Michael Wallner
80a851b4dd Fix Bug #69865 php-fpm does not close stderr when using syslog 2017-01-23 16:55:15 +00:00
Antony Dovgal
9d7054693e use correct shift and fix slowlog bt in 7.1 2017-01-23 14:50:09 +03:00
Joe Watkins
19363de12f Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
2017-01-13 06:45:17 +00:00
Mitch Hagstrand
fd92b91188 Increase wait time for tests involving sockets to improve Travis relability
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
2017-01-13 06:45:04 +00: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
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
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
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
c370024c2c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix php-fpm.service.in
2017-01-05 06:54:37 +00:00
Joe Watkins
b037c43497 Merge branch 'pull-request/1256' into PHP-7.0
* pull-request/1256:
  Fix php-fpm.service.in
2017-01-05 06:54:19 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Christoph M. Becker
c20299ddc4 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-03 14:18:56 +01:00
Christoph M. Becker
a8ec79e27f Merge branch 'PHP-5.6' into PHP-7.0 2016-12-03 14:18:00 +01:00
Adrien Crivelli
cf2496140d Fix minor typo 2016-12-03 14:15:52 +01:00
Bob Weinand
110a6cc6c0 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 19:20:09 +01:00
Bob Weinand
bc30206b8a Revert "Revert "Remove a few unused write warning""
This reverts commit ff5a65d26b.

(With zend_ prefix now)
2016-11-20 19:18:50 +01:00
Nikita Popov
c58378619b Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 19:10:03 +01:00
Nikita Popov
ff5a65d26b Revert "Remove a few unused write warning (backport from master, oops)s"
This reverts commit c65d24eaa3.
2016-11-20 19:09:05 +01:00