Jakub Zelenka
f86f3edeef
Migrate fpm_get_status test
2018-07-07 12:48:16 +01:00
Till Backhaus
140def4ac7
Implement fpm_get_status
2018-07-07 12:33:11 +01:00
Yousif Masoud
9a21aa77af
fixes typo in daemonization DEBUG message after fork: acknoledge -> acknowledge
2018-07-06 11:25:08 +02:00
Dmitry Stogov
169d454593
Use zval_ptr_dtor() imstead of zval_dtor()
2018-07-05 17:55:54 +03:00
Dmitry Stogov
b6fb584505
Replace zval_dtor() with specialized destructors
2018-07-05 13:32:39 +03:00
Remi Collet
0ea4013f10
Fixed bug #62596 add getallheaders (apache_request_headers) missing function in FPM add sapi_add_request_header in public API (was add_request_header) fix arginfo for fastcgi_finish_request fucntion
2018-07-05 06:30:58 +02:00
Dmitry Stogov
4a475a4976
Replace legacy zval_dtor() by zval_ptr_dtor_nogc() or even more specialized destructors.
...
zval_dtor() doesn't make a lot of sense in PHP-7.* and it's used incorrectly in some places.
Its occurances should be replaced by zval_ptr_dtor() or zval_ptr_dtor_nogc(), or even more specialized destructors.
2018-07-04 19:22:24 +03:00
Dmitry Stogov
091d77f28a
Avoid magic method hash lookups
2018-07-02 17:03:50 +03:00
Philip Prindeville
2475337bd8
Add syslog's ident and facility parameters to config
...
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-07-01 18:08:07 +01:00
Dmitry Stogov
dd932f7e63
Changed php_add[c]slashes prototypes (removed should_free argument)
2018-06-29 00:19:16 +03:00
Dmitry Stogov
716bbd3480
Remove duplicated code (keep destroy_zend_function() for compatibility)
2018-06-27 14:54:42 +03:00
Christoph M. Becker
0778359223
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix arginfo wrt. optional/required parameters
2018-06-25 11:57:25 +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
Christoph M. Becker
d169d06d30
Remove useless PHPDBG_* constants
...
The sole purpose of `PHPDBG_FILE`, `PHPDBG_METHOD`, `PHPDBG_LINENO` and
`PHPDBG_FUNC` has been to be passed as first argument to `phpdbg_break`.
However, this functions is replaced as of PHP 5.6.3 by
`phpdbg_break_file`, `phpdbg_break_method` and 'phpdbg_break_func`,
respectively. Therefore, we're finally removing the useless constants.
2018-06-25 11:42:54 +02:00
Nikita Popov
8e2f0824f7
Merge branch 'PHP-7.2'
2018-06-20 12:32:20 +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
Stanislav Malyshev
3346659f2a
Merge branch 'pull-request/3274'
...
* pull-request/3274:
Added const modifier
76363: added jsm extension to list of mime types
2018-06-19 16:50:16 -07:00
Robert Lu
ecc1a7c582
Fix bug #44217 : Output after stdout/stderr closed cause immediate exit with status 0
...
We exit with status 255 instead.
2018-06-19 12:15:33 +02:00
Peter Kokot
be49d61b19
Remove old SVN keywords substitutions
...
When the PHP source code was versioned in Subversion, there was
possible to substitute certain keywords such as $Id$ with revision
number, last change time and author name. Such approach is not used
in Git so this patch removes these outdated artifacts from source
code files.
2018-06-16 13:04:30 +02:00
Jakub Zelenka
1650e4669d
Merge branch 'PHP-7.2'
2018-06-12 18:11:20 +01: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
b2460c9ec2
Merge branch 'PHP-7.2'
2018-06-12 18:04:30 +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
pmukhin
57e72dc198
Added const modifier
2018-06-06 21:34:18 +07:00
pmukhin
48c954ca46
76363: added jsm extension to list of mime types
2018-06-06 21:04:42 +07:00
Dmitry Stogov
5eb1f92f31
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 16:27:12 +03:00
Anatol Belski
a551d75942
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix cli server test fails after recent AppVeyor image update
2018-05-18 13:41:14 +02: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
038a2e4756
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
2018-05-13 18:43:12 +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
31914a827e
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Allocate default ini values into persistent memory
2018-04-26 21:09:34 +01: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
d08f1c5f5b
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix memory leak when phpdbg fails to start up
2018-04-26 16:44:02 +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
Mark Seuffert
193c02875a
No Content-Type header if MIME type is unknown
2018-04-14 13:08:53 +02:00
Jakub Zelenka
b7b65fbc7b
Merge branch 'PHP-7.2'
2018-04-13 20:13:18 +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
6e8cce08f9
Merge branch 'PHP-7.2'
2018-04-10 16:57:49 -04: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
085999c16c
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Update NEWS
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
2018-04-10 16:33:51 +08: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
005f2a4676
Merge branch 'PHP-7.2'
2018-04-03 11:48:00 -04: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
6441b1bb31
Merge branch 'PHP-7.2'
2018-03-30 18:02:07 +01: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
Gabriel Caruso
a09c851ca9
Remove, or fix, unused variables
2018-03-27 22:04:26 +02:00
Anatol Belski
5e00c15b88
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Do not set PR_SET_DUMPABLE by default
Do not set PR_SET_DUMPABLE by default
2018-03-27 14:21:42 +02: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
Dmitry Stogov
fe6f092e5e
Fixed bug #75982 ($_SERVER mostly empty with default variables_order GPCS on FastCGI/CGI)
2018-03-23 15:17:10 +03:00
Dmitry Stogov
12baec3dfa
Move constant array into read-only memory
2018-03-14 11:35:31 +03:00
Gabriel Caruso
2bd7e2bb27
Fix link for phpdbg documentation
2018-03-11 16:37:40 +01:00
Anatol Belski
d047137d7e
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Disable PGO for phpdbg
2018-03-08 11:57:55 +01: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
George Wang
1777db1fdf
Merge branch 'PHP-7.2'
2018-02-27 23:34:01 -05:00
George Wang
66e3912f3a
Merge branch 'PHP-7.1' into PHP-7.2
2018-02-27 23:33:36 -05:00
George Wang
d4387fca0a
revert last change, for PHP7 no need to do strlen() + 1 for hash look up.
2018-02-27 23:31:43 -05:00
George Wang
17e49ba79a
Merge branch 'PHP-7.2'
2018-02-27 23:21:32 -05:00
George Wang
3af5722e11
Merge branch 'PHP-7.1' into PHP-7.2
2018-02-27 23:21:04 -05:00
George Wang
2b033607f3
[BUGFIX] calling php_ini_activate_per_host_config() with correct name length.
2018-02-27 23:18:51 -05:00
George Wang
2ec012fa2a
Merge branch 'PHP-7.2'
...
Conflicts:
sapi/litespeed/lsapi_main.c
2018-02-27 13:57:06 -05:00
George Wang
9607d15d7d
Merge branch 'PHP-7.1' into PHP-7.2
2018-02-27 13:56:19 -05:00
George Wang
97ff815cbb
release LiteSpeed SAPI 7.0.
...
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini
2018-02-27 13:54:28 -05:00
Gabriel Caruso
ded3d984c6
Use EXPECT instead of EXPECTF when possible
...
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Nikita Popov
b0af9ac733
Avoid live range references in opcodes
...
Don't store the live range of the freed variable for FREE_ON_RETURN
frees, instead look it up at runtime. As this is an extremely
unlikely codepath (in particular, it requires a loop variable with
a throwing destructor), saving the runtime lookup of the live range
is not worth the extra complexity this adds everywhere else.
2018-02-16 21:30:48 +01:00
Anatol Belski
abf5534113
Reduce var scope
2018-02-16 15:44:43 +01:00
Anatol Belski
535497cb97
Remove always true condition
2018-02-16 15:44:42 +01:00
Anatol Belski
7761c819bf
Simplify declaration
2018-02-16 15:44:42 +01:00
Tom Van Looy
7672f8be0b
Fix: follow the indent of the other configure options
2018-02-15 08:49:58 +01:00
Gabriel Caruso
21e3b0c70c
Remove trailing whitespace in inc files
2018-02-10 19:20:23 +01:00
Gabriel Caruso
2d48d734a2
Fix some misspellings
2018-02-06 16:59:00 +01:00
Dmitry Stogov
ca035f26aa
Moved "zval.u2.cache_slot" into free room of "zend_op"
2018-02-05 19:41:47 +03:00
Gabriel Caruso
fef879a2d6
Use bool instead of boolean while throwing a type error
...
PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".
This a followup to ce1d69a1f6
, which
implements the same change for integer->int.
2018-02-04 23:09:40 +01:00
Gabriel Caruso
ce1d69a1f6
Use int instead of integer in type errors
...
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Gabriel Caruso
affc20f891
Use bool instead of boolean in proto
2018-02-04 17:00:24 +01:00
Gabriel Caruso
84488d921b
Remove superfluous SKIPIF sections in more tests
2018-02-04 16:57:08 +01:00
Lee Hsun
4b19f710e1
Set max_requests to 0
...
The value will always be overwritten by fpm_run(), and the default
value there is 0 and not 500.
2018-02-03 16:15:12 +01:00
Gabriel Caruso
8034fdc9d9
Use int instead of integer in proto
2018-02-02 22:32:15 +01:00
Anatol Belski
bced074124
Fix race conditions with Apache vhost vs. per dir config
...
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
(cherry picked from commit 73eb5a78b9
)
2018-02-01 15:24:31 +01:00
Dmitry Stogov
ba298725d1
Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value)
2018-01-31 22:39:30 +03:00
Anatol Belski
3c6e1c2b81
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix race conditions with Apache vhost vs. per dir config
2018-01-31 20:26:20 +01:00
Anatol Belski
73eb5a78b9
Fix race conditions with Apache vhost vs. per dir config
...
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
2018-01-31 20:15:30 +01:00
motecshine
0e10bed83e
Remove double include of fpm_scoreboard.h
2018-01-15 12:22:04 +01:00