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
Joe Watkins
e642375764
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed condition check
Fixed issue #2466 Invalid integer constant expression error in php.h
2017-04-10 08:07:24 +01:00
Joe Watkins
e24dcf97f1
Merge branch 'master' of git.php.net:/php-src
...
* 'master' 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:06:52 +01:00
Joe Watkins
5b013e7935
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:28 +01:00
Joe Watkins
c961beb5de
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:06:11 +01:00
Joe Watkins
60b68f19f0
Fixed bug #74400 (phpdbg comparing socket function to int)
2017-04-10 08:05:31 +01:00
Xinchen Hui
696bd37e67
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed condition check
Fixed condition check
another place
Conflicts:
ext/mcrypt/mcrypt.c
2017-04-10 14:49:13 +08:00
Xinchen Hui
9398f15efd
Fixed condition check
2017-04-10 14:48:31 +08:00
Xinchen Hui
65d77812fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed condition check
2017-04-10 14:47:42 +08:00
Xinchen Hui
4bebcb84ad
Fixed condition check
2017-04-10 14:47:24 +08:00
Anatol Belski
1459d5dc18
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix buffer overflow
2017-04-03 14:25:37 +02:00
Anatol Belski
2ec54af8df
fix buffer overflow
2017-04-03 14:22:23 +02:00
Thomas Punt
9f08aff3fd
Remove superfluous allocation checks around ZMM-based functions
2017-04-02 00:58:19 +02:00
Sara Golemon
2b86a89193
Update tests and add NEWS entry for phpdbg opcode dump change
2017-03-29 12:54:52 -07:00
Sara Golemon
764b529efd
Add extended_value to phpdbg opcode dump
2017-03-29 04:08:52 -07:00
Anatol Belski
0eb3c377d4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
update NEWS
update NEWS
Revert "Fixed bug #61471 "
2017-03-28 13:17:05 +02:00