diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-13 11:05:09 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-13 11:05:09 +0000 |
| commit | 6cefa510d606d6161bd1df709c2912dff75ecaec (patch) | |
| tree | eff69c729a809f2873246c774d1f8ca4bacaa350 /ext/mysqli/mysqli_nonapi.c | |
| parent | fdfdb1480e81fe12402efc0480512982f40aacf2 (diff) | |
| download | php-git-6cefa510d606d6161bd1df709c2912dff75ecaec.tar.gz | |
Better fix for #51605
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 34fec47d40..3267529b60 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -124,7 +124,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } if (mysql->mysql && mysqli_resource && mysqli_resource->status > MYSQLI_STATUS_INITIALIZED) { /* already connected, we should close the connection */ - php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT TSRMLS_CC); + php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT, mysqli_resource->status TSRMLS_CC); } if (!socket_len || !socket) { @@ -199,11 +199,11 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } } } - if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MyG(num_links)); goto err; } + if (persistent && MyG(max_persistent) != -1 && (MyG(num_active_persistent) + MyG(num_inactive_persistent))>= MyG(max_persistent)) { |