[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/basic_functions.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/basic_functions.c trunk/ext/standard/basic_functi

2009-10-15 Thread Ilia Alshanetsky 
iliaaThu, 15 Oct 2009 12:26:54 +

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

Log:
Fixed bug #49855 (import_request_variables() always returns NULL).

Bug: http://bugs.php.net/49855 (Verified) import_request_variables always 
return false in any codition.
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U   php/php-src/trunk/ext/standard/basic_functions.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-15 11:04:57 UTC (rev 289665)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-15 12:26:54 UTC (rev 289666)
@@ -11,6 +11,8 @@
 - Fixed crash when instantiating PDORow and PDOStatement through Reflection.
   (Felipe)

+- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
+  sjoerd at php dot net)
 - Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
   output lines 4095 bytes). (Ilia)
 - Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)

Modified: php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-10-15 
11:04:57 UTC (rev 289665)
+++ php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-10-15 
12:26:54 UTC (rev 289666)
@@ -6392,6 +6392,7 @@
char *types, *prefix;
uint prefix_len;
char *p;
+   zend_bool ok = 0;

switch (ZEND_NUM_ARGS()) {

@@ -6429,20 +6430,24 @@
case 'g':
case 'G':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]), 
(apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+   ok = 1;
break;

case 'p':
case 'P':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]), 
(apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]), 
(apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+   ok = 1;
break;

case 'c':
case 'C':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]), 
(apply_func_args_t) copy_request_variable, 2, prefix, prefix_len);
+   ok = 1;
break;
}
}
+   RETURN_BOOL(ok);
 }
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-10-15 11:04:57 UTC (rev 289665)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-10-15 12:26:54 UTC (rev 289666)
@@ -19,6 +19,8 @@
 - Fixed crash when instantiating PDORow and PDOStatement through Reflection.
   (Felipe)

+- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
+  sjoerd at php dot net)
 - Fixed bug #49847 (exec() fails to return data inside 2nd parameter, given
   output lines 4095 bytes). (Ilia)
 - Fixed bug #49809 (time_sleep_until() is not available on OpenSolaris). (Jani)

Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-10-15 
11:04:57 UTC (rev 289665)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-10-15 
12:26:54 UTC (rev 289666)
@@ -6048,6 +6048,7 @@
int types_len;
zval *prefix = NULL;
char *p;
+   zend_bool ok = 0;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|z/, types, 
types_len, prefix) == FAILURE) {
return;
@@ -6070,17 +6071,20 @@
case 'g':
case 'G':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+   ok = 1;
break;

case 'p':
case 'P':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c branches/PHP_5_3/sapi/cgi/cgi_main.c trunk/main/php_ini.c trunk/sapi/cgi/cgi_main.c

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 13:09:25 +

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

Log:
- #48779, fix another use case where / usage may differ

Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
  
Changed paths:
U   php/php-src/branches/PHP_5_3/main/php_ini.c
U   php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U   php/php-src/trunk/main/php_ini.c
U   php/php-src/trunk/sapi/cgi/cgi_main.c

Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-15 12:26:54 UTC (rev 
289666)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2009-10-15 13:09:25 UTC (rev 
289667)
@@ -793,10 +793,18 @@
zval *tmp;
char *ptr;

+#if PHP_WIN32
+   char path_bak[MAXPATHLEN];
+   memcpy(path_bak, path, path_len);
+   path_bak[path_len] = 0;
+   TRANSLATE_SLASHES_LOWER(path_bak);
+   path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found 
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config  path  path_len) {
ptr = path + 1;
-   while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+   while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from 
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len, 
(void **) tmp) == SUCCESS) {

Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-15 12:26:54 UTC 
(rev 289666)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2009-10-15 13:09:25 UTC 
(rev 289667)
@@ -818,10 +818,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
-   /* paths on windows should be case-insensitive */
-   zend_str_tolower(path, path_len);
-#endif

/* Activate per-dir-system-configuration defined in php.ini and 
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /* 
Note: for global settings sake we check from root to path */

Modified: php/php-src/trunk/main/php_ini.c
===
--- php/php-src/trunk/main/php_ini.c2009-10-15 12:26:54 UTC (rev 289666)
+++ php/php-src/trunk/main/php_ini.c2009-10-15 13:09:25 UTC (rev 289667)
@@ -800,10 +800,18 @@
zval *tmp;
char *ptr;

+#if PHP_WIN32
+   char path_bak[MAXPATHLEN];
+   memcpy(path_bak, path, path_len);
+   path_bak[path_len] = 0;
+   TRANSLATE_SLASHES_LOWER(path_bak);
+   path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found 
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config  path  path_len) {
ptr = path + 1;
-   while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+   while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from 
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len, 
(void **) tmp) == SUCCESS) {

Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c   2009-10-15 12:26:54 UTC (rev 
289666)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c   2009-10-15 13:09:25 UTC (rev 
289667)
@@ -815,10 +815,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
-   /* paths on windows should be case-insensitive */
-   zend_str_tolower(path, path_len);
-#endif

/* Activate per-dir-system-configuration defined in php.ini and 
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /* 
Note: for global settings sake we check from root to path */

-- 
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_1/ main/php_ini.c sapi/cgi/cgi_main.c tests/security/open_basedir_parse_ini_file.phpt

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 13:28:55 +

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

Log:
- Merge: - #48779, fix another use case where / usage may differ

Bug: http://bugs.php.net/48779 (Open) Use of HOST section cause 500 error
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_1/
_U  php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
U   php/php-src/branches/PHP_5_3_1/main/php_ini.c
U   php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
_U  
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
   - /php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:289667
/php/php-src/trunk:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
   - /php/php-src/trunk/ext/tidy/tests:284726,287798-287941
   + /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941

Modified: php/php-src/branches/PHP_5_3_1/main/php_ini.c
===
--- php/php-src/branches/PHP_5_3_1/main/php_ini.c   2009-10-15 13:09:25 UTC 
(rev 289667)
+++ php/php-src/branches/PHP_5_3_1/main/php_ini.c   2009-10-15 13:28:55 UTC 
(rev 289668)
@@ -793,10 +793,18 @@
zval *tmp;
char *ptr;

+#if PHP_WIN32
+   char path_bak[MAXPATHLEN];
+   memcpy(path_bak, path, path_len);
+   path_bak[path_len] = 0;
+   TRANSLATE_SLASHES_LOWER(path_bak);
+   path = path_bak;
+#endif
+
/* Walk through each directory in path and apply any found 
per-dir-system-configuration from configuration_hash */
if (has_per_dir_config  path  path_len) {
ptr = path + 1;
-   while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
+   while ((ptr = strchr(ptr, '/')) != NULL) {
*ptr = 0;
/* Search for source array matching the path from 
configuration_hash */
if (zend_hash_find(configuration_hash, path, path_len, 
(void **) tmp) == SUCCESS) {

Modified: php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c  2009-10-15 13:09:25 UTC 
(rev 289667)
+++ php/php-src/branches/PHP_5_3_1/sapi/cgi/cgi_main.c  2009-10-15 13:28:55 UTC 
(rev 289668)
@@ -818,10 +818,6 @@
path_len = zend_dirname(path, path_len);
}
path[path_len] = 0;
-#ifdef PHP_WIN32
-   /* paths on windows should be case-insensitive */
-   zend_str_tolower(path, path_len);
-#endif

/* Activate per-dir-system-configuration defined in php.ini and 
stored into configuration_hash during startup */
php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /* 
Note: for global settings sake we check from root to path */


Property changes on: 
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
   - /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
   + 
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:289667
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951

-- 
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_1/ ext/standard/basic_functions.c tests/security/open_basedir_parse_ini_file.phpt

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 14:10:03 +

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

Log:
- Merge: - #49855 ^# ^author ^date ^msg ^merge^

Bug: http://bugs.php.net/49855 (Closed) import_request_variables always return 
false in any codition.
  
Changed paths:
_U  php/php-src/branches/PHP_5_3_1/
_U  php/php-src/branches/PHP_5_3_1/ext/mysql/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqli/
_U  php/php-src/branches/PHP_5_3_1/ext/mysqlnd/
_U  php/php-src/branches/PHP_5_3_1/ext/pdo_mysql/
U   php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
_U  php/php-src/branches/PHP_5_3_1/ext/tidy/tests/
_U  
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt


Property changes on: php/php-src/branches/PHP_5_3_1
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3:289667
/php/php-src/trunk:284726
   + /php/php-src/branches/PHP_5_3:289666-289667
/php/php-src/trunk:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysql
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561
/php/php-src/trunk/ext/mysql:284726
   + /php/php-src/branches/PHP_5_3/ext/mysql:288202-289561,289666
/php/php-src/trunk/ext/mysql:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561
/php/php-src/trunk/ext/mysqli:284726
   + /php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289666
/php/php-src/trunk/ext/mysqli:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqlnd
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561
/php/php-src/trunk/ext/mysqlnd:284726
   + /php/php-src/branches/PHP_5_3/ext/mysqlnd:288202-289561,289666
/php/php-src/trunk/ext/mysqlnd:284726


Property changes on: php/php-src/branches/PHP_5_3_1/ext/pdo_mysql
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561
/php/php-src/trunk/ext/pdo_mysql:284726
   + /php/php-src/branches/PHP_5_3/ext/pdo_mysql:288202-289561,289666
/php/php-src/trunk/ext/pdo_mysql:284726

Modified: php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c   
2009-10-15 13:28:55 UTC (rev 289668)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/basic_functions.c   
2009-10-15 14:10:03 UTC (rev 289669)
@@ -6048,6 +6048,7 @@
int types_len;
zval *prefix = NULL;
char *p;
+   zend_bool ok = 0;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|z/, types, 
types_len, prefix) == FAILURE) {
return;
@@ -6070,17 +6071,20 @@
case 'g':
case 'G':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+   ok = 1;
break;

case 'p':
case 'P':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+   ok = 1;
break;

case 'c':
case 'C':

zend_hash_apply_with_arguments(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) 
TSRMLS_CC, (apply_func_args_t) copy_request_variable, 1, prefix);
+   ok = 1;
break;
}
}
@@ -6088,6 +6092,7 @@
if (ZEND_NUM_ARGS()  2) {
zval_ptr_dtor(prefix);
}
+   RETURN_BOOL(ok);
 }
 /* }}} */



