clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
91,226 Commits 494 Branches 1,367 Tags 785 MiB
ecd32e437e
Commit Graph

91226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
ecd32e437e Merge branch 'master' of http://git.php.net/repository/php-src 
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #67447: imagecrop() adds a black line when cropping
 2015-07-13 00:33:18 +02:00
Christoph M. Becker
33da8a60d9 updated NEWS 2015-07-12 23:18:59 +02:00
Christoph M. Becker
930a9910d7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #67447: imagecrop() adds a black line when cropping
 2015-07-12 23:15:06 +02:00
Christoph M. Becker
591fd4cdc3 updated NEWS 2015-07-12 23:13:13 +02:00
Christoph M. Becker
891ff131ef Fix #67447: imagecrop() adds a black line when cropping 
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
 2015-07-12 23:05:53 +02:00
Christoph M. Becker
0002f18af6 Merge branch 'master' of http://git.php.net/repository/php-src 
# By Christoph M. Becker (3) and Tjerk Meesters (1)
# Via Christoph M. Becker (1) and Tjerk Meesters (1)
* 'master' of http://git.php.net/repository/php-src:
  Fixed #70053	MutlitpleIterator array-keys incompatible change in PHP 7
  updated NEWS
  updated NEWS
  Fix #68714: copy 'n paste error
 2015-07-12 19:06:09 +02:00
Tjerk Meesters
03d18d9a52 Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7 2015-07-13 00:33:55 +08:00
Christoph M. Becker
fcdf1d0527 updated NEWS 2015-07-12 16:43:38 +02:00
Christoph M. Becker
ce7b5af03f Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #68714: copy 'n paste error
 2015-07-12 16:39:50 +02:00
Christoph M. Becker
c0ac51dc07 updated NEWS 2015-07-12 16:38:23 +02:00
Christoph M. Becker
ba7c3a1bb4 Fix #68714: copy 'n paste error 
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
 2015-07-12 16:32:38 +02:00
Christoph M. Becker
3aad9bd3ee Fix #68714: copy 'n paste error 
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
 2015-07-12 16:26:16 +02:00
Christoph M. Becker
a50dda901c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added XFAIL test for bug #53640
 2015-07-12 00:12:31 +02:00
Christoph M. Becker
a8dbe655e5 Added XFAIL test for bug #53640 2015-07-12 00:10:56 +02:00
Christoph M. Becker
649fd428d9 updated NEWS 2015-07-11 21:03:40 +02:00
Christoph M. Becker
77cd79012e Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #66339: PHP segfaults in imagexbm
 2015-07-11 21:01:01 +02:00
Christoph M. Becker
bac1fe7438 updated NEWS 2015-07-11 20:58:50 +02:00
Christoph M. Becker
c40f40656e Fix #66339: PHP segfaults in imagexbm 
The file parameter of the XBM image ZPP is not properly taken into account. If
it is NULL that would result in a segfault, because gdImageXbmCtx() is not
prepared to take a NULL file_name. If it is not NULL the XBM data would be
written to STDOUT, because the stream is not initialized. This patch fixes both
issues.
 2015-07-11 20:54:07 +02:00
Christoph M. Becker
1a94e51859 updated NEWS 2015-07-11 17:56:33 +02:00
Christoph M. Becker
6f574c6dd8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #70047: gd_info() doesn't report WebP support
 2015-07-11 17:52:22 +02:00
Christoph M. Becker
6ac4c57f72 updated NEWS 2015-07-11 17:50:42 +02:00
Christoph M. Becker
450fbdc740 Fix #70047: gd_info() doesn't report WebP support 
Despite being documented, the array returned by gd_info() doesn't have a 'WebP
Support' key. This patch adds it.
 2015-07-11 17:49:13 +02:00
Xinchen Hui
e63c756c09 Better implementation 2015-07-11 18:59:09 +08:00
Christoph M. Becker
0cd9c4eb2b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Adding tests for getprotobyname and getprotobynumber functions
 2015-07-11 00:20:46 +02:00
Rasmus Lerdorf
1af1afdfdc DOMDocument::saveXML has a 2nd optional arg 2015-07-10 15:17:06 -07:00
Edgar R. Sandi
49c0c1299a Adding tests for getprotobyname and getprotobynumber functions 2015-07-11 00:16:42 +02:00
Bob Weinand
0584df0ad9 hmm, we do not need the nop after compilation, so does not matter for opcache... 2015-07-10 23:35:05 +02:00
Bob Weinand
56800e470b a: try { ... } ≠ try { a: ... } 2015-07-10 23:29:07 +02:00
Ferenc Kovacs
ed62db9abc Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing NEWS entry
 2015-07-10 17:26:09 +02:00
Ferenc Kovacs
a7dc1274f0 add missing NEWS entry 2015-07-10 17:25:44 +02:00
Xinchen Hui
8e709d7f5d Fixed invalid read (Part issue of #69579) 2015-07-10 22:26:53 +08:00
Nikita Popov
25d327e53f Move try/catch/finally tests to common directory 2015-07-10 13:35:14 +02:00
Nikita Popov
725fed4902 Mark temporary_cleaning_006.phpt as XFAIL 
And adjust it to fail even with opcode.
 2015-07-10 13:33:32 +02:00
Nikita Popov
bd72fdca98 Better opcode dump for finally 
* Move opcode decode into opline decode, so we can adjust it for
  extended_value.
* Show extended_value and secondary jump ops for FAST_CALL and
  FAST_RET.
 2015-07-10 11:39:54 +02:00
Xinchen Hui
95ff2852ee Micro optimization 2015-07-10 16:39:21 +08:00
Xinchen Hui
f930d6ea0e Fixed Bug #69996 (Changing the property of a cloned object affects the original) 2015-07-10 16:33:13 +08:00
Xinchen Hui
54305c8952 Fixed No 2 issue in #1400 2015-07-10 16:04:45 +08:00
Xinchen Hui
a3f05d640d Fixed Issue #1400 (double free static property) 2015-07-10 15:27:06 +08:00
Dmitry Stogov
ef1b588f6a Resolve GOTO at compile time and replace it with sequnce of FREE/FE_FREE and JMP. 2015-07-10 04:44:21 +03:00
Dmitry Stogov
44f7348caa Exception thrown by "return" statement (from TMP destructors) shouldn't be caught in the same function 2015-07-10 04:13:34 +03:00
Dmitry Stogov
3bb70fe290 Readded tests 2015-07-10 03:46:57 +03:00
Dmitry Stogov
bafe9d8c30 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  add missing NEWS entry
  PDO_OCI LOB fixes (Senthil)
  Improve test portability (Senthil)
  Add new test section.  Diff with query 5 is still to be resolved
  Add Oracle syntax (Senthil)
 2015-07-10 03:32:46 +03:00
Dmitry Stogov
549e8c4959 Squashed commit of the following: 
commit 03cf871f1576f08b2348c141b209894a7bf17a86
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:31 2015 +0300

    Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"

    This reverts commit 5ee8413259.

commit 285a68227ce3d380e821a24fa389aa5239bd3fe1
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:26 2015 +0300

    Revert "Tuned off dubugging of live ranges"

    This reverts commit 404dc93d35.

commit 93d9d11157301ee2ec99afb6f5744b126d17f637
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:17 2015 +0300

    Revert "Remove loop_var_stack"

    This reverts commit b3a4c05071.

commit ede68ebbc284aec79e3f719f2c8dbf9da6907752
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:12 2015 +0300

    Revert "ZEND_SEPARATE reuses temporaries"

    This reverts commit 1852f538b9.

commit 96d8995dc1f517fb01b481736273767509f76c47
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:10 2015 +0300

    Revert "Add assertion in liveliness computation"

    This reverts commit ed14019e8c.

commit 0649d7bfef152e6cc8e67b922534e9946c634d9c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:07 2015 +0300

    Revert "Fixed invalid live-range detection"

    This reverts commit 54f367ee2a.

commit dfe8f3851f6b04595eb089323e3492115a59363e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:04 2015 +0300

    Revert "Add test guaranteeing that loop vars are only freed after potential return type exceptions"

    This reverts commit f5db5a558d.

commit 52a94aad6f48a199358cc07f7e4f56bb73050504
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:01 2015 +0300

    Revert "Fixed exception habdling on "return" statement."

    This reverts commit 17c5315bdf.

commit 6e90ad7331901711e89c2ceb2bcab5023e5cee60
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:44:58 2015 +0300

    Revert "Fix too early terminated temporary range with break/cont/goto"

    This reverts commit cc876c04b4.

commit 7b766e44b1970e4031f75109c302c07ead2c05cb
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:44:55 2015 +0300

    Revert "Fixed exception catching on break/continue"

    This reverts commit 8c3f701eeb.
 2015-07-10 03:31:52 +03:00
Ferenc Kovacs
bf09c28aca Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing NEWS entry
 2015-07-10 02:31:16 +02:00
Ferenc Kovacs
ec25f69c5d add missing NEWS entry 2015-07-10 02:30:29 +02:00
Christopher Jones
bcb1c2fe03 PDO_OCI LOB fixes (Senthil) 2015-07-10 09:55:36 +10:00
Christopher Jones
268a333232 Improve test portability (Senthil) 2015-07-10 09:53:45 +10:00
Christopher Jones
e79433743a Add new test section. Diff with query 5 is still to be resolved 2015-07-10 09:49:10 +10:00
Christopher Jones
a3c54dd1b7 Add Oracle syntax (Senthil) 2015-07-10 09:47:45 +10:00
Nikita Popov
a49ce7bb91 Don't return T_ERROR from token_get_all() 
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
 2015-07-09 23:02:21 +02:00