Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c

diff --cc NEWS
index d22471418ee6043f1e593c70b52b8da7b0b99d53,e957009839eb5849b70299709bb1734d4408ab62..90c68e23bd0e59d21bf1ff23b13918556f900991
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,71 -1,23 +1,75 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ?? 2017, PHP 5.6.30
 +?? ??? 2016 PHP 7.0.15
  
 -- GD:
 -  . Fixed bug #73549 (Use after free when stream is passed to imagepng). (cmb)
 +- Core:
 +  . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)
 +  . Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created
 +    with list()). (Laruence)
 +  . Fixed bug #73585 (Logging of "Internal Zend error - Missing class
 +    information" missing class name). (Laruence)
 +  . Fixed bug #73753 (unserialized array pointer not advancing). (David Walker)
  
 -- Intl:
 -  . Fixed bug #68447 (grapheme_extract take an extra trailing character). 
 -    (SATŌ Kentarō)
 +- COM:
 +  . Fixed bug #73679 (DOTNET read access violation using invalid codepage).
 +    (Anatol)
 +
 +- Mysqlnd:
 +  . Fixed issue with decoding BIT columns when having more than one rows in the
 +    result set. 7.0+ problem. (Andrey)
 +
 +- PCRE:
 +  . Fixed bug #73612 (preg_*() may leak memory). (cmb)
 +
 +- PDO_Firebird:
 +  . Fixed bug #72931 (PDO_FIREBIRD with Firebird 3.0 not work on returning
 +    statement). (Dorin Marcoci)
 +
 +- Streams:
 +  . Fixed bug #73586 (php_user_filter::$stream is not set to the stream the
 +    filter is working on). (Dmitry)
 +
 +- Phpdbg:
 +  . Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup).
 +    (Bob)
 +  . Fixed issue getting executable lines from custom wrappers. (Bob)
 +  . Fixed bug #73704 (phpdbg shows the wrong line in files with shebang). (Bob)
 +
 +- Reflection:
 +  . Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
  
 -08 Dec 2016, PHP 5.6.29
+ - SQLite3:
+   . Reverted fix for bug #73530       (Unsetting result set may reset other result
+     set). (cmb)
+ 
 +- Standard:
 +  . Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
 +    (Bruce Weirdan)
  
 -- Mbstring:
 -  . Fixed bug #73505 (string length overflow in mbfl_memory_device_output
 -    function). (Stas)
 +- Zlib:
 +  . Fixed bug #73373 (deflate_add does not verify that output was not truncated).
 +    (Matt Bonneau)
 +
 +08 Dec 2016 PHP 7.0.14
 +
 +- Core:
 +  . Fixed memory leak(null coalescing operator with Spl hash). (Tyson Andre)
 +  . Fixded bug #72736 (Slow performance when fetching large dataset with mysqli
 +    / PDO). (Dmitry)
 +
 +- Calendar:
 +  . Fix integer overflows (Joshua Rogers)
 +
 +- Date:
 +  . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
 +
 +- DTrace:
 +  . Disabled PHP call tracing by default (it makes significant overhead).
 +    This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
 +    (Dmitry)
 +
 +- JSON:
 +  . Fixed bug #73526 (php_json_encode depth issue). (Jakub Zelenka)
  
  - Mysqlnd:
    . Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb)

diff --cc ext/sqlite3/sqlite3.c
index b3f0a29f5ce91e6798b7178f49ac071cc6b80c4c,80d6b897f1bc7c6664591ef3b620afedad7730c0..23d0b97b431a316cecf7545393fd6141f795c1db
--- 1/ext/sqlite3/sqlite3.c
--- 2/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -2166,12 -2183,21 +2166,15 @@@ static void php_sqlite3_result_object_f
                return;
        }
  
 -      if (intern->stmt_obj_zval) {
 -              if (intern->stmt_obj->initialised) {
 +      if (!Z_ISNULL(intern->stmt_obj_zval)) {
++              if (intern->stmt_obj && intern->stmt_obj->initialised) {
+                       sqlite3_reset(intern->stmt_obj->stmt);
+               }
  
 -              if (intern->is_prepared_statement == 0) {
 -                      zval_dtor(intern->stmt_obj_zval);
 -                      FREE_ZVAL(intern->stmt_obj_zval);
 -              } else {
 -                      zval_ptr_dtor(&intern->stmt_obj_zval);
 -              }
 +              zval_ptr_dtor(&intern->stmt_obj_zval);
        }
  
 -      zend_object_std_dtor(&intern->zo TSRMLS_CC);
 -      efree(intern);
 +      zend_object_std_dtor(&intern->zo);
  }
  /* }}} */