archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
103071 commits 526 branches 1434 tags 878 MiB
Commit graph

1337 commits

Author SHA1 Message Date
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
Xinchen Hui
8612ac2000 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)
 2016-12-16 11:06:50 +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
9f1e456d5a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed possible false assertion failure
 2016-12-08 22:05:17 +08:00
Xinchen Hui
8250b3fca1 Fixed possible false assertion failure 2016-12-08 22:04:43 +08:00
Nikita Popov
683a0a0f6e Merge branch 'PHP-7.1' 2016-12-07 23:15:02 +01: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
6c614cb14c Merge branch 'PHP-7.1' 2016-12-06 22:26:36 +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
89f8a34483 Merge branch 'PHP-7.1' 2016-12-06 22:12:01 +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
795cd6d3a7 Merge branch 'PHP-7.1' 2016-12-05 20:41:21 +01:00
Nikita Popov
3b79f8f408 Fix bug #73654 2016-12-05 20:41:14 +01:00
Dmitry Stogov
9c1920d9e8 Revert "Fix memory leaks with FE_RESET upon empty iterator" 
This reverts commit 00e516e575.
 2016-12-02 11:58:36 +03:00
Dmitry Stogov
7abf3b56f5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed access to uninitialized value
 2016-12-01 13:26:26 +03:00
Dmitry Stogov
54244ba565 Fixed access to uninitialized value 2016-12-01 13:25:50 +03:00
Dmitry Stogov
bb78637bda Merge branch 'PHP-7.1' 
* PHP-7.1:
  Simpler overflow check
  fix gcov coverage
 2016-12-01 10:34:18 +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
Bob Weinand
00e516e575 Fix memory leaks with FE_RESET upon empty iterator 
Solved by manually freeing and jumping to the opcode *after* FE_FREE
 2016-11-30 17:44:34 +01:00
Dmitry Stogov
3e9bb03a62 Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUED) 2016-11-28 22:59:57 +03:00
Anatol Belski
b204b3abd1 further normalizations, uint vs uint32_t 
fix merge mistake

yet one more replacement run
 2016-11-26 17:29:01 +01:00
Xinchen Hui
d98cc74c16 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)
 2016-11-23 14:27:57 +08: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
bfb9be9bd4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  remove TSRMLS_*
 2016-11-22 00:33:29 +01: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
0004f7e86d Merge branch 'PHP-7.1' 2016-11-17 13:48:07 +01:00
Nikita Popov
226b82b127 RC inference fixes 2016-11-17 13:47:36 +01:00
Dmitry Stogov
c87ab8aec0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed 64-bit build
 2016-11-17 14:06:09 +03: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
610083bc06 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Overflow check
 2016-11-17 13:18:58 +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