[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c

2011-08-02 Thread Andrey Hristov 
andrey   Tue, 02 Aug 2011 14:18:56 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=314109

Log:
completely compile out a currently non-needed function

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U   php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U   php/php-src/trunk/ext/mysql/php_mysql.c

Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-08-02 14:10:28 UTC 
(rev 314108)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-08-02 14:18:56 UTC 
(rev 314109)
@@ -608,7 +608,7 @@
 /* }}} */


-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
 static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
 {
if (le-type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}

-#if defined(A0)  MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
zend_hash_apply(EG(persistent_list), (apply_func_t) 
php_mysql_persistent_helper TSRMLS_CC);
 #endif


Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-08-02 14:10:28 UTC 
(rev 314108)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-08-02 14:18:56 UTC 
(rev 314109)
@@ -608,7 +608,7 @@
 /* }}} */


-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
 static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
 {
if (le-type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}

-#if defined(A0)  MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
zend_hash_apply(EG(persistent_list), (apply_func_t) 
php_mysql_persistent_helper TSRMLS_CC);
 #endif


Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-02 14:10:28 UTC (rev 
314108)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-02 14:18:56 UTC (rev 
314109)
@@ -608,7 +608,7 @@
 /* }}} */


-#ifdef MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
 static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
 {
if (le-type == le_plink) {
@@ -637,7 +637,7 @@
efree(MySG(connect_error));
}

-#if defined(A0)  MYSQL_USE_MYSQLND
+#if defined(A0)  defined(MYSQL_USE_MYSQLND)
zend_hash_apply(EG(persistent_list), (apply_func_t) 
php_mysql_persistent_helper TSRMLS_CC);
 #endif


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c

2011-05-18 Thread Johannes Schlüter 
johannes Wed, 18 May 2011 11:49:49 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311181

Log:
- handle out of memory

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U   php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U   php/php-src/trunk/ext/mysql/php_mysql.c

Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-05-18 11:33:55 UTC 
(rev 311180)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-05-18 11:49:49 UTC 
(rev 311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-05-18 11:33:55 UTC 
(rev 311180)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-05-18 11:49:49 UTC 
(rev 311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-05-18 11:33:55 UTC (rev 
311180)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-05-18 11:49:49 UTC (rev 
311181)
@@ -830,6 +830,9 @@
}
/* create the link */
mysql = (php_mysql_conn *) 
malloc(sizeof(php_mysql_conn));
+   if (!mysql) {
+   php_error_docref(NULL TSRMLS_CC, E_ERROR, Out 
of memory while allocating memory for a persistent link);
+   }
mysql-active_result_id = 0;
 #ifdef CLIENT_MULTI_STATEMENTS
mysql-multi_query = client_flags  
CLIENT_MULTI_STATEMENTS? 1:0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php