Commit Graph

121 Commits

Author SHA1 Message Date
Matteo Beccati
730d7b8fca Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_statement.c
2015-06-12 02:08:30 +02:00
Matteo Beccati
3bb1a4ffe3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
2015-06-12 02:07:02 +02:00
Matteo Beccati
b60efdce9f Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) 2015-06-12 02:05:28 +02:00
Matteo Beccati
cd5b7e9688 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
	win32/install.txt
2015-06-12 00:27:31 +02:00
Matteo Beccati
afa4c3e7c7 Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:21:48 +02:00
Matteo Beccati
7c0b8f872e Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:20:33 +02:00
Anatol Belski
8cfe28259e Merge branch 'PHP-5.6'
* PHP-5.6:
  rework that test to allow delta for rounding errors
2015-06-11 17:07:24 +02:00
Anatol Belski
702e349df4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  rework that test to allow delta for rounding errors
2015-06-11 17:06:46 +02:00
Anatol Belski
a037b6de21 rework that test to allow delta for rounding errors
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
2015-06-11 17:05:03 +02:00
Anatol Belski
227680d6da Merge branch 'PHP-5.6'
* PHP-5.6:
  improve test
2015-06-11 15:37:06 +02:00
Anatol Belski
d777669679 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improve test
2015-06-11 15:36:30 +02:00
Anatol Belski
dcfd1153ec improve test 2015-06-11 15:36:02 +02:00
Anatol Belski
8ad5111d1c Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
2015-06-10 16:43:33 +02:00
Anatol Belski
effbc87ff1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
2015-06-10 16:41:07 +02:00
Philip Hofstetter
9ba3a4c66a fix memory leak in pdo_pgsql closeCursor (bug 69752)
the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.

This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.
2015-06-10 16:36:00 +02:00
Nikita Popov
4694e1c020 Remove PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
Use the generic ATTR_EMULATE_PREPARES instead.
2015-04-24 18:08:18 +02:00
Anatol Belski
bbc183d88a Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2015-03-14 18:31:02 +01:00
Anatol Belski
2ac31872ac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d fix test 2015-03-14 18:29:59 +01:00
Matteo Beccati
28ff513115 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS for #68371
  Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES
2015-01-05 11:03:50 +01:00
Matteo Beccati
3de6f80ff5 Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES 2015-01-05 11:00:11 +01:00
Matteo Beccati
7d0887a229 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:40 +01:00
Matteo Beccati
488d3dac2e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
2015-01-05 10:48:18 +01:00
Matteo Beccati
3e4b91ec7f Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names 2014-11-10 08:16:35 +01:00
Matteo Beccati
f5130c3058 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:35:49 +01:00
Matteo Beccati
8fccf0bac9 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 16:34:47 +01:00
Matteo Beccati
8fdc4d8797 Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) 2014-11-06 15:47:32 +01:00
Matteo Beccati
f9a77b71e2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:21:38 +01:00
Matteo Beccati
e12d69df0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66584 Segmentation fault on statement deallocation
2014-11-01 19:20:43 +01:00
Matteo Beccati
69f6aee35c Fixed bug #66584 Segmentation fault on statement deallocation 2014-11-01 19:19:56 +01:00
Matteo Beccati
ddcd221e5e Merge branch 'PHP-5.6'
* PHP-5.6:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:58:59 +01:00
Matteo Beccati
e797db8909 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
2014-10-31 18:57:59 +01:00
Matteo Beccati
9580fcfedd Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction 2014-10-31 18:11:32 +01:00
Matteo Beccati
9935bf7df7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
2014-10-17 16:48:58 +02:00
Matteo Beccati
8c5e2e66bc Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads) 2014-10-17 16:22:52 +02:00
Anatol Belski
4db2181d4e make this test a bit more tolerant when checking sleep time 2014-09-12 14:39:19 +02:00
Dmitry Stogov
9dd66e4d53 Merge branch 'master' into phpng
* master:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/date/php_date.c
2014-05-26 10:52:43 +04:00
Matteo Beccati
b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Improved test for bug #62479
2014-05-21 18:59:14 +02:00
Matteo Beccati
00a22d4d06 Improved test for bug #62479 2014-05-21 18:58:14 +02:00
Xinchen Hui
f2028491aa Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Conflicts:
	ext/pdo_pgsql/tests/common.phpt
2014-05-20 15:50:41 +08:00
Xinchen Hui
4d299b5092 Revert changes to configs by accident 2014-05-20 11:31:39 +08:00
Xinchen Hui
9c98c1f888 Refactored ext/ldap 2014-05-20 11:29:37 +08:00
Xinchen Hui
e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Matteo Beccati
e378348a31 Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
Faster than prepared statements when queries are run once. Slightly
slower than PDO::ATTR_EMULATE_PREPARES but without the potential
security implications of embedding parameters in the query itself.
2014-03-11 23:10:48 +01:00
Matteo Beccati
d72621ab9e Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT 2014-03-11 23:10:48 +01:00
Stanislav Malyshev
6d6850b3b8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test bug62479.phpt
2014-01-25 23:27:21 -08:00
Stanislav Malyshev
4e308abf28 fix test bug62479.phpt 2014-01-25 23:25:39 -08:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:40 -05:00
Michael Wallner
90218e8e7a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 19:22:31 +02:00