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
96,944 Commits 549 Branches 1,485 Tags
efdc8ccd52203bff753fc786a3f2b09f6fcdf452
Commit Graph

96944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui efdc8ccd52 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals)

Conflicts:
	Zend/zend_compile.c
 2016-07-14 13:38:27 +08:00
Xinchen Hui 8c5b27e061 Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals) 2016-07-14 13:36:43 +08:00
Nikita Popov a0e5ffae6f Merge branch 'PHP-7.0' 2016-07-13 21:58:00 +02:00
Nikita Popov 61a2566dc9 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-13 21:57:14 +02:00
Nikita Popov 3cc4265527 Add NEWS entry 2016-07-13 21:57:01 +02:00
Nikita Popov 981b94e0cf Merge branch 'PHP-7.0' 2016-07-13 21:52:40 +02:00
Nikita Popov 57c9983619 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/reflection/php_reflection.c
 2016-07-13 21:48:05 +02:00
nikita2206 eb190b4e91 fix: bug72222 for PHP-5.6 reflection export of array consts 2016-07-13 21:39:55 +02:00
Dmitry Stogov e6f04d4c8e Unified behavior of modification of returned by reference value in finnally code. 2016-07-13 20:35:53 +03:00
Dmitry Stogov 02dca0cf16 Removed wrong warning 2016-07-13 20:04:47 +03:00
Dmitry Stogov afd3e39d66 Fixed bug #29368 (The destructor is called when an exception is thrown from the constructor). 2016-07-13 16:43:47 +03:00
Dmitry Stogov 3b8cb2119b Fixed bug #72347 (VERIFY_RETURN type casts visible in finally) 
Fixed bug #72216 (Return by reference with finally is not memory safe)
Fixed bug #72215 (Wrong return value if var modified in finally)
 2016-07-13 15:08:28 +03:00
Dmitry Stogov 0da7c08e39 Prevent wrong optimization 2016-07-13 15:05:11 +03:00
Anatol Belski fdc1f2e48f fix contirbutor name 2016-07-13 10:51:03 +02:00
Bob Weinand 517bbb14fd Disable optimizer when it conflicts with phpdbg tests 2016-07-13 10:22:00 +02:00
Keyur 7ed028b108 Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-07-13 03:15:03 +00:00
Keyur a35512f162 Merge branch 'master' of https://git.php.net/push/php-src 2016-07-13 03:10:02 +00:00
Keyur ffa863e800 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add to NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work
 2016-07-13 03:07:41 +00:00
Keyur 28e2f749e4 Add to NEWS 2016-07-13 03:03:26 +00:00
Keyur b512f4a956 Fixes #72590: Opcache restart with kill_all_lockers does not work 
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
 2016-07-13 03:01:26 +00:00
Xinchen Hui 488a6cb33e Update NEWS 2016-07-13 10:51:11 +08:00
Xinchen Hui f24ed8c2fe Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element)
 2016-07-13 10:50:15 +08:00
Xinchen Hui 8129b83992 Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element) 2016-07-13 10:49:58 +08:00
Bob Weinand 7a125a4409 Remove bogus zend_signal_shutdown symbol from header 2016-07-13 01:05:32 +02:00
Bob Weinand d08cb90462 Cleanup zend_/signal usage in phpdbg.c 2016-07-13 00:37:25 +02:00
Bob Weinand ef6d0c8b6d Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpoints 2016-07-12 20:50:51 +02:00
Keyur b31f8be143 Safer signal handler (no malloc() call) 2016-07-12 17:17:04 +02:00
Anatol Belski ff5228752f missed dot 2016-07-12 17:05:24 +02:00
Anatol Belski 9f6af81860 Merge branch 'PHP-7.0' 
* PHP-7.0:
  missed the dot
 2016-07-12 17:05:07 +02:00
Anatol Belski be77ce37fd missed the dot 2016-07-12 17:04:41 +02:00
Anatol Belski 4b1168d8b7 update NEWS 2016-07-12 17:02:39 +02:00
Anatol Belski 8c4f16a198 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-07-12 17:02:17 +02:00
Anatol Belski 3e6e590784 update NEWS 2016-07-12 17:01:51 +02:00
Julien Pauli f83b929d66 Updated NEWS 2016-07-12 15:55:01 +02:00
Julien Pauli 661b560c5f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 15:54:39 +02:00
Julien Pauli 6173488110 Updated NEWS 2016-07-12 15:51:23 +02:00
Julien Pauli 152d53c844 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 15:50:58 +02:00
Julien Pauli 1896ca4e88 Updated NEWS 2016-07-12 15:47:05 +02:00
Julien Pauli 822498128b Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT." 
This reverts commit 15336b44d9.
 2016-07-12 15:46:07 +02:00
Julien Pauli 5cce0d7c7c Revert "Fix test for #52384" 
This reverts commit 642e44b98f.
 2016-07-12 15:45:49 +02:00
Julien Pauli 8ca401f1b2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix test for #52384
 2016-07-12 15:28:13 +02:00
Julien Pauli c96a9ca6f5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test for #52384
 2016-07-12 15:27:57 +02:00
Julien Pauli 642e44b98f Fix test for #52384 2016-07-12 15:27:37 +02:00
Anatol Belski 8a641c7f4a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72569 DOTNET/COM array parameters broke in PHP7
 2016-07-12 14:59:30 +02:00
Anatol Belski 3e8dbb3e5d Fixed bug #72569 DOTNET/COM array parameters broke in PHP7 2016-07-12 14:58:50 +02:00
Christoph M. Becker 0667d60812 Merge branch 'PHP-7.0' 
# Resolved conflicts:
#	ext/intl/idn/idn.c
 2016-07-12 14:56:23 +02:00
Christoph M. Becker 5fbcc2b90f Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/intl/idn/idn.c
 2016-07-12 14:52:23 +02:00
Christoph M. Becker 76e249d31c Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain names 
We don't actually fix this issue wrt. the empty $info array, because it is
not clear what this array should contain and we're concerned about the
potential BC break, but at least we fix the inconsistent handling of
resulting domains with 255 bytes (which raise an error), and longer domains
(which just return FALSE), what has to be considered a very minor BC break
if at all.
 2016-07-12 14:47:14 +02:00
Anatol Belski cf8c12a6b0 update NEWS 2016-07-12 13:04:04 +02:00
Anatol Belski 661f17663a Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Make phpize set a proper build type (windows)
 2016-07-12 13:03:30 +02:00