delta/php-git.git/ext/sqlite3, branch php-7.1.1 git.php.net: repository/php-src.git Update copyright headers to 2017 2017-01-04T17:23:42+00:00 Sammy Kaye Powers sammyk@sammykmedia.com 2017-01-04T17:23:42+00:00 dac6c639bb54e93fb24b82d25f74daaa12763512 






Merge branch 'PHP-7.0' into PHP-7.1
2016-12-29T12:54:11+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-12-29T12:49:29+00:00

f4d884dc6e85126c7360e8bb99a9eb64831d6672

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





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







Merge branch 'PHP-5.6' into PHP-7.0
2016-12-29T12:47:28+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-12-29T12:31:18+00:00

88d1a2c5aab441fd322683f8d21667932aeec636

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

# Conflicts:
#	ext/sqlite3/sqlite3.c





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

# Conflicts:
#	ext/sqlite3/sqlite3.c







Revert "Fix #73530: Unsetting result set may reset other result set"
2016-12-29T11:59:04+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-12-29T11:41:39+00:00

2ba3b275948050ce600c5234b66e840b640ca5a5

This reverts commit eb570294a289b45d0dd38efc71065d6b0d314c4b.

That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.





This reverts commit eb570294a289b45d0dd38efc71065d6b0d314c4b.

That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.







Merge branch 'PHP-7.0' into PHP-7.1
2016-11-16T13:47:22+00:00

Dmitry Stogov
dmitry@zend.com

2016-11-16T13:47:22+00:00

1f3a5b45019d318179113b79d2b92fcb367c1ab7

* PHP-7.0:
  Fixed ZTS build





* PHP-7.0:
  Fixed ZTS build







Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2016-11-16T13:47:05+00:00

Dmitry Stogov
dmitry@zend.com

2016-11-16T13:47:05+00:00

99e5d6c4a5d3c0f985ab4ebabc487c6051dfe076

* 'PHP-7.0' of git.php.net:php-src:





* 'PHP-7.0' of git.php.net:php-src:







Merge branch 'PHP-7.0' into PHP-7.1
2016-11-16T11:02:29+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-11-16T11:01:55+00:00

c5abb873221e549f02ba0a7bbcc0a47e036e681e












Merge branch 'PHP-5.6' into PHP-7.0
2016-11-16T11:00:39+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-11-16T10:55:57+00:00

936cafe33e3115ea04df7902d6eac8d9f63f7fb6












Fix #73530: Unsetting result set may reset other result set
2016-11-16T10:49:04+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-11-16T10:49:04+00:00

eb570294a289b45d0dd38efc71065d6b0d314c4b

Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.





Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.







Update to SQLite 3.15.1
2016-11-14T13:55:13+00:00

Christoph M. Becker
cmbecker69@gmx.de

2016-11-14T13:55:13+00:00

d6c36e9af7ce43445b823e9a3b96868cf60fa7ed