clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 22:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,691 Commits 494 Branches 1,367 Tags 790 MiB
19e80ef496
Commit Graph

1129 Commits

Author SHA1 Message Date
Anatol Belski
bd0569e287 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix AppVeyor failures with Opcache enabled
 2017-01-15 21:18:48 +01:00
Anatol Belski
4f19bb7af6 fix AppVeyor failures with Opcache enabled 
opcache_reset() only schedules the restart. Under circumstances,
the follow up requests might run uncached, until the restart
condition is met. To mitigate the false positives caused by this
behavior, any tests using opcache_reset() should not be put in
between other tests. Thus, moving the corresponding test to be
executed last.
 2017-01-15 21:13:15 +01:00
Joe Watkins
687b02789e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for "opcache: print restart reason" to basic_logging.phpt
 2017-01-14 07:33:08 +00:00
Mitch Hagstrand
fbf655afbd
Added test for "opcache: print restart reason" to basic_logging.phpt 2017-01-14 07:32:55 +00:00
Alexander Polyakov
a4accc0e3e
opcache: print restart reason 2017-01-13 21:34:11 +00:00
Alexander Polyakov
d79b82d8ae
opcache: print restart reason 2017-01-13 21:33:58 +00:00
Anatol Belski
a7b20894e5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  ensure the end path wouldn't contain double slashes
 2017-01-13 16:54:10 +01:00
Anatol Belski
8e993b427c ensure the end path wouldn't contain double slashes 2017-01-13 16:50:05 +01:00
Anatol Belski
e7c3f44958 refix test 2017-01-13 15:31:10 +01:00
Anatol Belski
8d1aab2aee fix test 
Same as before actulaly - the host process running with Opcache
enabled, all the intermediate scripts land in cache. So the count
can be variable, maybe even better to just test for > 0.
 2017-01-13 14:40:31 +01: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
28f2959b83
Revert "set more suitable defaults for opcache in ini and code" 
This reverts commit b655f2d632.

This has been deemed unsuitable for 7.0
 2017-01-09 17:08:07 +00:00
Joe Watkins
71fe529afc
merge PR #2290: enable opcache in CLI in 7.1+ 2017-01-09 11:00:05 +00:00
Joe Watkins
9727e37cae
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  set more suitable defaults for opcache in ini and code
 2017-01-09 10:56:54 +00:00
Markus Staab
b655f2d632
set more suitable defaults for opcache in ini and code 2017-01-09 10:53:23 +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
Rasmus Lerdorf
19b757dacd Fix opcache test dependencies 2017-01-02 22:30:28 -08:00
Rasmus Lerdorf
608724bfe1 Fix opcache test dependencies 2017-01-02 22:21:12 -08:00
Nikita Popov
242d924e59 Fix bug #73847 2016-12-31 13:33:21 +01:00
Nikita Popov
7746ed9d5f Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:00:14 +01:00
Mitch Hagstrand
d0fcc74110 Make Opcache tests using the cli server more reliable 
Same fix already applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc

1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
 2016-12-29 20:56:45 +01:00
Nikita Popov
175b9f67f6 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 12:47:29 +01:00
Sébastien Santoro
25c96f92f4 Fix IS_UNDEF comparisons in opcache 
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.

Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
 2016-12-22 12:46:14 +01:00
Xinchen Hui
82988d3e41 Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt) 
This reverts commit a12f43ee2c.
 2016-12-21 14:24:14 +08:00
Xinchen Hui
6bd41a1d47 Fixed bug #73789 (Strange behavior of class constants in switch/case block) 2016-12-20 21:01:21 +08:00
Xinchen Hui
a12f43ee2c Reorder the oplines 
1. we should only do the return type checking when it is really about to
return
2. for 029.php, actually, the exception threw should be discard while it
jmp into finally(it could be observed by change the return to return an array)
3. after this fix, the test 029.phpt behavior consistently with 7.0
4. good for optimizer too
 2016-12-17 20:06:18 +08:00
Xinchen Hui
8ba7878f1b Add an assertion 2016-12-16 11:09:22 +08:00
Xinchen Hui
7cef66c635 Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead) 2016-12-16 11:06:27 +08:00
Xinchen Hui
8250b3fca1 Fixed possible false assertion failure 2016-12-08 22:04:43 +08:00
Nikita Popov
60249f4390 Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE 
VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.
 2016-12-07 23:14:46 +01:00
Nikita Popov
76c4a3db08 Fix bug #73668 
Not bothering to implement special handling to get an accurate
range for this case.
 2016-12-06 22:25:35 +01:00
Nikita Popov
d7e7f74b24 Factor out common binary op code in range inference 
Instead of repeating the same code for binary ops and their
compound assignment variants, factor the range computation out
into a separate function.
 2016-12-06 22:09:44 +01:00
Nikita Popov
3b79f8f408 Fix bug #73654 2016-12-05 20:41:14 +01:00
Dmitry Stogov
54244ba565 Fixed access to uninitialized value 2016-12-01 13:25:50 +03:00
Dmitry Stogov
54f7abfe7d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler overflow check
  fix gcov coverage
 2016-12-01 10:34:09 +03:00
Dmitry Stogov
003346c450 Simpler overflow check 2016-12-01 10:30:02 +03:00
Xinchen Hui
a0b28434cc Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name) 
bug was introduced in rev 88eae43f , and the runtime defined key is not
merged-able
 2016-11-23 14:24:46 +08:00
Anatol Belski
d61db8d602 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  remove TSRMLS_*
 2016-11-22 00:32:42 +01:00
Anatol Belski
5e9b4c26a5 remove TSRMLS_* 2016-11-21 23:53:37 +01:00
Nikita Popov
226b82b127 RC inference fixes 2016-11-17 13:47:36 +01:00
Dmitry Stogov
205c69939a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed 64-bit build
 2016-11-17 14:05:48 +03:00
Dmitry Stogov
c2173c16d0 Fixed 64-bit build 2016-11-17 14:05:22 +03:00
Dmitry Stogov
365d613480 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Overflow check
 2016-11-17 13:18:25 +03:00
Dmitry Stogov
d4b3f89c53 Overflow check 2016-11-17 13:17:34 +03:00
Dmitry Stogov
f8f35d0d4e VERIFY_RETURN_TYPE on references can't be eliminated 2016-11-17 10:41:42 +03:00
Dmitry Stogov
429bfbd4c2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Accorate handling of too big inodes of chroot directories
 2016-11-17 01:14:47 +03:00
Dmitry Stogov
27542d9c9d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Accorate handling of too big inodes of chroot directories
 2016-11-17 01:14:23 +03:00
Dmitry Stogov
9849c97b1b Accorate handling of too big inodes of chroot directories 2016-11-17 01:08:42 +03:00