php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,984 Commits 547 Branches 1,483 Tags
1b16fb594f85a5bbadca2dfff76c315530f4f8a4
Commit Graph

1138 Commits

Author SHA1 Message Date
Xinchen Hui
be60d159b6 Add test only (bug doesn't exists in 7.1) 2017-02-23 12:47:15 +08:00
Xinchen Hui
0b7fa040e9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74019 (Segfault with list)
 2017-02-10 14:25:29 +08:00
Xinchen Hui
185304a61e Fixed bug #74019 (Segfault with list) 2017-02-10 14:24:01 +08:00
Anatol Belski
de64adeb1d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73983 crash on finish work with phar in cli + opcache
 2017-01-30 12:46:11 +01:00
Anatol Belski
368958b3e4 Fixed bug #73983 crash on finish work with phar in cli + opcache 
The file_cache_only option causes the storage to be per process,
furthermore the arena is destroyed per request. Thus, zend_string's
can't survive between request and the permanent flag should not
be set. This is already done with the file cache part, but the
persistency part is used in various scenarios and should respect
this case as well. In this particular bug, the pcre pattern cache
needs to survive between requests and uses pattern strings as hash
keys. One more case relevant here would be various situations where
the flow disables the use of shared memory.
 2017-01-30 12:44:21 +01:00
Anatol Belski
f2c99e201e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move id initialization into ctor
 2017-01-30 11:41:59 +01:00
Anatol Belski
4b1afc829c move id initialization into ctor 2017-01-30 11:40:23 +01:00
Anatol Belski
2a5a310446 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix system id initialization for multiple threads
 2017-01-30 01:57:27 +01:00
Anatol Belski
2b7e5468c9 fix system id initialization for multiple threads 2017-01-30 01:54:36 +01:00
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