Commit Graph

91307 Commits

Author SHA1 Message Date
Xinchen Hui
91e5b30a3b Merge branch 'master' of git.php.net:php-src 2015-07-17 15:56:28 +08:00
Xinchen Hui
7d07afd6c1 Fixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ()) 2015-07-17 15:55:34 +08:00
Nikita Popov
c568ffe517 Ignore getcwd return in zend_compile
To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.
2015-07-16 22:48:56 +02:00
Nikita Popov
208257eec5 Explicitly ignore mblen(NULL, 0) retval 2015-07-16 22:39:11 +02:00
nikita2206
d8a6130660 Handle empty (NULL) stmt in ast_export 2015-07-16 22:31:36 +02:00
Bob Weinand
9ee52ca3ae Merge remote-tracking branch 'origin/PHP-5.6' 2015-07-16 19:12:38 +02:00
Anatol Belski
0dce8373cd forked test for windows 2015-07-16 15:05:04 +02:00
Xinchen Hui
deeb6379cb Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls) 2015-07-16 18:32:42 +08:00
Bob Weinand
c13124cc0f Cleanup exception displaying code in phpdbg 2015-07-16 10:28:59 +02:00
Bob Weinand
37e03f6b32 Fix test; this should properly emit a fatal error, just as every other by-ref assignment to an overloaded object 2015-07-16 09:29:43 +02:00
Bob Weinand
0242653377 Fix test; this should properly throw an Error, just as every other by-ref assignment to an overloaded object 2015-07-16 09:25:19 +02:00
Christopher Jones
e6d9061e85 More OCI8 diff fixes (Rajendra) 2015-07-16 13:06:35 +10:00
Bob Weinand
f57cb13c56 Backport fix for bug #70083 to PHP-5.6 2015-07-15 22:46:53 +02:00
Bob Weinand
0af0733352 Fixed bug #70083 (Use after free with assign by ref on overloaded objects) 2015-07-15 22:36:42 +02:00
Bob Weinand
d25f3819c7 Fix crash on non-debug for phpdbg_end_oplog() 2015-07-15 22:30:12 +02:00
Rasmus Lerdorf
73773c2175 unserialize() takes a 2nd optional arg and it can't be a bool 2015-07-15 09:59:31 -07:00
Xinchen Hui
d0bea17d2e Improve the conditions(save one comparison) 2015-07-15 10:55:41 +08:00
Xinchen Hui
32a4507abc Fixed segfault if opcache is disabled and with file_cache 2015-07-15 10:38:23 +08:00
Xinchen Hui
453ec91dfe Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T) 2015-07-14 18:59:36 +08:00
Lior Kaplan
ad929bf68b Format alignment (needed for news2html) 2015-07-14 12:00:26 +03:00
Lior Kaplan
a3fea0568b Format alignment (needed for news2html) 2015-07-14 11:28:53 +03:00
Christoph M. Becker
80b6a13553 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #53840: Misleading extension entries in php.ini
2015-07-14 10:11:50 +02:00
Christoph M. Becker
72554891e3 Fix #53840: Misleading extension entries in php.ini
As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.
2015-07-14 10:09:29 +02:00
Christoph M. Becker
9f4135ad80 Merge branch 'master' of http://git.php.net/repository/php-src
# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src:
  We want to track phpdbg bugs in official bug tracker now; updated URL
  Show also runtime-bound functions/classes/methods with phpdbg -p
  One less comparison
  Fix potential segfault
  Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
  Fix __METHOD__ in functions nested into methods
  Init variable to NULL before passing to zpp
  Format alignment
  PHP 7 OCI8: fix bug57702.phpt regression
2015-07-14 10:02:25 +02:00
Bob Weinand
50866846c4 We want to track phpdbg bugs in official bug tracker now; updated URL 2015-07-14 08:31:44 +02:00
Bob Weinand
762c6dd666 Show also runtime-bound functions/classes/methods with phpdbg -p 2015-07-14 06:28:53 +02:00
Rasmus Lerdorf
611ff0c846 One less comparison 2015-07-13 19:44:51 -07:00
Rasmus Lerdorf
1ce4e8c45e Fix potential segfault 2015-07-13 19:38:55 -07:00
Bob Weinand
bce9368dfb Closures only have {closure}() as method name
Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
2015-07-14 02:52:09 +02:00
Bob Weinand
1003d01f3a Fix __METHOD__ in functions nested into methods 2015-07-14 02:37:35 +02:00
Bob Weinand
07c425cc29 Init variable to NULL before passing to zpp 2015-07-14 01:56:05 +02:00
Lior Kaplan
51ce31e0c4 Format alignment 2015-07-14 02:43:11 +03:00
Christopher Jones
c20f00f765 PHP 7 OCI8: fix bug57702.phpt regression 2015-07-14 08:39:59 +10:00
Christoph M. Becker
ae5d04cd6a Merge branch 'master' of http://git.php.net/repository/php-src
# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src:
  remove #ifdef
  remove comment, it's not right
2015-07-14 00:30:17 +02: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
cdf4d35e30 Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px
  update NEWS
  Fixed bug #70065 curl_getinfo() returns corrupted values
  Revert SplFileInfo BC break while keeping fix for assertion removal
  Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
  updated NEWS
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
2015-07-13 22:39:12 +02:00
Christoph M. Becker
e9eee76840 updated NEWS 2015-07-13 22:33: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
140e80acc0 updated NEWS 2015-07-13 22:29:10 +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
Christoph M. Becker
36439cf7b8 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:14:13 +02:00
Anatol Belski
961fb9b569 update NEWS 2015-07-13 21:48:45 +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
e10e0a02aa updated NEWS 2015-07-13 18:39:11 +02: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
72c2fc44e0 updated NEWS 2015-07-13 18:34:40 +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