Peter Kokot
902d39a3a7
Trim trailing whitespace in source code files
2018-10-13 14:14:50 +02:00
Christoph M. Becker
879c937a27
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #76954 : apache_response_headers removes last character from header name
2018-10-08 12:30:45 +02:00
stodorovic
47b89bc531
Fix #76954 : apache_response_headers removes last character from header name
2018-10-08 12:29:31 +02:00
Anatol Belski
b8cfa09657
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Avoid code duplication and don't miss env restore
2018-10-03 14:34:08 +02:00
Anatol Belski
044eb39e63
Avoid code duplication and don't miss env restore
2018-10-03 14:32:52 +02:00
Anatol Belski
dc48e01a19
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:13:22 +02:00
Anatol Belski
b0547a3dfb
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:11:43 +02:00
Nikita Popov
56d1578515
Merge branch 'PHP-7.1' into PHP-7.2
2018-09-30 20:07:44 +02:00
Nikita Popov
db80e0e2ad
Fixed bug #75479
...
Wrap the zend_signal_init() call, so the hook arguments line up.
2018-09-30 20:07:15 +02:00
Stanislav Malyshev
788717d56d
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fix for bug #76582
2018-09-09 12:29:29 -07:00
Stanislav Malyshev
6623f3caca
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update NEWS
Fix for bug #76582
2018-09-09 12:29:23 -07:00
Stanislav Malyshev
024f3ac160
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS
Fix for bug #76582
2018-09-09 12:27:44 -07:00
Stanislav Malyshev
23b057742e
Fix for bug #76582
...
The brigade seems to end up in a messed up state if something fails
in shutdown, so we clean it up.
2018-09-09 11:45:14 -07:00
Remi Collet
2cdde35d0f
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
fix man page installation
2018-08-16 06:54:57 +02:00
Remi Collet
1f2f2c6b96
fix man page installation
...
Since 91996e7ee5
phpdbg.1 is in buildir, not in srcdir
2018-08-16 06:53:56 +02:00
Peter Kokot
9286681bac
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug 76595: Update phpdbg man page
2018-08-04 06:35:40 +02:00
Kevin Abel
91996e7ee5
Fix bug 76595: Update phpdbg man page
...
Send phpdbg.1 man page through configure replacements
Update phpdbg.1 man page to include all options
Fixes formatting to be more consistent with php.1
Fix paragraph whitespace and ignore phpdbg.1
2018-08-04 06:34:40 +02:00
Christoph M. Becker
2458dab466
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix arginfo wrt. optional/required parameters
2018-06-25 11:54:45 +02:00
Christoph M. Becker
6b5597f7d8
Fix arginfo wrt. optional/required parameters
...
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required. We mark them as such.
2018-06-25 11:52:17 +02:00
Nikita Popov
44f4d2be01
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-20 12:30:19 +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
dd622f9ca9
Port FPM test 023 and 024 to the new FPM testing
2018-06-12 18:09:27 +01:00
Jakub Zelenka
bc58ba750f
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-12 18:03:01 +01:00
Jakub Zelenka
ea592e6b6c
Rewrite FPM tests
2018-06-12 17:59:28 +01:00
Anatol Belski
a8422edced
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix cli server test fails after recent AppVeyor image update
2018-05-18 13:40:42 +02:00
Anatol Belski
ee0ca6470d
Fix cli server test fails after recent AppVeyor image update
2018-05-18 13:38:53 +02:00
Anatol Belski
398204ace9
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
2018-05-13 18:42:36 +02:00
Anatol Belski
ad787626a4
Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
2018-05-13 18:40:32 +02:00
Thomas Punt
972c4869a7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Allocate default ini values into persistent memory
2018-04-26 21:09:08 +01:00
Thomas Punt
2513da4b4c
Allocate default ini values into persistent memory
2018-04-26 21:08:19 +01:00
Thomas Punt
b3fff5fc41
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix memory leak when phpdbg fails to start up
2018-04-26 16:42:21 +01:00
Thomas Punt
435e812c09
Fix memory leak when phpdbg fails to start up
2018-04-26 16:39:52 +01:00
Jakub Zelenka
4302c0b542
Merge branch 'PHP-7.1' into PHP-7.2
2018-04-13 20:12:03 +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
George Wang
043ac320a0
Merge branch 'PHP-7.1' into PHP-7.2
2018-04-10 16:49:29 -04:00
George Wang
5b529bbc94
Updated LiteSpeed SAPI to 7.1 .
2018-04-10 16:48:04 -04:00
Xinchen Hui
474895915e
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
2018-04-10 16:32:28 +08:00
Xinchen Hui
8cfb648761
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
2018-04-10 16:32:08 +08:00
George Wang
1e1695e8de
Merge branch 'PHP-7.1' into PHP-7.2
2018-04-03 11:47:41 -04:00
George Wang
37e1d7c776
[BUGFIX] allow php_admin_value to override value set in php.ini without restriction, like adding an extra directory to open_basedir.
2018-04-03 11:46:24 -04:00
Jakub Zelenka
8b642af484
Merge branch 'PHP-7.1' into PHP-7.2
2018-03-30 17:58:29 +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
600b6277f8
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Do not set PR_SET_DUMPABLE by default
Do not set PR_SET_DUMPABLE by default
2018-03-27 14:20:53 +02: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
Jakub Zelenka
d20bebfe13
Do not set PR_SET_DUMPABLE by default
2018-03-27 14:18:01 +02:00
Anatol Belski
d1ed6b1b15
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Disable PGO for phpdbg
2018-03-08 11:49:25 +01:00
Anatol Belski
34b9f9dedf
Disable PGO for phpdbg
...
For executable files, the linker seems to have issues dealing with the
empty profiling database. As PGO is unlikely to bring any benefit in
this case, the easiest is to disable it.
2018-03-08 11:48:37 +01:00