Property changes on: php/php-src/branches/PHP_5_3_1/ext/tidy/tests
___
Modified: svn:mergeinfo
   - /php/php-src/branches/PHP_5_3/ext/tidy/tests:289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
   + /php/php-src/branches/PHP_5_3/ext/tidy/tests:289666-289667
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941


Property changes on: 
php/php-src/branches/PHP_5_3_1/tests/security/open_basedir_parse_ini_file.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli.c branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c bra

2009-10-15 Thread Ulf Wendel 
uw   Thu, 15 Oct 2009 15:49:40 +

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

Log:
Fixing problems when calling connect (again and again) on a valid connection 
handle. Most of the patch comes from Andrey.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
U   php/php-src/branches/PHP_5_3/ext/mysqli/php_mysqli_structs.h
A   
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
A   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_pconn_twice.phpt
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U   php/php-src/trunk/ext/mysqli/mysqli.c
U   php/php-src/trunk/ext/mysqli/mysqli_api.c
U   php/php-src/trunk/ext/mysqli/mysqli_libmysql.h
U   php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
U   php/php-src/trunk/ext/mysqli/php_mysqli_structs.h
A   php/php-src/trunk/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
A   php/php-src/trunk/ext/mysqli/tests/mysqli_pconn_twice.phpt
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c	2009-10-15 14:49:37 UTC (rev 289671)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c	2009-10-15 15:49:40 UTC (rev 289672)
@@ -228,22 +228,7 @@
 	if (my_res  my_res-ptr) {
 		MY_MYSQL *mysql = (MY_MYSQL *)my_res-ptr;
 		if (mysql-mysql) {
-			if (!mysql-persistent) {
-mysqli_close(mysql-mysql, MYSQLI_CLOSE_IMPLICIT);
-			} else {
-zend_rsrc_list_entry *le;
-if (zend_hash_find(EG(persistent_list), mysql-hash_key, strlen(mysql-hash_key) + 1, (void **)le) == SUCCESS) {
-	if (Z_TYPE_P(le) == php_le_pmysqli()) {
-		mysqli_plist_entry *plist = (mysqli_plist_entry *) le-ptr;
-
-		zend_ptr_stack_push(plist-free_links, mysql-mysql);
-
-		MyG(num_links)--;
-		MyG(num_active_persistent)--;
-		MyG(num_inactive_persistent)++;
-	}
-}
-			}
+			php_mysqli_close(mysql, MYSQLI_CLOSE_EXPLICIT TSRMLS_CC);
 		}
 		php_clear_mysql(mysql);
 		efree(mysql);

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c	2009-10-15 14:49:37 UTC (rev 289671)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c	2009-10-15 15:49:40 UTC (rev 289672)
@@ -552,22 +552,12 @@
 }
 /* }}} */

