Merge remote-tracking branch 'upstream/master' into typofixes20130707

vlajos · vlajos · commit d6ece2887f54 · 2013-07-08T22:04:12.000+01:00
diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -559,6 +559,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
 		*p += null_count;
 	}
 
+	left = (*buf_len - (*p - *buf));
 /* 1. Store type information */
 	/*
 	  check if need to send the types even if stmt->send_types_to_server is 0. This is because
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
@@ -6,7 +6,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <name>oci8</name>
  <channel>pecl.php.net</channel>
  <summary>Extension for Oracle Database</summary>
- <description>This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x.  It can be linked with Oracle 9.2, 10.2, 11.1, or 11.2 client libraries.
+ <description>This extension allows you to access Oracle databases. It can be built with PHP 4.3.9 to 5.x.  It can be linked with Oracle 9.2, 10, 11, or 12.1 client libraries.
  </description>
  <lead>
   <name>Christopher Jones</name>
@@ -33,20 +33,20 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <active>no</active>
  </lead>
 
- <date>2012-10-21</date>
+ <date>2013-07-08</date>
  <time>12:00:00</time>
 
  <version>
-  <release>1.4.9</release>
-  <api>1.4.9</api>
+  <release>1.4.10</release>
+  <api>1.4.10</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-   Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
+   Bump PECL package info version check to allow PECL installs with PHP 5.5+
  </notes>
  <contents>
   <dir name="/">
@@ -397,7 +397,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <required>
    <php>
     <min>4.3.9</min>
-    <max>5.4.99</max>
+    <max>6.0.0</max>
    </php>
    <pearinstaller>
     <min>1.4.0b1</min>
@@ -410,6 +410,21 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+<release>
+ <version>
+  <release>1.4.9</release>
+  <api>1.4.9</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
+   Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
+ </notes>
+</release>
+
 <release>
  <version>
   <release>1.4.8</release>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "1.4.9"
+#define PHP_OCI8_VERSION "1.4.10"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -4212,6 +4212,7 @@ PHP_FUNCTION(pg_unescape_bytea)
 	to = (char *)php_pgsql_unescape_bytea((unsigned char*)from, &to_len);
 #endif
 	if (!to) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Failed to unescape");
 		RETURN_FALSE;
 	}
 	RETVAL_STRINGL(to, to_len, 0);
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -280,6 +280,7 @@ PHP_FUNCTION(hex2bin)
 	result = php_hex2bin((unsigned char *)data, datalen, &newlen);
 
 	if (!result) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input string must be hexadecimal string");
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/tests/array/array_column_basic.phpt b/ext/standard/tests/array/array_column_basic.phpt
@@ -178,7 +178,7 @@ array(3) {
 *** Testing multiple data types ***
 array(8) {
   [0]=>
-  object(stdClass)#1 (0) {
+  object(stdClass)#%d (0) {
   }
   [1]=>
   float(34.2345)
@@ -197,7 +197,7 @@ array(8) {
 }
 array(8) {
   [1]=>
-  object(stdClass)#1 (0) {
+  object(stdClass)#%d (0) {
   }
   [2]=>
   float(34.2345)

Original file line number	Diff line number	Diff line change
`@@ -559,6 +559,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar`
`559`	`559`	`*p += null_count;`
`560`	`560`	`}`
`561`	`561`
	`562`	`+ left = (buf_len - (p - *buf));`
`562`	`563`	`/* 1. Store type information */`
`563`	`564`	`/*`
`564`	`565`	`check if need to send the types even if stmt->send_types_to_server is 0. This is because`
Original file line number	Diff line number	Diff line change
`@@ -4212,6 +4212,7 @@ PHP_FUNCTION(pg_unescape_bytea)`
`4212`	`4212`	`to = (char )php_pgsql_unescape_bytea((unsigned char)from, &to_len);`
`4213`	`4213`	`#endif`
`4214`	`4214`	`if (!to) {`
	`4215`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Failed to unescape");`
`4215`	`4216`	`RETURN_FALSE;`
`4216`	`4217`	`}`
`4217`	`4218`	`RETVAL_STRINGL(to, to_len, 0);`
Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ PHP_FUNCTION(hex2bin)`
`280`	`280`	`result = php_hex2bin((unsigned char *)data, datalen, &newlen);`
`281`	`281`
`282`	`282`	`if (!result) {`
	`283`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input string must be hexadecimal string");`
`283`	`284`	`RETURN_FALSE;`
`284`	`285`	`}`
`285`	`286`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ array(3) {`
`178`	`178`	`* Testing multiple data types *`
`179`	`179`	`array(8) {`
`180`	`180`	`[0]=>`
`181`		`- object(stdClass)#1 (0) {`
	`181`	`+ object(stdClass)#%d (0) {`
`182`	`182`	`}`
`183`	`183`	`[1]=>`
`184`	`184`	`float(34.2345)`
`@@ -197,7 +197,7 @@ array(8) {`
`197`	`197`	`}`
`198`	`198`	`array(8) {`
`199`	`199`	`[1]=>`
`200`		`- object(stdClass)#1 (0) {`
	`200`	`+ object(stdClass)#%d (0) {`
`201`	`201`	`}`
`202`	`202`	`[2]=>`
`203`	`203`	`float(34.2345)`