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
98,143 Commits 549 Branches 1,485 Tags
6dccadaac6fe633e2467eb0b46b06dbf3b43cff0
Commit Graph

98143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Piotrowski 6dccadaac6 Remove accidental NEWS and UPGRADING entries 
Merge mistake from PHP-7.1.
 2016-08-23 11:49:57 -05:00
Bob Weinand 600bf56d88 Merge branch 'PHP-7.1' 2016-08-23 18:44:08 +02:00
Levi Morrison f4e68a3968 Revert "Do not prepend ? on nullables in ReflectionType::__toString()" 
This reverts commit 8855a2ce76.
 2016-08-23 09:43:31 -06:00
Dmitry Stogov 7edaed6fba Merge branch 'PHP-7.1' 
* PHP-7.1:
  op_arrays may be optimized independetly and "script" might be NULL
 2016-08-23 13:18:51 +03:00
Dmitry Stogov 129e8dadf4 op_arrays may be optimized independetly and "script" might be NULL 2016-08-23 13:17:53 +03:00
Dmitry Stogov 6e7c37228f Merge branch 'PHP-7.1' 
* PHP-7.1:
  Don't keep dangling pointers.
 2016-08-23 12:59:23 +03:00
Dmitry Stogov 76707dc204 Don't keep dangling pointers. 2016-08-23 12:58:46 +03:00
Dmitry Stogov 0e3e3ec7b6 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added tests and NEWS entry Fixed bug #72598 (Reference is lost after array_slice())
 2016-08-23 12:16:36 +03:00
Dmitry Stogov 62ab40bc96 Added tests and NEWS entry 
Fixed bug #72598 (Reference is lost after array_slice())
 2016-08-23 12:14:31 +03:00