-/* {{{ proto bool mysqli_close(object link)
-   Close connection */
-PHP_FUNCTION(mysqli_close)
+
+/* {{{ php_mysqli_close */
+void php_mysqli_close(MY_MYSQL * mysql, int close_type TSRMLS_DC)
 {
-	zval		*mysql_link;
-	MY_MYSQL	*mysql;
-
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O, mysql_link, mysqli_link_class_entry) == FAILURE) {
-		return;
-	}
-
-	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link, MYSQLI_STATUS_INITIALIZED);
-
 	if (!mysql-persistent) {
-		mysqli_close(mysql-mysql, MYSQLI_CLOSE_EXPLICIT);
-		mysql-mysql = NULL;
+		mysqli_close(mysql-mysql, close_type);
 	} else {
 		zend_rsrc_list_entry *le;
 		if (zend_hash_find(EG(persistent_list), mysql-hash_key, strlen(mysql-hash_key) + 1, (void **)le) == SUCCESS) {
@@ -580,10 +570,30 @@
 MyG(num_inactive_persistent)++;
 			}
 		}
+		mysql-persistent = FALSE;
 	}
+	mysql-mysql = NULL;

 	php_clear_mysql(mysql);
+}
+/* }}} */

+
+/* {{{ proto bool mysqli_close(object link)
+   Close connection */
+PHP_FUNCTION(mysqli_close)
+{
+	zval		*mysql_link;
+	MY_MYSQL	*mysql;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O, mysql_link, mysqli_link_class_entry) == FAILURE) {
+		return;
+	}
+
+	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link, MYSQLI_STATUS_INITIALIZED);
+
+	php_mysqli_close(mysql, MYSQLI_CLOSE_EXPLICIT TSRMLS_CC);
+
 	MYSQLI_CLEAR_RESOURCE(mysql_link);
 	efree(mysql);
 	RETURN_TRUE;

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h	2009-10-15 14:49:37 UTC (rev 289671)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h	2009-10-15 15:49:40 UTC (rev 289672)
@@ -20,9 +20,9 @@
 */

 /* These are unused */
-#define MYSQLI_CLOSE_EXPLICIT
-#define MYSQLI_CLOSE_IMPLICIT
-#define MYSQLI_CLOSE_DISCONNECTED
+#define MYSQLI_CLOSE_EXPLICIT 0
+#define MYSQLI_CLOSE_IMPLICIT 1
+#define MYSQLI_CLOSE_DISCONNECTED 2
 #define MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE	200
 #define MYSQLND_OPT_INT_AND_YEAR_AS_INT201

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c branches/PHP_5_3/ext/mysqlnd/mysqlnd

2009-10-15 Thread Ulf Wendel 
uw   Thu, 15 Oct 2009 20:46:08 +

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

Log:
Making mysqlnd emit no warnings when fetching pooled persistent connections 
that have timed out or are unusable for any other reason - bug #49761

Bug: http://bugs.php.net/49761 (Assigned) Error while sending CHANGE_USER packet
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_libmysql_compat.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/trunk/ext/mysqli/mysqli_libmysql.h
U   php/php-src/trunk/ext/mysqli/mysqli_mysqlnd.h
U   php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_libmysql_compat.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h	2009-10-15 20:19:18 UTC (rev 289683)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_libmysql.h	2009-10-15 20:46:08 UTC (rev 289684)
@@ -34,3 +34,5 @@
 #define mysqli_close(c, is_forced)			mysql_close((c))
 #define mysqli_stmt_close(c, implicit)		mysql_stmt_close((c))
 #define mysqli_free_result(r, is_forced)	mysql_free_result((r))
+#define mysqli_change_user_silent(c, u, p, d)   mysql_change_user((c), (u), (p), (d))
+

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h	2009-10-15 20:19:18 UTC (rev 289683)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_mysqlnd.h	2009-10-15 20:46:08 UTC (rev 289684)
@@ -39,6 +39,7 @@
 #define mysqli_free_result(r, implicit)	mysqlnd_free_result((r), (implicit))
 #define mysqli_bg_store_result(r)		mysqlnd_bg_store_result((r))
 #define mysqli_async_query(c, q, l)		mysqlnd_async_query((c), (q), (l))
