no need to fetch ts id here
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.

Conflicts:
	ext/mysqlnd/mysqlnd_structs.h
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Use /dev/urandom as the default mcrypt_create_iv() source
  Add tests for bug #66872 and gmp_[rem]root
  Fixed mcrypt test case
  Removed bogus loops
  restored the old code in 5.4/5 related to bug #66872

Conflicts:
	ext/mcrypt/mcrypt.c
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  fix path separator
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  fix path separator
  Use /dev/urandom as the default mcrypt_create_iv() source
  Add tests for bug #66872 and gmp_[rem]root
  Fixed mcrypt test case
  Removed bogus loops
  restored the old code in 5.4/5 related to bug #66872
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Updated NEWS
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
  Fix compile error with theoretically supported versions of libcurl < 7.12.3.

Conflicts:
	ext/pdo_pgsql/pdo_pgsql.c
	ext/pdo_pgsql/pgsql_driver.c
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  Updated NEWS
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
  Fix compile error with theoretically supported versions of libcurl < 7.12.3.
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Remove unneeded test
  Update NEWS
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
  made libgd recognize the 9 version series
  fix include search
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
  Add SKIPIF in GMP test
  Fix hash_pbkdf2() with missing $length argument
  typo in NEWS
  typo in NEWS
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
  Updated UPGRADING to cover PDO_pgsql changes

Conflicts:
	ext/gd/gd.c
	ext/hash/hash.c
	ext/session/session.c
fix zpp
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  fix zpp
  Remove unneeded test
  Update NEWS
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
  made libgd recognize the 9 version series
  fix include search
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
  Add SKIPIF in GMP test
  Fix hash_pbkdf2() with missing $length argument
  typo in NEWS
  typo in NEWS
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
  Updated UPGRADING to cover PDO_pgsql changes
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
fix macro
fix array types for pass by ref
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  updated libs_version.txt
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  fix array types for pass by ref
  fix macro
  updated libs_version.txt
Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master: