Commit Graph

75012 Commits

Author SHA1 Message Date
Remi Collet
245e103ed3 NEWS 2013-06-03 14:17:00 +02:00
Remi Collet
99ea60c2dd Fixed Bug #64961 segfault in imagesetinterpolation
enum type are not long ;) so cannot be used as zend_parse_parameters arg.
2013-06-03 14:15:18 +02:00
Matteo Beccati
760099c2e6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:45 +02:00
Matteo Beccati
ad135fc69f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:38 +02:00
Matteo Beccati
7360f0f1e6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Clean up leftover test files
2013-06-02 13:39:19 +02:00
Matteo Beccati
2463e89794 Clean up leftover test files 2013-06-02 13:38:43 +02:00
Matteo Beccati
a98359b7b9 Improved test portability so that it doesn't fail with pdo_pgsql 2013-06-02 13:32:48 +02:00
Nikita Popov
cbf90b1a90 Fix PDO::inTransaction() test for pgsql
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
2013-06-02 13:28:30 +02:00
Matteo Beccati
ab25fcb2a1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:14 +02:00
Matteo Beccati
d5a1c0cae2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:05 +02:00
Matteo Beccati
51c065f611 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:33:54 +02:00
Matteo Beccati
25aae37229 Fixed bug #64609 (pg_convert enum type support) 2013-06-02 06:29:35 +02:00
Matteo Beccati
924605eeb4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:31 +02:00
Matteo Beccati
d9c2eecec0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:14 +02:00
Matteo Beccati
de42833115 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62857 (bytea test failures)
2013-06-01 23:22:50 +02:00
Matteo Beccati
79803bebde Fixed bug #62857 (bytea test failures)
Postgres 9.1+ test fixes. Tests were failing due to the default
standard_conforming_strings GUC being changed to on. Also the
pg_escape_bytea test was encoding the data before estabilishing
a connection, thus falling back to the old escaping type which
isn't properly handled by the backend when using a default
configuration.

I haven't updated the NEWS file as it's just test fixes.
2013-06-01 23:15:48 +02:00
Stanley Sufficool
c34a2757db FIX BUG #55647
PDO DBLIB was returning false if there were no results after a
statement was executed. This should be the fetch methods response
not the execute method response.
2013-06-01 00:38:09 -07:00
Stanley Sufficool
d9be9e0231 FIX BUG #60512 (the correct way this time)
Last fix just truncated the password. This fixes the message
handler per the bug report.
2013-06-01 00:03:44 -07:00
Stanley Sufficool
3b54de3db0 FIX BUG #60512
FreeTDS will segfault when passwords over 30 characters are used.
Truncate the password and let the server return an error if the
password is still invalid.
2013-05-31 23:58:16 -07:00
Stanley Sufficool
317653e694 FIX BUG #61900
PDO DBLIB was not setting error and message handlers when FreeTDS was used.
Updated to set error and message handlers the same way as mssql.
2013-05-31 23:24:57 -07:00
Stanley Sufficool
0e2bcf3373 FIX BUG #64338, #64808, #63638
PDO DBLIB would segfault on getcolumn meta when colno was
out of bounds. DBLIB connection specified null arg to dbsetopt
per Microsoft technical docs, but FreeTDS complains. The SQL USE
statement was invalid for SQL Azure, use DBSETLDBNAME instead.
2013-05-31 22:53:08 -07:00
Matteo Beccati
d22c7368e7 Merge branch 'PHP-5.5' 2013-05-31 16:27:16 +02:00
Matteo Beccati
d19e46d9d4 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-31 16:27:01 +02:00
Matteo Beccati
a3b5b42e77 Merge branch 'PHP-5.3' into PHP-5.4 2013-05-31 16:26:54 +02:00
Matteo Beccati
598e2690b8 Merge branch 'pull-request/309' into PHP-5.3 2013-05-31 16:26:38 +02:00
Matteo Beccati
bf4a034e3e NEWS 2013-05-31 16:26:06 +02:00
Matteo Beccati
510498947e Slightly edited tests and fix for bug #62024 2013-05-31 16:19:58 +02:00
Matheus Degiovani
df6ca450ce Fixed bug #62024 (unable to run consecutive prepared querys with null values)
Credits to james@kenjim.com for the patch.
2013-05-31 14:30:57 +02:00
Matheus Degiovani
65d233f06c Fixed bug #64037 (wrong value returned when using a negative numeric field equal to the scale) 2013-05-31 14:30:51 +02:00
Remi Collet
f8b4c0815a Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
  Use size_t everywhere instead
  This needs to be a long Otherwise we are limited to a 32G opcache segment
2013-05-31 08:46:18 +02:00
Remi Collet
c829895a1a NEWS 2013-05-31 08:45:54 +02:00
Remi Collet
f3ca1d3125 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:45:32 +02:00
Remi Collet
0c9f11758f NEWS 2013-05-31 08:45:09 +02:00
Remi Collet
2dd67abb7d Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
2013-05-31 08:44:33 +02:00
Remi Collet
1c623e3b07 Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
There is a lot of call such as:
	pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed");
Where the 3rd paramater is a error message string where a sqlstate (5 chars)
is expected. This cause a segfault in copy_from.phpt and copy_to.phpt.

This is only a sanity check to avoid buffer overflow, but obviously this
calls need to be fixed (using NULL or a correct sqlstate).
2013-05-31 08:39:32 +02:00
Stanley Sufficool
0074cd2675 pdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobbered results from subsequent statement objects sharing the same connection 2013-05-30 21:59:00 -07:00
Rasmus Lerdorf
4c762152bf Use size_t everywhere instead 2013-05-29 14:34:53 -07:00
Rasmus Lerdorf
e02add77fc Use size_t everywhere instead 2013-05-29 14:34:22 -07:00
Rasmus Lerdorf
80c13e9965 This needs to be a long
Otherwise we are limited to a 2G opcache segment
2013-05-29 14:26:42 -07:00
Rasmus Lerdorf
29ee4b81f2 This needs to be a long
Otherwise we are limited to a 32G opcache segment
2013-05-29 14:22:43 -07:00
Dmitry Stogov
029c1da846 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed incorrect argument number
2013-05-29 11:15:27 +04:00
Dmitry Stogov
7e00d0994f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed incorrect argument number
2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed incorrect argument number

Conflicts:
	Zend/zend_compile.c
2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd Fixed incorrect argument number 2013-05-29 11:09:55 +04:00
Dmitry Stogov
ad90e90d90 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:37 +04:00
Dmitry Stogov
9e019f1099 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:13 +04:00
Dmitry Stogov
458f02c471 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed crash during search in empty persistent HashTable
2013-05-29 00:01:35 +04:00
Dmitry Stogov
6008ac8e32 Fixed crash during search in empty persistent HashTable 2013-05-28 23:45:36 +04:00
Anthony Ferrara
2129c70896 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Anthony Ferrara
540a5a52e8 Fix #64745 hash_pbkdf2 truncation issue
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
2013-05-28 15:30:45 -04:00