diff options
| author | Derick Rethans <github@derickrethans.nl> | 2013-10-28 15:08:57 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2013-10-28 15:08:57 +0100 |
| commit | 7a526f01b53e1183ba285192f7ddb0eb4b5b91ad (patch) | |
| tree | 49bcb49c4b787c79d6d0a6fec9f0421d40e881e7 | |
| parent | 9cb3a759a78f26c5af3e20ef9b3143fa0809db52 (diff) | |
| parent | e50eb1ce3408d15cd26fd88203c68f52e59f6b0b (diff) | |
| download | php-git-7a526f01b53e1183ba285192f7ddb0eb4b5b91ad.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -16,6 +16,10 @@ PHP NEWS - FTP: . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter) +- ODBC + . Fixed bug #65950 (Field name truncation if the field name is bigger than + 32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo) + - Sockets: . Fixed bug #65808 (the socket_connect() won't work with IPv6 address). (Mike) diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index ca237c0537..c00583b16a 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -232,7 +232,7 @@ typedef struct odbc_connection { } odbc_connection; typedef struct odbc_result_value { - char name[32]; + char name[256]; char *value; SQLLEN vallen; SQLLEN coltype; |