Update to 5.2.12 release.

1 files changed, 0 insertions, 70 deletions

diff --git a/databases/php5-pgsql/files/patch-pgsql.c b/databases/php5-pgsql/files/patch-pgsql.c
index ecc1fdd2f193..6ca128cb2095 100644
--- a/databases/php5-pgsql/files/patch-pgsql.c
+++ b/databases/php5-pgsql/files/patch-pgsql.c
@@ -28,73 +28,3 @@
  {
  	register int i = strlen(message)-1;
  
-@@ -363,7 +366,7 @@
- 		if (PGG(log_notices)) {
- 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);
- 		}
--		zend_hash_index_update(&PGG(notices), (int)resource_id, (void **)&notice, sizeof(php_pgsql_notice *), NULL);
-+		zend_hash_index_update(&PGG(notices), (ulong)resource_id, (void **)&notice, sizeof(php_pgsql_notice *), NULL);
- 	}
- }
- /* }}} */
-@@ -761,13 +764,14 @@
- 		 */
- 		if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
- 			&& zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **) &index_ptr)==SUCCESS) {
--			int type,link;
-+			int type;
-+			ulong link;
- 			void *ptr;
- 
- 			if (Z_TYPE_P(index_ptr) != le_index_ptr) {
- 				RETURN_FALSE;
- 			}
--			link = (int) index_ptr->ptr;
-+			link = (uintptr_t /* ulong is as wide or wider than pointer */) index_ptr->ptr;
- 			ptr = zend_list_find(link,&type);   /* check if the link is still there */
- 			if (ptr && (type==le_link || type==le_plink)) {
- 				Z_LVAL_P(return_value) = link;
-@@ -1748,12 +1752,15 @@
- 
- 
- 	if (return_oid) {
-+#if UINT_MAX > LONG_MAX /* Oid is unsigned int, we don't need this code, where LONG is wider */
- 		if (oid > LONG_MAX) {
- 			smart_str oidstr = {0};
- 			smart_str_append_unsigned(&oidstr, oid);
- 			smart_str_0(&oidstr);
- 			RETURN_STRINGL(oidstr.c, oidstr.len, 0);
--		} else {
-+		} else
-+#endif
-+		{
- 			RETURN_LONG((long)oid);
- 		}
- 	}
-@@ -1854,6 +1861,7 @@
- 			
- 			oid = PQftype(pgsql_result, Z_LVAL_PP(field));
- 
-+#if UINT_MAX > LONG_MAX
- 			if (oid > LONG_MAX) {
- 				smart_str s = {0};
- 				smart_str_append_unsigned(&s, oid);
-@@ -1863,6 +1871,7 @@
- 				Z_TYPE_P(return_value) = IS_STRING;
- 			}
- 			else
-+#endif
- 			{
- 				Z_LVAL_P(return_value) = (long)oid;
- 				Z_TYPE_P(return_value) = IS_LONG;
-@@ -5741,8 +5750,8 @@
- {
- 	zval *row;
- 	char *field_name, *element, *data;
--	size_t num_fields, element_len, data_len;
--	int pg_numrows, pg_row;
-+	size_t num_fields, element_len;
-+	int pg_numrows, pg_row, data_len;
- 	uint i;
- 	assert(Z_TYPE_P(ret_array) == IS_ARRAY);
-