mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
109,910 Commits 500 Branches 1,381 Tags 798 MiB
82f35ab089
Commit Graph

4881 Commits

Author SHA1 Message Date
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
Anatol Belski
50431d0820 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix invalid free
 2018-01-13 12:33:45 +01:00
Anatol Belski
1350f4f997 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix invalid free
 2018-01-13 12:33:02 +01:00
Anatol Belski
2503a27ae0 Fix invalid free 2018-01-13 12:32:22 +01:00
Nikita Popov
b942648771 Merge branch 'PHP-7.2' 2018-01-12 18:18:45 +01:00
Nikita Popov
f8c889760c Merge branch 'PHP-7.1' into PHP-7.2 2018-01-12 18:18:34 +01:00
Nikita Popov
9e98e99a3a Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)" 
This reverts commit 816758eda2.

After this commit relative router scripts were resolved against
docroot rather than shell cwd.
 2018-01-12 18:11:12 +01:00
Kalle Sommer Nielsen
1d0ac9819a Use PHP_WIN32 2018-01-04 08:14:41 +01:00
Gabriel Caruso
471da3eddc Trailing whitespaces on sapi/* 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-04 02:39:54 -02:00
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a76eeea736 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
 2018-01-03 16:02:15 +08:00
Xinchen Hui
0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Happy new year (Update copyright to 2018)
 2018-01-03 16:00:34 +08:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui
b65abecfdf regenerated with newer re2c 2018-01-02 13:54:29 +08:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Xinchen Hui
d6b2756da1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Updated NEWS
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
 2017-12-27 12:52:44 +08:00
Xinchen Hui
6693898b30 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
 2017-12-27 12:52:06 +08:00
Xinchen Hui
dc3822c343 Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry) 2017-12-27 12:51:50 +08:00
Sara Golemon
171ecbb8d1
Fix darwin builds of phpdbg using frameworks 2017-12-21 17:03:04 -05:00
Sebastian Ramadan
168c6cda8f Transmit phpdbg webdata len in little-endian 
Rather than using machine-endianness through a UB cast.
 2017-12-17 00:24:45 +01:00
Nikita Popov
abdece72c2 Merge branch 'PHP-7.2' 2017-12-16 17:21:06 +01:00
Nikita Popov
f01d5faf30 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-16 17:21:01 +01:00
David Carlier
14393b5fb3 Move includes in ps_title.c 
The HAVE_UNISTD_H check has to be after including config.h.

Also include sys/types.h, which may be needed for setproctitle.
 2017-12-16 17:20:05 +01:00
Dmitry Stogov
a7b6812ae6 Fixed stream handler override 2017-12-14 23:55:57 +03:00
Dmitry Stogov
83e495e0fd Move constants into read-only data segment 2017-12-14 22:14:36 +03:00
Dmitry Stogov
9e709e2fa0 Move constants into read-only data segment 2017-12-14 18:43:44 +03:00
Dmitry Stogov
c890d469fa Use array specific functions 2017-12-07 15:20:17 +03:00
Dmitry Stogov
7cc6f60134 Added "argv" and "argc" as known strings. 
Fixed incorrect "argc" update and corresponding phpdbg test.
 2017-12-01 01:35:47 +03:00
Anatol Belski
821bdbdfba Merge branch 'PHP-7.2' 
* PHP-7.2:
  Revert "Fix macro redefinition warnings"
 2017-11-30 13:23:18 +01:00
Anatol Belski
b6a27c7332 Revert "Fix macro redefinition warnings" 
This reverts commit 23d2bd3748.
 2017-11-30 13:21:04 +01:00
Anatol Belski
a415006b5e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix macro redefinition warnings
 2017-11-30 12:41:44 +01:00
Anatol Belski
23d2bd3748 Fix macro redefinition warnings 
The corresponding implementations are available from APR.
 2017-11-30 12:40:52 +01:00
Anatol Belski
a935ad927e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Follow up on bug #75574 for FCGI side
 2017-11-28 20:35:19 +01:00
Anatol Belski
0b30461764 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Follow up on bug #75574 for FCGI side
 2017-11-28 20:34:44 +01:00
Anatol Belski
8b57a5bca0 Follow up on bug #75574 for FCGI side 2017-11-28 20:33:11 +01:00
Anatol Belski
af55904f18 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #73830 Directory does not exist.
 2017-11-28 12:43:03 +01:00
Anatol Belski
79940993de Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73830 Directory does not exist.
 2017-11-28 12:42:40 +01:00
Anatol Belski
578049fdb6 Fixed bug #73830 Directory does not exist. 2017-11-28 12:41:49 +01:00
dcarlier
287a2b0184 fix constant defined undefined behavior warning 2017-11-24 19:01:46 +01:00
Sebastian Ramadan
7d5691cd69 Fix some printf() specifier usages 
Use PRIu32 when printing uint32_t.
Fix some %u/%d confusions.
Add some casts where types are not standardized.
 2017-11-21 22:50:27 +01:00
Nikita Popov
3ce1a977d4 Merge branch 'PHP-7.2' 2017-11-17 22:26:04 +01:00
Nikita Popov
1310234aa3 Fix printf format issues on i386 2017-11-17 22:25:03 +01:00
Nikita Popov
26f8fc833b Enable and fix printf() format warnings 
Add _unchecked() variants of zend_spprintf and zend_strpprintf for
cases where we specifically want to disable these checks, such as
use of %H.
 2017-11-16 21:15:36 +01:00
Anatol Belski
85021602ba Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fix bug 60471 by correctly identifying unused speculative preconnections
 2017-11-14 20:03:02 +01:00
Sammy Kaye Powers
3bc5c9f118 Fix bug 60471 by correctly identifying unused speculative preconnections 
* Correctly identify unused speculative preconnections from browsers
  like Chrome and Firefox
* Add a new message to the debug level that is emitted when a TCP
  connection is closed without sending any request (a preconnection)
* Fix an issue where the existing debug messages were not being
  displayed even when debug mode was enabled
 2017-11-14 20:00:45 +01:00
Xinchen Hui
266f19babb Added PCRE_JIT_SUPPORT flag 2017-11-14 11:02:16 +08:00
Anatol Belski
a5bc5aed71 Patch core for PCRE2 support 
RFC https://wiki.php.net/rfc/pcre2-migration
 2017-11-13 19:37:38 +01:00
Dmitry Stogov
bdf77f02f6 Allow creating $_SERVER from $_ENV, but not $_ENV from $_SERVER. 2017-11-13 18:24:43 +03:00
Dmitry Stogov
00fc9e80c6 Disable RC_DEBUG for FPM initialisation 2017-11-03 00:48:04 +03:00
Dmitry Stogov
749db50a36 Added exceptions for ZEND_RC_DEBUG 2017-11-02 14:40:28 +03:00
Dmitry Stogov
b59c9fb45b Added exceptions for ZEND_RC_DEBUG 2017-11-02 14:13:28 +03:00
Dmitry Stogov
8203a0668d Merge branch 'master' into rc_debug 
* master:
  Use per-request heap instead of system one
  Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
  Makrk persistent resources and references with GC_PERSISTENT flag
 2017-10-27 14:59:09 +03:00
Dmitry Stogov
cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Dmitry Stogov
49ea143bbd Encapsulate reference-counting primitives. 
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
 2017-10-27 01:28:58 +03:00
Rasmus Lerdorf
ad7ed6fe21 These tests all assume that IPV6 is available. 2017-10-25 02:21:16 +02:00
Peter Kokot
410ae4f596
Remove CHANGES from sapi/cgi 
All these changes are noted in the PHP manual instead that have been
removed.
 2017-10-19 11:51:09 +01:00
Xinchen Hui
77af496150 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:29:56 +08:00
Xinchen Hui
9f5ed133b3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:29:28 +08:00
Xinchen Hui
49702ad7fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:28:46 +08:00
Xinchen Hui
816758eda2 Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) 2017-10-15 10:28:28 +08:00
Dmitry Stogov
ef5ea48741 Always use IS_CONSTANT_AST (IS_CONSTANT is removed). 2017-10-10 10:11:05 +03:00
Peter Kokot
0646042d1f Remove unused Travis configuration for sapi/phpdbg 
The phpdbg sapi has been initially developed under the
github.com/krakjoe/krakjoe/phpdbg repository with its own Travis-CI.org
configuration. Since 2017-03-16 the main development is happening in the main
php-src repository.
 2017-10-08 14:44:16 +02:00
Dmitry Stogov
cb9d81ef4f Refactored recursion pretection 2017-10-06 01:34:50 +03:00
Peter Kokot
39ea632f74 Join untracked files to root .gitignore 2017-10-05 12:36:47 +02:00
Nikita Popov
47a86687e8 Merge branch 'PHP-7.2' 2017-10-05 12:26:32 +02:00
Nikita Popov
0e8ccb179d Merge branch 'PHP-7.1' into PHP-7.2 2017-10-05 12:26:19 +02:00
Nikita Popov
d34c8fa802 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-05 12:25:37 +02:00
Mathieu CARBONNEAUX
6b9ccda936 Fixed bug #75311 2017-10-05 12:24:57 +02:00
Dmitry Stogov
e70618aff6 Changed the way VM accesses constant operands in 64-bit builds. 2017-10-04 16:53:01 +03:00
Joe Watkins
17cf32ef45
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Typo in status.html
 2017-10-03 07:22:26 +01:00
Joe Watkins
6e39258302
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Typo in status.html
 2017-10-03 07:22:15 +01: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
b44c1e4d3a
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:21:02 +01:00
Joe Watkins
b0950ff854
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:46 +01:00
Joe Watkins
1981c48e60
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:34 +01:00
Peter Kokot
29e673f8ed
Fix CGI m4 config message when CGI is disabled 2017-09-27 06:20:09 +01:00
Joe Watkins
e1d9f33cbc
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75248 and #75251
 2017-09-27 06:16:38 +01:00
Joe Watkins
474ee702ab
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75248 and #75251
 2017-09-27 06:16:13 +01:00
Joe Watkins
af71942da2
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75248 and #75251
 2017-09-27 06:15:47 +01:00
Peter Kokot
6d0391b1a4
Fix bug #75248 and #75251 2017-09-27 06:15:12 +01:00
Peter Kokot
2664638f7e Remove empty and done TODO file for CLI SAPI 
[ci skip]
 2017-09-24 18:44:46 +02:00
Remi Collet
c26d8ecf58 Merge branch 'PHP-7.2' 
* PHP-7.2:
  rename test
 2017-09-19 07:27:04 +02:00
Remi Collet
ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet
ce59da1997 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed Bug #75212 php_value acts like php_admin_value
 2017-09-18 18:09:40 +02:00
Remi Collet
cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Anatol Belski
b81659d34f Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix the version check causing the test fail
 2017-09-18 12:07:12 +02:00
Anatol Belski
d8f1afb45e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the version check causing the test fail
 2017-09-18 12:06:54 +02:00
Anatol Belski
5c59dd0047 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the version check causing the test fail
 2017-09-18 12:06:23 +02:00
Anatol Belski
9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Remi Collet
1edc5aea33 Merge branch 'PHP-7.2' 
* PHP-7.2:
  fix tests for 32-bit
 2017-09-13 12:20:16 +02:00
Remi Collet
d99cd28925 fix tests for 32-bit 2017-09-13 12:20:05 +02:00
Anatol Belski
8e6619445f Fix test portability 2017-09-06 13:05:56 +02:00
Jansen Price
fafd67cb71
Add tests for sapi/cli option combinations 2017-09-06 09:54:00 +01:00
Nikita Popov
dfe030097d Merge branch 'PHP-7.2' 2017-09-05 18:14:21 +02:00
Nikita Popov
d78a7909c8 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 18:14:16 +02:00
Nikita Popov
0b69ce72b8 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 18:14:10 +02:00
Nikita Popov
42549b7844 Add missing null termination 2017-09-05 18:13:50 +02:00
Nikita Popov
1ca43597df Merge branch 'PHP-7.2' 2017-09-05 16:25:06 +02:00
Nikita Popov
9fbd8620fb Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 16:24:40 +02:00
Nikita Popov
e866e05b0d Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 16:24:21 +02:00
Bouke van der Bijl
cd9d90f4d4 Fixed bug #70470 2017-09-05 16:23:32 +02:00
Kalle Sommer Nielsen
d3bc8beb4f Removed support for BeOS, development for BeOS was supported 17 years ago. 
This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP

I intentionally left out some fragments for BeOS in the build system for that seems to be bundles
 2017-08-29 22:03:56 +02:00
Fabien Potencier
cbda84f87c Fixed typo in FPM error message 2017-08-23 22:16:47 +02:00
Patrick Allaert
21cd57e5f2 EXPECT instead of EXPECTF 2017-08-16 17:05:47 +02:00
Patrick Allaert
b34702c774 Fixed: tests not written to pass on Windows 2017-08-16 17:05:47 +02:00
Patrick Allaert
5e83fc4e49 cli_get_process_title() may not be empty before set 2017-08-16 17:05:47 +02:00
Patrick Allaert
ce09f485ca Not skipping test on Windows and test against CLI instead 2017-08-16 17:05:47 +02:00
Patrick Allaert
9f16c22ead Added: tests for cli_get_process_title / cli_set_process_title 2017-08-16 17:05:47 +02:00
Anatol Belski
93c2c56a1b Rework automatic interactive cli activation 
There are still systems delivering buggy console info. If a file was
passed, obviously no interaction is meant.
 2017-08-03 11:23:50 +02:00
Nikita Popov
042ff13ca9 Merge branch 'PHP-7.1' into PHP-7.2 2017-08-02 18:18:23 +02:00
Nikita Popov
9871555090 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:16:56 +02:00
George Wang
e78712791d take care of compile warnings. 2017-08-02 11:59:41 -04:00
Joe Watkins
515b396889
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +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
463413db53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 12:02:54 +08:00
Joe Watkins
8c238c15bc
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:52:43 +01:00
Joe Watkins
2e82ed9b73
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1
Fixed bug 74913 redirecting incorrect include <sys/poll.h> 2017-07-17 06:50:59 +01:00
Anatol Belski
8871d2d12e Fixed bug #74849 Process is started as interactive shell in PhpStorm 2017-07-03 21:59:31 +02:00
George Wang
79128b34ff Merge branch 'PHP-7.1' 2017-06-27 23:18:27 -04:00
George Wang
4e4f2f9f89 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-27 23:16:25 -04:00
George Wang
751d19f698 [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies. 
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
 2017-06-27 23:14:36 -04:00
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Richard Fussenegger
5fa1cd224b Fixed php_socket_t to int conversion 
This warning was about a possible loss of data due to the downcast of `php_socket_t` to `int`. The former maps to a platform specific type, hence, it might downcast from a 64 bit integer to a 32 bit intger.

Fixed possibly overflowing vars

Due to the change from `int` to `php_socket_t` some variables might overflow now. Changed all variables that might be affected.

Revert "Fixed possibly overflowing vars"

This reverts commit bf64fd5984.

Use aliased PHP socket type

Using the alias protects us from changes to the underlying type.

Removed ignored nfds argument

The `nfds` argument to the Win32 `select` function is always ignored, regardless of its actual value. Hence, we should not pass it in the first place. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx for reference.

Target value is not a pointer

Avoid overflow in loop
 2017-06-15 23:48:03 +02:00
Xinchen Hui
e33bc38e83 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:45 +08:00
Xinchen Hui
caf35c5cf5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:35 +08:00
Manuel Mausz
91f129ebf7 Add simple cli test for PATH/HOST ini sections 2017-06-09 23:28:19 +02:00
Dmitry Stogov
fc1ae1d1d3 Exclude warm-up requests from callgrind profile. 2017-05-31 16:16:56 +03:00
Remi Collet
37a16a32c9 missing fix for another test 2017-05-29 12:07:13 +02:00
Anatol Belski
38ee9f7c0d extend condition 2017-05-27 13:30:55 +02:00
Anatol Belski
e5c273dc0e Turn interactive mode on, if cli binary is clicked in filemanager 2017-05-25 21:04:56 +02:00
Sara Golemon
d316ba2d65 Remove user=foo from FPM test config 
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
 2017-05-24 15:07:24 -07:00
Sara Golemon
d8d1c78ed0 Skip FPM tests when running as root (unless requested) 
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.

Extend that logic into the test runner so that
we don't fail for stupid reasons.

If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
 2017-05-24 13:58:18 -07:00
Xinchen Hui
23ea38d8f7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added cleanup
 2017-05-17 23:25:34 +08:00
Xinchen Hui
78b10dd9d6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added cleanup
 2017-05-17 23:25:17 +08:00
Xinchen Hui
0954ea8d6d Added cleanup 2017-05-17 23:24:58 +08:00
Xinchen Hui
af0c443dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added test for bug #74600
 2017-05-17 23:21:42 +08:00
Xinchen Hui
f38487a0e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for bug #74600
 2017-05-17 23:21:38 +08:00
Xinchen Hui
ef09bc0645 Added test for bug #74600 2017-05-17 23:21:18 +08:00
Dmitry Stogov
6f6ad066ea Merge branch 'hybrid-vm' 
* hybrid-vm:
  Cleanup
  Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
  Added missing ZEND_VM_HOT define
  Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
 2017-05-09 09:38:34 +03:00
Xinchen Hui
282d09a740 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix typo: exectute => execute
 2017-05-09 11:02:02 +08: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
Dmitry Stogov
27e01cd918 Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs. 2017-05-03 10:01:22 +03:00
Sammy Kaye Powers
fd0e71d001 Fix bug 60471 by correctly identifying unused speculative preconnections 
* Correctly identify unused speculative preconnections from browsers
  like Chrome and Firefox
* Add a new message to the debug level that is emitted when a TCP
  connection is closed without sending any request (a preconnection)
* Fix an issue where the existing debug messages were not being
  displayed even when debug mode was enabled
 2017-04-11 15:08:05 -07:00
Joe Watkins
68b312db7d
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:52 +01:00