php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 05:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,579 Commits 547 Branches 1,483 Tags
9e18f1d4aff855161eeb0de2f4979a2e7eff7175
Commit Graph

1220 Commits

Author SHA1 Message Date
Anatol Belski
21e5959c4e Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix AppVeyor failures with Opcache enabled
 2017-01-15 21:20:18 +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
0bfd17dfc5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added test for "opcache: print restart reason" to basic_logging.phpt
 2017-01-14 07:33:35 +00: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
Alexander Polyakov
6cca4fcd59 opcache: print restart reason 2017-01-13 21:33:19 +00:00
Anatol Belski
9db2dab858 Merge branch 'PHP-7.1' 
* PHP-7.1:
  ensure the end path wouldn't contain double slashes
 2017-01-13 16:55:49 +01: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
5ba9f8458c Merge branch 'PHP-7.1' 
* PHP-7.1:
  refix test
 2017-01-13 15:35:42 +01:00
Anatol Belski
e7c3f44958 refix test 2017-01-13 15:31:10 +01:00
Anatol Belski
e9f978a272 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
  Fix test runs with Opcache enabled PHP on top
 2017-01-13 14:46:44 +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
Dmitry Stogov
141d1ba980 Introduced "zend_type" - an abstraction for type-hinting representation. 2017-01-13 11:37:46 +03:00
Joe Watkins
28391c30ca Merge branch 'PHP-7.1' 
* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:31 +00: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
Nikita Popov
18904aa3e2 Compact literals: Deduplicate empty array literals 2017-01-10 00:21:38 +01: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
4e99d3031f Merge branch 'PHP-7.1' 
* PHP-7.1:
  merge PR #2290: enable opcache in CLI in 7.1+
 2017-01-09 11:00:37 +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
cde08d499b Merge branch 'PHP-7.1' 
* PHP-7.1:
  set more suitable defaults for opcache in ini and code
 2017-01-09 10:57:29 +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
Sammy Kaye Powers
1e3624290a Resolve conflict 2017-01-03 08:01:05 -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
Rasmus Lerdorf
6b985c71d4 Fix opcache test dependencies 2017-01-02 22:20:08 -08:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Nikita Popov
b767370496 Merge branch 'PHP-7.1' 2016-12-31 13:34:09 +01:00
Nikita Popov
242d924e59 Fix bug #73847 2016-12-31 13:33:21 +01:00
Nikita Popov
30029d137f Merge branch 'PHP-7.1' 2016-12-29 21:00:34 +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
ce97ead399 Merge branch 'PHP-7.1' 2016-12-22 12:47:50 +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
b6553d422d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
 2016-12-21 14:27:13 +08: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
Dmitry Stogov
088dd88eeb Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73792 (invalid foreach loop hangs script)
  Fixed bug #73789 (Strange behavior of class constants in switch/case block)
 2016-12-20 16:54:28 +03: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
adf0256c4a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Reorder the oplines
 2016-12-17 20:09:49 +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
10b037bc33 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add an assertion
 2016-12-16 11:09:35 +08:00
Xinchen Hui
8ba7878f1b Add an assertion 2016-12-16 11:09:22 +08:00