Dmitry Stogov c1e0c665f5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Run ext/opcache/tests/*.phpt by default
 2016-08-23 11:51:52 +03:00
Dmitry Stogov 0cc8ff2b41 Run ext/opcache/tests/*.phpt by default 2016-08-23 11:51:08 +03:00
Dmitry Stogov 93b8592092 Merge branch 'PHP-7.1' 
* PHP-7.1:
  call_user_func(_array): Don't abort on reference warning
 2016-08-23 10:56:55 +03:00
Nikita Popov 906456c410 call_user_func(_array): Don't abort on reference warning 
Change zend_call_function() to not abort the call if a non-reference
is passed to a reference argument. The usual warning will still be
thrown, but the call will proceed as usual.
 2016-08-23 10:29:15 +03:00
Xinchen Hui f2dd85606b Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  sync shm* implementation signatures with POSIX
 2016-08-23 11:33:12 +08:00
Xinchen Hui 7d079253b8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed tests
 2016-08-23 11:32:30 +08:00
Xinchen Hui 26d74a0420 Fixed tests 2016-08-23 11:32:21 +08:00
Anatol Belski becc5cd11b sync shm* implementation signatures with POSIX 2016-08-23 00:27:17 +02:00
Xinchen Hui 6790932eaa Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72920 (Accessing a private constant using constant() creates an exception AND warning)
 2016-08-22 23:44:50 +08:00
Xinchen Hui 434ae90e85 Fixed bug #72920 (Accessing a private constant using constant() creates an exception AND warning) 2016-08-22 23:44:38 +08:00
Dmitry Stogov d79492c218 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed CFG construction for stackless execution (split basic blocks after calls)
 2016-08-22 16:49:31 +03:00
Dmitry Stogov caf890b291 Fixed CFG construction for stackless execution (split basic blocks after calls) 2016-08-22 16:48:26 +03:00
Yasuo Ohgaki 7cb784fcca Merge branch 'PHP-7.1' 
* PHP-7.1:
  Adjust test so that it passes on more restrictive filesystems
 2016-08-22 17:01:40 +09:00
Yasuo Ohgaki 7d703a0060 Adjust test so that it passes on more restrictive filesystems 2016-08-22 17:01:07 +09:00
Sara Golemon fd8e203fa2 Add .gitignore for fpm generated files 2016-08-21 12:53:01 -07:00
Jakub Zelenka 745bf979cd Merge branch 'PHP-7.1' 2016-08-21 20:29:55 +01:00
Jakub Zelenka 21c72827c7 Do not expect error 0407006A in openssl_private_(en|de)crypt 
It makes the test work with OpenSSL 1.1
 2016-08-21 20:29:03 +01:00
Christoph M. Becker 2c74a5282e Merge branch 'PHP-7.1' 2016-08-21 20:04:18 +02:00
Christoph M. Becker 5347246f56 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-21 19:55:09 +02:00
Christoph M. Becker 4c13a7f5c4 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-21 19:48:38 +02:00
Christoph M. Becker 6a232c3604 Fix #68716: possible resource leaks in _php_image_convert() 
We properly clean up after ourselves wrt. to closing opened file pointers
and created images.
 2016-08-21 19:39:58 +02:00
Anatol Belski e8ae2ba122 Merge branch 'PHP-7.1' 
* PHP-7.1:
  extend readdir utf-8 name test
 2016-08-21 18:22:49 +02:00
Anatol Belski 096b0a556c extend readdir utf-8 name test 2016-08-21 18:21:49 +02:00
Christoph M. Becker f2d26f917c Merge branch 'PHP-7.1' 2016-08-21 17:52:16 +02:00
Christoph M. Becker 3dc6c4b329 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-21 17:51:53 +02:00
Christoph M. Becker 4c68fc5392 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-21 17:45:49 +02:00
Christoph M. Becker d65adac2be Fix #72913: imagecopy() loses single-color transparency on palette images 
The proper code to handle true-color to palette copies is already contained
in gdImageCopy(), so we can simply remove the buggy duplicated code.
 2016-08-21 17:39:23 +02:00
Christoph M. Becker 222cf29921 Merge branch 'PHP-7.1' 2016-08-21 16:21:44 +02:00
Christoph M. Becker 15f1b04198 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-21 16:21:13 +02:00
Christoph M. Becker 7a36056d6c Merge branch 'PHP-5.6' into PHP-7.0 2016-08-21 16:15:22 +02:00
Christoph M. Becker 9eb5bbd8bd Fix #66005: imagecopy does not support 1bit transparency on truecolor images 
We must not copy transparent pixels, see
<https://github.com/libgd/libgd/commit/daac285c>.
 2016-08-21 16:08:57 +02:00
Xinchen Hui 9121c872e9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  This is unecessary for 7.1 (IS_ERROR is an internal type)
  Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
 2016-08-21 17:40:45 +08:00
Xinchen Hui e849e65d89 This is unecessary for 7.1 (IS_ERROR is an internal type) 2016-08-21 17:40:10 +08:00
Xinchen Hui e572035ecf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
 2016-08-21 17:39:52 +08:00
Xinchen Hui 0476bb1de5 Fixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper) 2016-08-21 17:38:03 +08:00
Xinchen Hui 17e8a3df13 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
 2016-08-21 17:19:36 +08:00
Xinchen Hui 226e21b0fe Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:/php-src:
  Improvements to fix #72714, suggested by nikic
  Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
  Fix #72714: _xml_startElementHandler() segmentation fault
  update NEWS
  Fixed bug #72852 imap_mail null dereference
  Revert "Fix dba configuration for Windows"
  Fix dba configuration for Windows
  Fix broken test include
  fix NEWS
  Add myself as PDO_OCI maintainer
 2016-08-21 17:19:24 +08:00
Xinchen Hui b740bb3987 Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260)) 2016-08-21 17:10:10 +08:00
Aaron Piotrowski 83bdcf075b Merge branch 'PHP-7.1' 
# Conflicts:
#	NEWS
#	UPGRADING
 2016-08-21 00:34:00 -05:00
Aaron Piotrowski 8855a2ce76 Do not prepend ? on nullables in ReflectionType::__toString() 
Better BC with 7.0.
 2016-08-21 00:12:47 -05:00
Aaron Piotrowski 08c5d77027 Revert "Fix closure tests using ReflectionType::__toString()" 
This reverts commit 6fcedc96fb.
 2016-08-20 23:26:01 -05:00