+#define mysqli_change_user_silent(c, u, p, d)   mysqlnd_change_user((c), (u), (p), (d), TRUE)

 #define HAVE_STMT_NEXT_RESULT


Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c	2009-10-15 20:19:18 UTC (rev 289683)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c	2009-10-15 20:46:08 UTC (rev 289684)
@@ -166,7 +166,7 @@
 			/* reset variables */

 #ifndef MYSQLI_NO_CHANGE_USER_ON_PCONNECT
-			if (!mysql_change_user(mysql-mysql, username, passwd, dbname)) {
+			if (!mysqli_change_user_silent(mysql-mysql, username, passwd, dbname)) {
 #else
 			if (!mysql_ping(mysql-mysql)) {
 #endif

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2009-10-15 20:19:18 UTC (rev 289683)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2009-10-15 20:46:08 UTC (rev 289684)
@@ -1825,7 +1825,8 @@
 MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
 		  const char *user,
 		  const char *passwd,
-		  const char *db TSRMLS_DC)
+		  const char *db,
+		  zend_bool silent TSRMLS_DC)
 {
 	/*
 	  User could be max 16 * 3 (utf8), pass is 20 usually, db is up to 64*3
@@ -1839,8 +1840,8 @@
 	char *p = buffer;

 	DBG_ENTER(mysqlnd_conn::change_user);
-	DBG_INF_FMT(conn=%llu user=%s passwd=%s db=%s,
-conn-thread_id, user?user:, passwd?***:null, db?db:);
+	DBG_INF_FMT(conn=%llu user=%s passwd=%s db=%s silent=%d,
+conn-thread_id, user?user:, passwd?***:null, db?db:, (silent == TRUE)?1:0 );

 	if (!user) {
 		user = ;
@@ -1877,7 +1878,7 @@

 	if (PASS != mysqlnd_simple_command(conn, COM_CHANGE_USER, buffer, p - buffer,
 	   PROT_LAST /* we will handle the OK packet*/,
-	   FALSE, TRUE TSRMLS_CC)) {
+	   silent, TRUE TSRMLS_CC)) {
 		DBG_RETURN(FAIL);
 	}


Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2009-10-15 20:19:18 UTC (rev 289683)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2009-10-15 20:46:08 UTC (rev 289684)
@@ -96,7 +96,7 @@
 		  MYSQLND_THD_ZVAL_PCACHE *zval_cache
 		  TSRMLS_DC);

-#define mysqlnd_change_user(conn, user, passwd, db)		(conn)-m-change_user((conn), (user), (passwd), (db) TSRMLS_CC)
+#define

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ configure.in

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 21:06:51 +

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

Log:
- Merge: #49809 (time_sleep_until is not available on solaris)

Bug: http://bugs.php.net/49809 (Closed) time_sleep_until is not available on 
solaris
  
Changed paths:
U   php/php-src/branches/PHP_5_3_1/configure.in

Modified: php/php-src/branches/PHP_5_3_1/configure.in
===
--- php/php-src/branches/PHP_5_3_1/configure.in 2009-10-15 20:46:08 UTC (rev 
289684)
+++ php/php-src/branches/PHP_5_3_1/configure.in 2009-10-15 21:06:51 UTC (rev 
289685)
@@ -402,6 +402,8 @@
 dnl in -lc, -lbind and -lresolv
 PHP_CHECK_FUNC(inet_aton, resolv, bind)

+dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+PHP_CHECK_FUNC(nanosleep, rt)

 dnl Then headers.
 dnl -
@@ -621,7 +623,6 @@
 unlockpt \
 unsetenv \
 usleep \
-nanosleep \
 utime \
 vsnprintf \
 vasprintf \

-- 
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_1/ext/date/lib/ timezonedb.h

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 21:29:00 +

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

Log:
- Merge: Updated to version 2009.14 (2009n)

Changed paths:
U   php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h

Modified: php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h
===
--- php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h2009-10-15 
21:06:51 UTC (rev 289685)
+++ php/php-src/branches/PHP_5_3_1/ext/date/lib/timezonedb.h2009-10-15 
21:29:00 UTC (rev 289686)
@@ -8144,7 +8144,7 @@
 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x16, 0x89, 
0x7E, 0xFC, 0xA4,
 0xCC, 0x95, 0x32, 0xA8, 0xD2, 0x74, 0x12, 0x98, 0xDD, 0xA8, 0xE0, 0xA8, 0x02, 
0x4F, 0xAB, 0x30,
 0x3C, 0xAF, 0x45, 0xEC, 0x3D, 0x9F, 0x28, 0xDC, 0x48, 0x41, 0xA0, 0x30, 0x49, 
0x0B, 0x47, 0xA0,
-0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xEC, 0x7B, 0x20, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
+0x49, 0xE4, 0xDD, 0x30, 0x4A, 0xC3, 0x9C, 0xA0, 0x01, 0x02, 0x01, 0x03, 0x05, 
0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x00, 0x00, 0x3E, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x58, 
0x00, 0x04, 0x00,
 0x00, 0x5B, 0x68, 0x01, 0x04, 0x00, 0x00, 0x46, 0x50, 0x00, 0x08, 0x00, 0x00, 
0x54, 0x60, 0x01,
 0x0D, 0x00, 0x00, 0x46, 0x50, 0x00, 0x12, 0x4C, 0x4D, 0x54, 0x00, 0x49, 0x53, 
0x54, 0x00, 0x4B,
@@ -18095,4 +18095,4 @@
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 
0x12, 0xA8, 0x80,
 0x00, 0x00, 0x00, 0x00, };

-const timelib_tzdb timezonedb_builtin = { 2009.13, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { 2009.14, 560, 
timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

-- 
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_1/ main/main.c win32/registry.c

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 21:32:24 +

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

Log:
- Merge: fix crash for bug #47627

Bug: http://bugs.php.net/47627 (Bogus) No input file specified causing crash
  
Changed paths:
U   php/php-src/branches/PHP_5_3_1/main/main.c
U   php/php-src/branches/PHP_5_3_1/win32/registry.c

Modified: php/php-src/branches/PHP_5_3_1/main/main.c
===
--- php/php-src/branches/PHP_5_3_1/main/main.c  2009-10-15 21:29:00 UTC (rev 
289686)
+++ php/php-src/branches/PHP_5_3_1/main/main.c  2009-10-15 21:32:24 UTC (rev 
289687)
@@ -2162,7 +2162,9 @@
char realfile[MAXPATHLEN];

 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;
@@ -2252,7 +2254,9 @@

zend_try {
 #ifdef PHP_WIN32
-   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   if(primary_file-filename) {
+   UpdateIniFromRegistry(primary_file-filename TSRMLS_CC);
+   }
 #endif

PG(during_request_startup) = 0;

Modified: php/php-src/branches/PHP_5_3_1/win32/registry.c
===
--- php/php-src/branches/PHP_5_3_1/win32/registry.c 2009-10-15 21:29:00 UTC 
(rev 289686)
+++ php/php-src/branches/PHP_5_3_1/win32/registry.c 2009-10-15 21:32:24 UTC 
(rev 289687)
@@ -168,6 +168,10 @@
int path_len;
HashTable **pht;

+   if(!path) {
+   return;
+   }
+
if (!PW32G(registry_directories)) {
PW32G(registry_directories) = 
(HashTable*)malloc(sizeof(HashTable));
zend_hash_init(PW32G(registry_directories), 0, NULL, 
delete_internal_hashtable, 1);

-- 
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_1/ext/standard/ exec.c

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 21:36:42 +

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

Log:
- Merge: #49847

Bug: http://bugs.php.net/49847 (Closed) exec() confused by a specially crafted 
string
  
Changed paths:
U   php/php-src/branches/PHP_5_3_1/ext/standard/exec.c

Modified: php/php-src/branches/PHP_5_3_1/ext/standard/exec.c
===
--- php/php-src/branches/PHP_5_3_1/ext/standard/exec.c  2009-10-15 21:32:24 UTC 
(rev 289687)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/exec.c  2009-10-15 21:36:42 UTC 
(rev 289688)
@@ -62,7 +62,7 @@
 {
FILE *fp;
char *buf, *tmp=NULL;
-   int l, pclose_return;
+   int l = 0, pclose_return;
char *cmd_p, *b, *c, *d=NULL;
php_stream *stream;
size_t buflen, bufl = 0;
@@ -157,13 +157,16 @@
}
if (bufl) {
/* strip trailing whitespaces if we have not done so 
already */
-   if (type != 2) {
+   if ((type == 2  bufl  !l) || type != 2) {
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
if (l != (int)(bufl - 1)) {
bufl = l + 1;
buf[bufl] = '\0';
}
+   if (type == 2) {
+   add_next_index_stringl(array, buf, 
bufl, 1);
+   }
}

/* Return last line from the shell command */

-- 
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_1/ext/sqlite3/libsqlite/ sqlite3.c sqlite3.h

2009-10-15 Thread Pierre-Alain Joye 
pajoye   Thu, 15 Oct 2009 21:40:36 +

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

Log:
- Merge: Upgraded bundled sqlite to versio 3.6.18

Changed paths:
U   php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.c
U   php/php-src/branches/PHP_5_3_1/ext/sqlite3/libsqlite/sqlite3.h

diffs exceeded maximum size
-- 
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/NEWS branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h trunk/ext/sqlite3/libsqlite/sqlite3.c trunk/ext/sql

2009-10-15 Thread Scott MacVicar 
scottmac Fri, 16 Oct 2009 01:56:36 +

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

Log:
Update libsqlite to 3.6.19

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c
U   php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h
U   php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c
U   php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h

diffs exceeded maximum size
-- 
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/NEWS branches/PHP_5_3/ext/standard/dns.c branches/PHP_5_3/ext/standard/php_dns.h trunk/ext/standard/dns.c trunk/ext/standard/php_dns.h

2009-10-15 Thread Scott MacVicar 
scottmac Fri, 16 Oct 2009 02:10:52 +

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

Log:
Part fix for bug #49224

Bug: http://bugs.php.net/49224 (Assigned) Segmentation fault
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/standard/dns.c
U   php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
U   php/php-src/trunk/ext/standard/dns.c
U   php/php-src/trunk/ext/standard/php_dns.h

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2009-10-16 01:56:36 UTC (rev 289690)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-10-16 02:10:52 UTC (rev 289691)
@@ -40,6 +40,8 @@
   cannot be set). (Felipe)
 - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after
   fclose). (Ilia)
+- Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
+  (Scott)
 - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
 - Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised).
   (Chris Jones)

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-10-16 01:56:36 UTC 
(rev 289690)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-10-16 02:10:52 UTC 
(rev 289691)
@@ -810,14 +810,8 @@
n = php_dns_search(handle, hostname, C_IN, 
type_to_fetch, answer.qb2, sizeof answer);

if (n  0) {
-   if (php_dns_errno(handle) == NO_DATA) {
-   php_dns_free_handle(handle);
-   continue;
-   }
-
php_dns_free_handle(handle);
-   zval_dtor(return_value);
-   RETURN_FALSE;
+   continue;
}

cp = answer.qb2 + HFIXEDSZ;

Modified: php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
===
--- php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2009-10-16 01:56:36 UTC 
(rev 289690)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2009-10-16 02:10:52 UTC 
(rev 289691)
@@ -28,8 +28,6 @@
((int)dns_search(res, dname, class, type, answer, anslen, (struct 
sockaddr *)from, fromsize))
 #define php_dns_free_handle(res) \
dns_free(res)
-#define php_dns_errno(_res) \
-   (NO_DATA)

 #elif defined(HAVE_RES_NSEARCH)
 #define php_dns_search(res, dname, class, type, answer, anslen) \
@@ -37,15 +35,11 @@
 #define php_dns_free_handle(res) \
res_nclose(res); \
php_dns_free_res(*res)
-#define php_dns_errno(res) \
-   (res-res_h_errno)

 #elif defined(HAVE_RES_SEARCH)
 #define php_dns_search(res, dname, class, type, answer, anslen) \
res_search(dname, class, type, answer, anslen)
 #define php_dns_free_handle(res) /* noop */
-#define php_dns_errno(res) \
-   (_res.res_h_errno)

 #endif


Modified: php/php-src/trunk/ext/standard/dns.c
===
--- php/php-src/trunk/ext/standard/dns.c2009-10-16 01:56:36 UTC (rev 
289690)
+++ php/php-src/trunk/ext/standard/dns.c2009-10-16 02:10:52 UTC (rev 
289691)
@@ -810,14 +810,8 @@
n = php_dns_search(handle, hostname, C_IN, 
type_to_fetch, answer.qb2, sizeof answer);

if (n  0) {
-   if (php_dns_errno(handle) == NO_DATA) {
-   php_dns_free_handle(handle);
-   continue;
-   }
-
php_dns_free_handle(handle);
-   zval_dtor(return_value);
-   RETURN_FALSE;
+   continue;
}

cp = answer.qb2 + HFIXEDSZ;

Modified: php/php-src/trunk/ext/standard/php_dns.h
===
--- php/php-src/trunk/ext/standard/php_dns.h2009-10-16 01:56:36 UTC (rev 
289690)
+++ php/php-src/trunk/ext/standard/php_dns.h2009-10-16 02:10:52 UTC (rev 
289691)
@@ -28,8 +28,6 @@
((int)dns_search(res, dname, class, type, answer, anslen, 
(struct sockaddr *)from, fromsize))
 #define php_dns_free_handle(res) \
dns_free(res)
-#define php_dns_errno(_res) \
-   (NO_DATA)

 #elif defined(HAVE_RES_NSEARCH)
 #define php_dns_search(res, dname, class, type, answer, anslen) \
@@ -38,15

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_sqlite/config.w32 branches/PHP_5_3/ext/sqlite3/config.w32 trunk/ext/pdo_sqlite/config.w32 trunk/ext/sqlite3/config.w32

2009-10-15 Thread Scott MacVicar 
scottmac Fri, 16 Oct 2009 02:22:48 +

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

Log:
Add metadata support to the bundled version of libsqlite on Windows, part of 
bug #49206.

Will commit the new feature part separately.

Bug: http://bugs.php.net/49206 (Assigned) PDO SQLite support for 
ATTR_FETCH_TABLE_NAMES and getColumnMeta fix
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32
U   php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32
U   php/php-src/trunk/ext/pdo_sqlite/config.w32
U   php/php-src/trunk/ext/sqlite3/config.w32

Modified: php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32  2009-10-16 
02:10:52 UTC (rev 289691)
+++ php/php-src/branches/PHP_5_3/ext/pdo_sqlite/config.w32  2009-10-16 
02:22:48 UTC (rev 289692)
@@ -4,7 +4,7 @@
 ARG_WITH(pdo-sqlite, for pdo_sqlite support, no);

 if (PHP_PDO_SQLITE != no) {
-   EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c, null, /DSQLITE_THREADSAFE= + (PHP_ZTS == yes ? 1 : 
0) +  /I + configure_module_dirname + /../sqlite3/libsqlite /I + 
configure_module_dirname);
+   EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c, null, /DSQLITE_THREADSAFE= + (PHP_ZTS == yes ? 1 : 
0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 /I + configure_module_dirname + /../sqlite3/libsqlite /I + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs

Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32 2009-10-16 02:10:52 UTC 
(rev 289691)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/config.w32 2009-10-16 02:22:48 UTC 
(rev 289692)
@@ -4,7 +4,7 @@
 ARG_WITH(sqlite3, SQLite 3 support, no);

 if (PHP_SQLITE3 != no) {
-   ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes 
? 1 : 0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+   ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes 
? 1 : 0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname 
+ /libsqlite /I + configure_module_dirname);

ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c, 
sqlite3);

Modified: php/php-src/trunk/ext/pdo_sqlite/config.w32
===
--- php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-10-16 02:10:52 UTC (rev 
289691)
+++ php/php-src/trunk/ext/pdo_sqlite/config.w32 2009-10-16 02:22:48 UTC (rev 
289692)
@@ -4,7 +4,7 @@
 ARG_WITH(pdo-sqlite, for pdo_sqlite support, no);

 if (PHP_PDO_SQLITE != no) {
-   EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c, null, /DSQLITE_THREADSAFE= + (PHP_ZTS == yes ? 1 : 
0) +  /I + configure_module_dirname + /../sqlite3/libsqlite /I + 
configure_module_dirname);
+   EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c, null, /DSQLITE_THREADSAFE= + (PHP_ZTS == yes ? 1 : 
0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 /I + configure_module_dirname + /../sqlite3/libsqlite /I + 
configure_module_dirname);

ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't 
add a second copy of the sqlite3 libs

Modified: php/php-src/trunk/ext/sqlite3/config.w32
===
--- php/php-src/trunk/ext/sqlite3/config.w322009-10-16 02:10:52 UTC (rev 
289691)
+++ php/php-src/trunk/ext/sqlite3/config.w322009-10-16 02:22:48 UTC (rev 
289692)
@@ -4,7 +4,7 @@
 ARG_WITH(sqlite3, SQLite 3 support, no);

 if (PHP_SQLITE3 != no) {
-   ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes 
? 1 : 0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+   ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes 
? 1 : 0) +  /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D 
SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname 
+ /libsqlite /I + configure_module_dirname);

ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c, 
sqlite3);

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