details: http://hg.nginx.org/nginx/rev/4b420f9c4c5d
branches:
changeset: 6484:4b420f9c4c5d
user: Ruslan Ermilov <ru@nginx.com>
date: Thu Mar 31 22:33:26 2016 +0300
description:
Removed the prototype mysql module.

diffstat:

contrib/vim/syntax/nginx.vim | 2 +-
misc/GNUmakefile | 2 -
src/core/ngx_log.c | 2 +-
src/core/ngx_log.h | 3 +-
src/mysql/config | 13 -
src/mysql/ngx_http_mysql_test.c | 204 -----------------
src/mysql/ngx_mysql.c | 465 ----------------------------------------
src/mysql/ngx_mysql.h | 85 -------
8 files changed, 3 insertions(+), 773 deletions(-)

diffs (839 lines):

diff -r 3a50ccd94333 -r 4b420f9c4c5d contrib/vim/syntax/nginx.vim
--- a/contrib/vim/syntax/nginx.vim Thu Mar 31 22:00:33 2016 +0300
+++ b/contrib/vim/syntax/nginx.vim Thu Mar 31 22:33:26 2016 +0300
@@ -57,6 +57,7 @@ syn keyword ngxDirectiveError post_actio
syn keyword ngxDirectiveDeprecated connections
syn keyword ngxDirectiveDeprecated imap
syn keyword ngxDirectiveDeprecated limit_zone
+syn keyword ngxDirectiveDeprecated mysql_test
syn keyword ngxDirectiveDeprecated open_file_cache_retest
syn keyword ngxDirectiveDeprecated optimize_server_names
syn keyword ngxDirectiveDeprecated satisfy_any
@@ -246,7 +247,6 @@ syn keyword ngxDirective mp4_max_buffer_
syn keyword ngxDirective msie_padding
syn keyword ngxDirective msie_refresh
syn keyword ngxDirective multi_accept
-syn keyword ngxDirective mysql_test
syn keyword ngxDirective open_file_cache
syn keyword ngxDirective open_file_cache_errors
syn keyword ngxDirective open_file_cache_events
diff -r 3a50ccd94333 -r 4b420f9c4c5d misc/GNUmakefile
--- a/misc/GNUmakefile Thu Mar 31 22:00:33 2016 +0300
+++ b/misc/GNUmakefile Thu Mar 31 22:33:26 2016 +0300
@@ -20,8 +20,6 @@ release: export
rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
rm -r $(TEMP)/$(NGINX)/src/os/win32

