diff options
| author | Andrey Hristov <andrey@php.net> | 2010-06-17 11:37:49 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-06-17 11:37:49 +0000 |
| commit | ae4ae5a3132ad98f1dcd47b99b1090e45e53731e (patch) | |
| tree | 0c92ed21997a215757badde5cc3ee3b30ad32381 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | c4c6b69b645c12ab42c36f88e9201a97e2e02855 (diff) | |
| download | php-git-ae4ae5a3132ad98f1dcd47b99b1090e45e53731e.tar.gz | |
split mysqlnd_connect() in two parts, one doing the authorization
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 0dd076d28e..b5887c2f81 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -405,11 +405,6 @@ void php_mysqlnd_greet_free_mem(void *_packet, zend_bool alloca TSRMLS_DC) /* }}} */ -#define MYSQLND_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | \ - CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | \ - CLIENT_MULTI_RESULTS) - - /* {{{ php_mysqlnd_crypt */ static void php_mysqlnd_crypt(zend_uchar *buffer, const zend_uchar *s1, const zend_uchar *s2, size_t len) @@ -465,16 +460,6 @@ size_t php_mysqlnd_auth_write(void *_packet, MYSQLND * conn TSRMLS_DC) DBG_ENTER("php_mysqlnd_auth_write"); - packet->client_flags |= MYSQLND_CAPABILITIES; - - if (packet->db) { - packet->client_flags |= CLIENT_CONNECT_WITH_DB; - } - - if (PG(open_basedir) && strlen(PG(open_basedir))) { - packet->client_flags ^= CLIENT_LOCAL_FILES; - } - int4store(p, packet->client_flags); p+= 4; |