diff options
| author | Andrey Hristov <andrey@php.net> | 2008-04-16 12:53:18 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-04-16 12:53:18 +0000 |
| commit | c931468b8818afb0f2b5b8a8b98ab9dfb4c1fecb (patch) | |
| tree | 57370b64c66dbdf2c7f34c09550001deec34fa6a /ext/mysqlnd/mysqlnd.c | |
| parent | 372be75ef5a13fd8665d1af438582954d150d5cf (diff) | |
| download | php-git-c931468b8818afb0f2b5b8a8b98ab9dfb4c1fecb.tar.gz | |
Update ext/mysql, ext/mysqli and ext/mysqlnd from development tree
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 82702254bc..d7d6b95d68 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -171,7 +171,7 @@ MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND *conn TSRMLS_DC) } if (conn->options.num_commands) { unsigned int i; - for (i=0; i < conn->options.num_commands; i++) { + for (i = 0; i < conn->options.num_commands; i++) { mnd_pefree(conn->options.init_commands[i], pers); } mnd_pefree(conn->options.init_commands, pers); @@ -477,7 +477,7 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, { char *transport = NULL, *errstr = NULL; char *hashed_details = NULL; - int transport_len, hashed_details_len, errcode = 0; + int transport_len, hashed_details_len, errcode = 0, host_len; unsigned int streams_options = ENFORCE_SAFE_MODE; unsigned int streams_flags = STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT; zend_bool self_alloced = FALSE; @@ -530,8 +530,9 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, if (!port && !socket) { port = 3306; } + host_len = strlen(host); #ifndef PHP_WIN32 - if (!strncasecmp(host, "localhost", sizeof("localhost") - 1)) { + if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) { if (!socket) { socket = "/tmp/mysql.sock"; } @@ -555,14 +556,6 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, } if (conn->persistent) { -#if 0 - struct timeval tv; - gettimeofday(&tv, NULL); - /* We should generate something unique */ - hashed_details_len = spprintf(&hashed_details, 0, "%s@%s@%s@%ld@%ld@%0.8F", - transport, user, db, tv.tv_sec, (long int)tv.tv_usec, - php_combined_lcg(TSRMLS_C) * 10); -#endif hashed_details_len = spprintf(&hashed_details, 0, "%p", conn); DBG_INF_FMT("hashed_details=%s", hashed_details); } |