php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
91,269 Commits 549 Branches 1,485 Tags
bce9368dfbd2b11258601604a44e2145c9bb2d86
Commit Graph

39262 Commits

Author SHA1 Message Date
Christopher Jones c20f00f765 PHP 7 OCI8: fix bug57702.phpt regression 2015-07-14 08:39:59 +10:00
Anatol Belski 9db46a392b remove #ifdef 2015-07-14 00:12:35 +02:00
Anatol Belski b19aea3742 remove comment, it's not right 2015-07-13 23:43:43 +02:00
Christoph M. Becker 20eaa186fb Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px
 2015-07-13 22:30:43 +02:00
Christoph M. Becker 2e34febb73 Fix #66882: imagerotate by -90 degrees truncates image by 1px 
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
 2015-07-13 22:18:56 +02:00
Anatol Belski cefd010739 Fixed bug #70065 curl_getinfo() returns corrupted values 2015-07-13 21:47:42 +02:00
Anthony Ferrara 21686f1b30 Revert SplFileInfo BC break while keeping fix for assertion removal 
This reverts the minor bc-break where .test would return an empty extension. This is different from 5.x's behavior.

In 7, it would result in an assertion failure crash. The fix for the removal of this assertion is kept, keeping BC with 5.x.
 2015-07-13 13:27:06 -04:00
Anthony Ferrara 4b78636f3f Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character 
Currently, there is an assert() that fails on files like .gitignore crashing PHP. This patch fixes that.
Instead, now an empty string is returned (since the file has no extension). A test has been added to test this behavior.
 2015-07-13 13:12:45 -04:00
Christoph M. Becker fabc1b7174 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
 2015-07-13 18:36:15 +02:00
Christoph M. Becker 1a4722a89e Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory 
A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.
 2015-07-13 18:30:33 +02:00
Christoph M. Becker 959b2c3514 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
 2015-07-13 15:56:39 +02:00
Christoph M. Becker fa53d8463f Fix #69024: imagescale segfault with palette based image 
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].

[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3>
 2015-07-13 15:48:48 +02:00
Xinchen Hui 420b745a05 Merge branch 'shmop-extension_improve-test-coverage' of https://github.com/edgarsandi/php-src 2015-07-13 19:12:18 +08:00
Xinchen Hui 646694529f Merge branch 'basename-function_improve-test-coverage' of https://github.com/edgarsandi/php-src 2015-07-13 19:08:25 +08:00
Xinchen Hui 5384ccf5bb Revert "Fixed test fail in travis from time to time" 
Some tests rely on this warning... :<

This reverts commit aed4c03cf9.
 2015-07-13 17:22:34 +08:00
Xinchen Hui 8c2658ed52 Merge branch 'master' of https://github.com/Geolim4/php-src 2015-07-13 16:40:56 +08:00
Xinchen Hui aed4c03cf9 Fixed test fail in travis from time to time 2015-07-13 16:36:19 +08:00
Xinchen Hui b8eff44b0e Fixed Bug #70058 Build fails when building for i386 
(I don't have a m32 build env, so this is not tested)
 2015-07-13 15:05:04 +08:00
Christopher Jones 8586e67c1c Some OCI8 fixes (Rajendra) 2015-07-13 11:50:00 +10:00
Christoph M. Becker 42d1fa29c7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #53154: Zero-height rectangle has whiskers
 2015-07-13 01:46:09 +02:00
Christoph M. Becker 094decc3c0 Fix #53154: Zero-height rectangle has whiskers 
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
 2015-07-13 01:33:00 +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 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
Tjerk Meesters 03d18d9a52 Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7 2015-07-13 00:33:55 +08: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 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 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
Geolim4 c10c47ae1e Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow. 2015-07-11 21:44:23 +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 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 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 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
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
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 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
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
Edgar R. Sandi 28c3b55fa8 adding scenario of test to improve test coverage 2015-07-09 16:43:31 -03:00
Nikita Popov 788c4c852d Fix posix_setrlimit segfault 2015-07-09 20:40:07 +02:00
Nikita Popov d91aad5966 Fix bug #69430 
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
 2015-07-09 19:11:48 +02:00
Nikita Popov 8abc3022b0 Update token_get_all() arginfo 2015-07-09 18:19:12 +02:00
Dmitry Stogov b77fa94cf9 Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0 2015-07-09 12:19:51 +03:00
Xinchen Hui 0de0c4ace1 Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL)) 2015-07-09 16:36:31 +08:00