Merge branch 'PHP-5.4' into PHP-5.5

Stanley Sufficool · Stanley Sufficool · commit 577b10b214e7 · 2013-09-26T20:16:28.000-07:00
* PHP-5.4:
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
diff --git 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");

Original file line number	Diff line number	Diff line change
`@@ -362,8 +362,10 @@ static int pdo_dblib_handle_factory(pdo_dbh_t dbh, zval driver_options TSRMLS_`
`362`	`362`	`goto cleanup;`
`363`	`363`	`}`
`364`	`364`
	`365`	`+#if PHP_DBLIB_IS_MSSQL`
`365`	`366`	`/* dblib do not return more than this length from text/image */`
`366`	`367`	`DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");`
	`368`	`+#endif`
`367`	`369`
`368`	`370`	`/* limit text/image from network */`
`369`	`371`	`DBSETOPT(H->link, DBTEXTSIZE, "2147483647");`