- rm -r $(TEMP)/$(NGINX)/src/mysql
-
mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
diff -r 3a50ccd94333 -r 4b420f9c4c5d src/core/ngx_log.c
--- a/src/core/ngx_log.c Thu Mar 31 22:00:33 2016 +0300
+++ b/src/core/ngx_log.c Thu Mar 31 22:33:26 2016 +0300
@@ -86,7 +86,7 @@ static ngx_str_t err_levels[] = {

static const char *debug_levels[] = {
"debug_core", "debug_alloc", "debug_mutex", "debug_event",
- "debug_http", "debug_mail", "debug_mysql", "debug_stream"
+ "debug_http", "debug_mail", "debug_stream"
};


diff -r 3a50ccd94333 -r 4b420f9c4c5d src/core/ngx_log.h
--- a/src/core/ngx_log.h Thu Mar 31 22:00:33 2016 +0300
+++ b/src/core/ngx_log.h Thu Mar 31 22:33:26 2016 +0300
@@ -29,8 +29,7 @@
#define NGX_LOG_DEBUG_EVENT 0x080
#define NGX_LOG_DEBUG_HTTP 0x100
#define NGX_LOG_DEBUG_MAIL 0x200
-#define NGX_LOG_DEBUG_MYSQL 0x400
-#define NGX_LOG_DEBUG_STREAM 0x800
+#define NGX_LOG_DEBUG_STREAM 0x400

/*
* do not forget to update debug_levels[] in src/core/ngx_log.c
diff -r 3a50ccd94333 -r 4b420f9c4c5d src/mysql/config
--- a/src/mysql/config Thu Mar 31 22:00:33 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-
-ngx_addon_name=ngx_mysql
-
-HTTP_MODULES="$HTTP_MODULES ngx_http_mysql_test_module"
-
-HTTP_INCS="$HTTP_INCS $ngx_addon_dir"
-HTTP_DEPS="$HTTP_DEPS $ngx_addon_dir/ngx_mysql.h"
-#CORE_LIBS="$CORE_LIBS -lmd"
-
-USE_SHA1=YES
-
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_mysql.c"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mysql_test.c"
diff -r 3a50ccd94333 -r 4b420f9c4c5d src/mysql/ngx_http_mysql_test.c
--- a/src/mysql/ngx_http_mysql_test.c Thu Mar 31 22:00:33 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_mysql.h>
-#include <ngx_http.h>
-
-
-typedef struct {
- ngx_addr_t *peers;
- ngx_uint_t npeers;
-} ngx_http_mysql_test_conf_t;
-
-
-static void ngx_http_mysql_auth(ngx_mysql_t *m);
-static void ngx_http_mysql_done(ngx_mysql_t *m);
-static void *ngx_http_mysql_test_create_loc_conf(ngx_conf_t *cf);
-static char *ngx_http_mysql_test(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);
-
-static ngx_command_t ngx_http_mysql_test_commands[] = {
-
- { ngx_string("mysql_test"),
- NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
- ngx_http_mysql_test,
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- NULL },
-
- ngx_null_command
-};
-
-
-static ngx_http_module_t ngx_http_mysql_test_module_ctx = {
- NULL, /* preconfiguration */
- NULL, /* postconfiguration */
-
- NULL, /* create main configuration */
- NULL, /* init main configuration */
-
- NULL, /* create server configuration */
- NULL, /* merge server configuration */
-
- ngx_http_mysql_test_create_loc_conf, /* create location configuration */
- NULL /* merge location configuration */
-};
-
-
-ngx_module_t ngx_http_mysql_test_module = {
- NGX_MODULE_V1,
- &ngx_http_mysql_test_module_ctx, /* module context */
- ngx_http_mysql_test_commands, /* module directives */
- NGX_HTTP_MODULE, /* module type */
- NULL, /* init master */
- NULL, /* init module */
- NULL, /* init process */
- NULL, /* init thread */
- NULL, /* exit thread */
- NULL, /* exit process */
- NULL, /* exit master */
- NGX_MODULE_V1_PADDING
-};
-
-
-static ngx_str_t ngx_mysql_login = ngx_string("root");
-static ngx_str_t ngx_mysql_passwd = ngx_string("tp");
-static ngx_str_t ngx_mysql_database = ngx_string("mysql");
-static ngx_str_t ngx_mysql_command_query =
- ngx_string("select * from user");
-
-
-static ngx_int_t
-ngx_http_mysql_test_handler(ngx_http_request_t *r)
-{
- ngx_int_t rc;
- ngx_mysql_t *m;
- ngx_http_mysql_test_conf_t *mtcf;
-
- mtcf = ngx_http_get_module_loc_conf(r, ngx_http_mysql_test_module);
-
- m = ngx_pcalloc(r->pool, sizeof(ngx_mysql_t));
-
- if (m == NULL) {
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
- }
-
- m->pool = r->pool;
- m->handler = ngx_http_mysql_auth;
- m->data = r;
-
- m->login = &ngx_mysql_login;
- m->passwd = &ngx_mysql_passwd;
- m->database = &ngx_mysql_database;
-
- /* STUB */
- m->peer.sockaddr = mtcf->peers[0].sockaddr;
- m->peer.socklen = mtcf->peers[0].socklen;
- m->peer.name = &mtcf->peers[0].name;
- m->peer.tries = mtcf->npeers;
- m->peer.get = ngx_event_get_peer;
- /**/
- m->peer.log = r->connection->log;
- m->peer.log_error = NGX_ERROR_ERR;
-
- rc = ngx_mysql_connect(m);
-
- if (rc == NGX_OK || rc == NGX_AGAIN) {
- return NGX_DONE;
- }
-
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
-static void
-ngx_http_mysql_auth(ngx_mysql_t *m)
-{
- ngx_http_request_t *r;
-
- r = m->data;
-
- if (m->state != NGX_OK) {
- ngx_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
- return;
- }
-
- m->query.len = NGX_MYSQL_CMDPKT_LEN + ngx_mysql_command_query.len;
-
- m->query.data = ngx_pnalloc(r->pool, m->query.len);
- if (m->query.data == NULL) {
- ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
- return;
- }
-
- ngx_memcpy(m->query.data + NGX_MYSQL_CMDPKT_LEN,
- ngx_mysql_command_query.data, ngx_mysql_command_query.len);
-
- m->handler = ngx_http_mysql_done;
-
- ngx_mysql_query(m);
-}
-
-
-static void
-ngx_http_mysql_done(ngx_mysql_t *m)
-{
- ngx_http_request_t *r;
-
- r = m->data;
-
- ngx_http_finalize_request(r, NGX_HTTP_NO_CONTENT);
-}
-
-
-static void *
-ngx_http_mysql_test_create_loc_conf(ngx_conf_t *cf)
-{
- ngx_http_mysql_test_conf_t *conf;
-
- conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_mysql_test_conf_t));
- if (conf == NULL) {
- return NGX_CONF_ERROR;
- }
-
- return conf;
-}
-
-static char *
-ngx_http_mysql_test(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
- ngx_http_mysql_test_conf_t *mtcf = conf;
-
- ngx_str_t *value;
- ngx_url_t u;
- ngx_http_core_loc_conf_t *clcf;
-
- clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
- clcf->handler = ngx_http_mysql_test_handler;
-
- value = cf->args->elts;
-
- ngx_memzero(&u, sizeof(ngx_url_t));
-
- u.url = value[1];
- u.default_port = 3306;
-
- if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
- if (u.err) {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "%s in upstream \"%V\"", u.err, &u.url);
- }
-
- return NGX_CONF_ERROR;
- }
-
- mtcf->peers = u.addrs;
- mtcf->npeers = u.naddrs;
-
- return NGX_CONF_OK;
-}
diff -r 3a50ccd94333 -r 4b420f9c4c5d src/mysql/ngx_mysql.c
--- a/src/mysql/ngx_mysql.c Thu Mar 31 22:00:33 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,465 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-/* the library supports the subset of the MySQL 4.1+ protocol (version 10) */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include <ngx_event_connect.h>
-#include <ngx_mysql.h>
-#include <ngx_sha1.h>
-
-
-#define NGX_MYSQL_LONG_PASSWORD 0x0001
-#define NGX_MYSQL_CONNECT_WITH_DB 0x0008
-#define NGX_MYSQL_PROTOCOL_41 0x0200
-#define NGX_MYSQL_SECURE_CONNECTION 0x8000
-
-
-#define NGX_MYSQL_CMD_QUERY 3
-
-
-typedef struct {
- u_char pktlen[3];
- u_char pktn;
-
- u_char protocol;
- u_char version[1]; /* NULL-terminated string */
-} ngx_mysql_greeting1_pkt_t;
-
-
-typedef struct {
- u_char thread[4];
- u_char salt1[9];
- u_char capacity[2];
- u_char charset;
- u_char status[2];
- u_char zero[13];
- u_char salt2[13];
-} ngx_mysql_greeting2_pkt_t;
-
-
-typedef struct {
- u_char pktlen[3];
- u_char pktn;
-
- u_char capacity[4];
- u_char max_packet[4];
- u_char charset;
- u_char zero[23];
- u_char login[1]; /* NULL-terminated string */
-
- /*
- * u_char passwd_len; 0 if no password
- * u_char passwd[20];
- *
- * u_char database[1]; NULL-terminated string
- */
-
-} ngx_mysql_auth_pkt_t;
-
-
-typedef struct {
- u_char pktlen[3];
- u_char pktn;
- u_char fields;
-} ngx_mysql_response_pkt_t;
-
-
-typedef struct {
- u_char pktlen[3];
- u_char pktn;
- u_char err;
- u_char code[2];
- u_char message[1]; /* string */
-} ngx_mysql_error_pkt_t;
-
-
-typedef struct {
- u_char pktlen[3];
- u_char pktn;
- u_char command;
- u_char arg[1]; /* string */
-} ngx_mysql_command_pkt_t;
-
-
-static void ngx_mysql_read_server_greeting(ngx_event_t *rev);
-static void ngx_mysql_empty_handler(ngx_event_t *wev);
-static void ngx_mysql_read_auth_result(ngx_event_t *rev);
-static void ngx_mysql_read_query_result(ngx_event_t *rev);
-static void ngx_mysql_close(ngx_mysql_t *m, ngx_int_t rc);
-
-
-ngx_int_t
-ngx_mysql_connect(ngx_mysql_t *m)
-{
- ngx_int_t rc;
-
-#if 0
- if (cached) {
- return NGX_OK;
- }
-#endif
-
- m->peer.log->action = "connecting to mysql server";
-
- rc = ngx_event_connect_peer(&m->peer);
-
- if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) {
- return rc;
- }
-
- m->peer.connection->data = m;
-
- m->peer.connection->read->handler = ngx_mysql_read_server_greeting;
- m->peer.connection->write->handler = ngx_mysql_empty_handler;
-
- ngx_add_timer(m->peer.connection->read, /* STUB */ 5000);
-
- return NGX_OK;
-}
-
-
-static void
-ngx_mysql_read_server_greeting(ngx_event_t *rev)
-{
- size_t len;
- u_char *p;
- ssize_t n;
- ngx_uint_t i, capacity;
- ngx_mysql_t *m;
- ngx_connection_t *c;
- ngx_mysql_greeting1_pkt_t *gr1;
- ngx_mysql_greeting2_pkt_t *gr2;
- ngx_mysql_auth_pkt_t *auth;
- ngx_sha1_t sha;
- u_char hash1[20], hash2[20];
-
- c = rev->data;
- m = c->data;
-
- if (rev->timedout) {
- ngx_log_error(NGX_LOG_ERR, rev->log, NGX_ETIMEDOUT,
- "mysql server %V timed out", m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- if (m->buf == NULL) {
- m->peer.log->action = "reading mysql server greeting";
-
- m->buf = ngx_create_temp_buf(m->pool, /* STUB */ 1024);
- if (m->buf == NULL) {
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
- }
-
- n = ngx_recv(m->peer.connection, m->buf->pos, /* STUB */ 1024);
-
- if (n == NGX_AGAIN) {
- return;
- }
-
- if (n < 5) {
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- gr1 = (ngx_mysql_greeting1_pkt_t *) m->buf->pos;
-
- if (ngx_m24toh(gr1->pktlen) > n - 4) {
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent incomplete greeting packet",
- m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- if (gr1->protocol < 10) {
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent unsupported protocol version %ud",
- m->peer.name, gr1->protocol);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- gr2 = (ngx_mysql_greeting2_pkt_t *)
- (gr1->version + ngx_strlen(gr1->version) + 1);
-
- capacity = ngx_m16toh(gr2->capacity);
-
- ngx_log_debug8(NGX_LOG_DEBUG_MYSQL, rev->log, 0,
- "mysql version: %ud, \"%s\", thread: %ud, salt: \"%s\", "
- "capacity: %Xd, charset: %ud, status: %ud, salt rest \"%s\"",
- gr1->protocol, gr1->version, ngx_m32toh(gr2->thread),
- gr2->salt1, capacity, gr2->charset,
- ngx_m16toh(gr2->status), &gr2->salt2);
-
- capacity = NGX_MYSQL_LONG_PASSWORD
- | NGX_MYSQL_CONNECT_WITH_DB
- | NGX_MYSQL_PROTOCOL_41
- | NGX_MYSQL_SECURE_CONNECTION;
-
- len = 4 + 4 + 4 + 1 + 23 + m->login->len + 1 + 1 + m->database->len + 1;
-
- if (m->passwd->len) {
- len += 20;
- }
-
- auth = ngx_pnalloc(m->pool, len);
- if (auth == NULL) {
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- ngx_htom24(auth->pktlen, len - 4);
- auth->pktn = (u_char) (gr1->pktn + 1);
-
- ngx_htom32(auth->capacity, capacity);
- ngx_htom32(auth->max_packet, 0x01000000); /* max packet size 2^24 */
- ngx_memzero(auth->zero, 24);
- auth->charset = gr2->charset;
-
- p = ngx_copy(auth->login, m->login->data, m->login->len);
- *p++ = '\0';
-
- if (m->passwd->len) {
-
- *p++ = (u_char) 20;
-
- ngx_sha1_init(&sha);
- ngx_sha1_update(&sha, m->passwd->data, m->passwd->len);
- ngx_sha1_final(hash1, &sha);
-
- ngx_sha1_init(&sha);
- ngx_sha1_update(&sha, hash1, 20);
- ngx_sha1_final(hash2, &sha);
-
- ngx_sha1_init(&sha);
- ngx_sha1_update(&sha, gr2->salt1, 8);
- ngx_sha1_update(&sha, gr2->salt2, 12);
- ngx_sha1_update(&sha, hash2, 20);
- ngx_sha1_final(hash2, &sha);
-
- for (i = 0; i < 20; i++) {
- *p++ = (u_char) (hash1[i] ^ hash2[i]);
- }
-
- } else {
- *p++ = '\0';
- }
-
- p = ngx_copy(p, m->database->data, m->database->len);
- *p = '\0';
-
-
- n = ngx_send(m->peer.connection, (void *) auth, len);
-
- if (n < (ssize_t) len) {
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "the incomplete packet was sent to mysql server %V",
- m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- m->peer.connection->read->handler = ngx_mysql_read_auth_result;
-
- ngx_add_timer(m->peer.connection->read, /* STUB */ 5000);
-}
-
-
-static void
-ngx_mysql_empty_handler(ngx_event_t *wev)
-{
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, "mysql empty handler");
-
- return;
-}
-
-
-static void
-ngx_mysql_read_auth_result(ngx_event_t *rev)
-{
- ssize_t n, len;
- ngx_str_t msg;
- ngx_mysql_t *m;
- ngx_connection_t *c;
- ngx_mysql_error_pkt_t *epkt;
- ngx_mysql_response_pkt_t *pkt;
-
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "mysql read auth");
-
- c = rev->data;
- m = c->data;
-
- m->peer.log->action = "reading mysql auth result";
-
- n = ngx_recv(m->peer.connection, m->buf->pos, /* STUB */ 1024);
-
- if (n == NGX_AGAIN) {
- return;
- }
-
- if (n < 5) {
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- pkt = (ngx_mysql_response_pkt_t *) m->buf->pos;
-
- len = ngx_m24toh(pkt->pktlen);
-
- if (len > n - 4) {
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent incomplete response packet",
- m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- if (pkt->fields == 0) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "mysql auth OK");
-
- m->state = NGX_OK;
- m->pktn = 0;
-
- m->handler(m);
-
- return;
- }
-
- epkt = (ngx_mysql_error_pkt_t *) pkt;
-
- msg.len = (u_char *) epkt + 4 + len - epkt->message;
- msg.data = epkt->message;
-
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent error (%ud): \"%V\"",
- m->peer.name, ngx_m16toh(epkt->code), &msg);
-
- ngx_mysql_close(m, NGX_ERROR);
-}
-
-
-ngx_int_t
-ngx_mysql_query(ngx_mysql_t *m)
-{
- ssize_t n;
- ngx_mysql_command_pkt_t *pkt;
-
- pkt = (ngx_mysql_command_pkt_t *) m->query.data;
-
- ngx_htom24(pkt->pktlen, m->query.len - 4);
- pkt->pktn = (u_char) m->pktn++;
- pkt->command = NGX_MYSQL_CMD_QUERY;
-
- n = ngx_send(m->peer.connection, m->query.data, m->query.len);
-
- if (n < (ssize_t) m->query.len) {
- ngx_log_error(NGX_LOG_ERR, m->peer.log, 0,
- "the incomplete packet was sent to mysql server %V",
- m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return NGX_OK;
- }
-
- m->peer.connection->read->handler = ngx_mysql_read_query_result;
-
- ngx_add_timer(m->peer.connection->read, /* STUB */ 5000);
-
- /* STUB handle event */
-
- return NGX_OK;
-}
-
-
-static void
-ngx_mysql_read_query_result(ngx_event_t *rev)
-{
- ssize_t n, len;
- ngx_str_t msg;
- ngx_mysql_t *m;
- ngx_connection_t *c;
- ngx_mysql_error_pkt_t *epkt;
- ngx_mysql_response_pkt_t *pkt;
-
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "mysql read query result");
-
- c = rev->data;
- m = c->data;
-
- m->peer.log->action = "reading mysql read query result";
-
- n = ngx_recv(m->peer.connection, m->buf->pos, /* STUB */ 1024);
-
- if (n == NGX_AGAIN) {
- return;
- }
-
- if (n < 5) {
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- pkt = (ngx_mysql_response_pkt_t *) m->buf->pos;
-
- len = ngx_m24toh(pkt->pktlen);
-
- if (len > n - 4) {
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent incomplete response packet",
- m->peer.name);
-
- ngx_mysql_close(m, NGX_ERROR);
- return;
- }
-
- if (pkt->fields != 0xff) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "mysql query OK");
-
- m->state = NGX_OK;
- m->pktn = pkt->pktn;
-
- m->handler(m);
-
- return;
- }
-
- epkt = (ngx_mysql_error_pkt_t *) pkt;
-
- msg.len = (u_char *) epkt + 4 + len - epkt->message;
- msg.data = epkt->message;
-
- ngx_log_error(NGX_LOG_ERR, rev->log, 0,
- "mysql server %V sent error (%ud): \"%V\"",
- m->peer.name, ngx_m16toh(epkt->code), &msg);
-
- ngx_mysql_close(m, NGX_ERROR);
-}
-
-
-static void
-ngx_mysql_close(ngx_mysql_t *m, ngx_int_t rc)
-{
- if (rc == NGX_ERROR) {
- ngx_close_connection(m->peer.connection);
- }
-
- m->state = rc;
-
- m->handler(m);
-}
diff -r 3a50ccd94333 -r 4b420f9c4c5d src/mysql/ngx_mysql.h
--- a/src/mysql/ngx_mysql.h Thu Mar 31 22:00:33 2016 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-#ifndef _NGX_MYSQL_H_INCLUDED_
-#define _NGX_MYSQL_H_INCLUDED_
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-#include <ngx_event_connect.h>
-
-
-typedef struct ngx_mysql_s ngx_mysql_t;
-
-typedef void (*ngx_mysql_handler_pt)(ngx_mysql_t *m);
-
-
-struct ngx_mysql_s {
- ngx_peer_connection_t peer;
-
- ngx_buf_t *buf;
- ngx_pool_t *pool;
-
- ngx_str_t *login;
- ngx_str_t *passwd;
- ngx_str_t *database;
-
- ngx_str_t query;
-
- ngx_uint_t pktn;
-
- ngx_mysql_handler_pt handler;
- void *data;
- ngx_int_t state;
-
-};
-
-
-#define NGX_MYSQL_CMDPKT_LEN 5
-
-
-#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED && 0)
-
-#define ngx_m16toh(n) (*(uint32_t *) n & 0x0000ffff)
-#define ngx_m24toh(n) (*(uint32_t *) n & 0x00ffffff)
-#define ngx_m32toh(n) *(uint32_t *) n
-
-#define ngx_htom16(n, m) *(uint16_t *) n = (uint16_t) ((m) & 0xffff)
-
-#define ngx_htom24(n, m) (n)[0] = (u_char) ((m) & 0xff); \
- (n)[1] = (u_char) (((m) >> 8) & 0xff); \
- (n)[2] = (u_char) (((m) >> 16) & 0xff)
-
-#define ngx_htom32(n, m) *(uint32_t *) (n) = (m)
-
-#else
-
-#define ngx_m16toh(n) (n[0] | n[1] << 8)
-#define ngx_m24toh(n) (n[0] | n[1] << 8 | n[2] << 16)
-#define ngx_m32toh(n) (n[0] | n[1] << 8 | n[2] << 16 | n[3] << 24)
-
-#define ngx_htom16(n, m) (n)[0] = (u_char) (m); (n)[1] = (u_char) ((m) >> 8)
-
-#define ngx_htom24(n, m) (n)[0] = (u_char) ((m) & 0xff); \
- (n)[1] = (u_char) (((m) >> 8) & 0xff); \
- (n)[2] = (u_char) (((m) >> 16) & 0xff)
-
-#define ngx_htom32(n, m) (n)[0] = (u_char) ((m) & 0xff); \
- (n)[1] = (u_char) (((m) >> 8) & 0xff); \
- (n)[2] = (u_char) (((m) >> 16) & 0xff); \
- (n)[3] = (u_char) (((m) >> 24) & 0xff)
-
-#endif
-
-
-ngx_int_t ngx_mysql_connect(ngx_mysql_t *m);
-ngx_int_t ngx_mysql_query(ngx_mysql_t *m);
-
-
-#endif /* _NGX_MYSQL_H_INCLUDED_ */

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel