diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2013-09-26 20:16:28 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2013-09-26 20:16:28 -0700 |
| commit | 577b10b214e769f5938c0c82129d3c790d86f61f (patch) | |
| tree | 4d8eaf9f5a2081762b6a0745ee5256608ede965c | |
| parent | 69454d9f0f765416f245acbc626b3984dcbf5e1d (diff) | |
| parent | ac05cfb49912dd87264573df930d0ead3c3e0cca (diff) | |
| download | php-git-577b10b214e769f5938c0c82129d3c790d86f61f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index ff42514721..2aaf3975db 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -362,8 +362,10 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ goto cleanup; } +#if PHP_DBLIB_IS_MSSQL /* dblib do not return more than this length from text/image */ DBSETOPT(H->link, DBTEXTLIMIT, "2147483647"); +#endif /* limit text/image from network */ DBSETOPT(H->link, DBTEXTSIZE, "2147483647"); |