aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/ngx_array.h2
-rw-r--r--src/core/ngx_connection.c153
-rw-r--r--src/core/ngx_connection.h4
-rw-r--r--src/core/ngx_log.c3
-rw-r--r--src/core/ngx_log.h8
-rw-r--r--src/event/ngx_event.h1
-rw-r--r--src/event/ngx_event_connect.c2
-rw-r--r--src/http/modules/ngx_http_userid_filter.c3
-rw-r--r--src/http/modules/proxy/ngx_http_proxy_handler.c4
-rw-r--r--src/http/modules/proxy/ngx_http_proxy_handler.h2
-rw-r--r--src/http/ngx_http.c42
-rw-r--r--src/http/ngx_http_core_module.c12
-rw-r--r--src/http/ngx_http_core_module.h4
-rw-r--r--src/http/ngx_http_parse.c1
-rw-r--r--src/http/ngx_http_request.c101
-rw-r--r--src/imap/ngx_imap.c29
-rw-r--r--src/imap/ngx_imap.h32
-rw-r--r--src/imap/ngx_imap_handler.c46
-rw-r--r--src/imap/ngx_imap_parse.c68
-rw-r--r--src/os/unix/ngx_freebsd_init.c2
-rw-r--r--src/os/unix/ngx_linux_init.c2
-rw-r--r--src/os/unix/ngx_os.h3
-rw-r--r--src/os/unix/ngx_send.c63
-rw-r--r--src/os/unix/ngx_solaris_init.c2
-rw-r--r--src/os/win32/ngx_os.h2
25 files changed, 427 insertions, 164 deletions
diff --git a/src/core/ngx_array.h b/src/core/ngx_array.h
index 848596cdf..fadb203fb 100644
--- a/src/core/ngx_array.h
+++ b/src/core/ngx_array.h
@@ -41,5 +41,7 @@ ngx_inline static ngx_int_t ngx_array_init(ngx_array_t *array, ngx_pool_t *pool,
ngx_test_null(a.elts, ngx_palloc(p, n * s), rc); \
a.nelts = 0; a.size = s; a.nalloc = n; a.pool = p;
+#define ngx_array_push ngx_push_array
+
#endif /* _NGX_ARRAY_H_INCLUDED_ */
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index d5de07675..5fc99b39e 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -7,6 +7,55 @@
ngx_os_io_t ngx_io;
+ngx_listening_t *ngx_listening_inet_stream_socket(ngx_conf_t *cf,
+ in_addr_t addr,
+ in_port_t port)
+{
+ size_t len;
+ ngx_listening_t *ls;
+ struct sockaddr_in *addr_in;
+
+ if (!(ls = ngx_array_push(&cf->cycle->listening))) {
+ return NULL;
+ }
+
+ ngx_memzero(ls, sizeof(ngx_listening_t));
+
+ if (!(addr_in = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
+ return NULL;
+ }
+
+#if (HAVE_SIN_LEN)
+ addr_in->sin_len = sizeof(struct sockaddr_in);
+#endif
+ addr_in->sin_family = AF_INET;
+ addr_in->sin_addr.s_addr = addr;
+ addr_in->sin_port = htons(port);
+
+ if (!(ls->addr_text.data = ngx_palloc(cf->pool, INET_ADDRSTRLEN + 6))) {
+ return NULL;
+ }
+
+ len = ngx_inet_ntop(AF_INET, &addr, ls->addr_text.data, INET_ADDRSTRLEN);
+ ls->addr_text.len = ngx_snprintf((char *) ls->addr_text.data + len,
+ 6, ":%d", port);
+
+ ls->fd = (ngx_socket_t) -1;
+ ls->family = AF_INET;
+ ls->type = SOCK_STREAM;
+ ls->protocol = IPPROTO_IP;
+#if (WIN32)
+ ls->flags = WSA_FLAG_OVERLAPPED;
+#endif
+ ls->sockaddr = (struct sockaddr *) addr_in;
+ ls->socklen = sizeof(struct sockaddr_in);
+ ls->addr = offsetof(struct sockaddr_in, sin_addr);
+ ls->addr_text_max_len = INET_ADDRSTRLEN;
+
+ return ls;
+}
+
+
ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle)
{
ngx_uint_t i;
@@ -251,6 +300,110 @@ void ngx_close_listening_sockets(ngx_cycle_t *cycle)
}
+void ngx_close_connection(ngx_connection_t *c)
+{
+ ngx_socket_t fd;
+
+ if (c->pool == NULL) {
+ ngx_log_error(NGX_LOG_ALERT, c->log, 0, "connection already closed");
+ return;
+ }
+
+#if (NGX_OPENSSL)
+
+ if (c->ssl) {
+ if (ngx_ssl_shutdown(c) == NGX_AGAIN) {
+ c->read->event_handler = ngx_ssl_close_handler;
+ c->write->event_handler = ngx_ssl_close_handler;
+ return;
+ }
+ }
+
+#endif
+
+ if (c->read->timer_set) {
+ ngx_del_timer(c->read);
+ }
+
+ if (c->write->timer_set) {
+ ngx_del_timer(c->write);
+ }
+
+ if (ngx_del_conn) {
+ ngx_del_conn(c, NGX_CLOSE_EVENT);
+
+ } else {
+ if (c->read->active || c->read->disabled) {
+ ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
+ }
+
+ if (c->write->active || c->write->disabled) {
+ ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
+ }
+ }
+
+#if (NGX_THREADS)
+
+ /*
+ * we have to clean the connection information before the closing
+ * because another thread may reopen the same file descriptor
+ * before we clean the connection
+ */
+
+ if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_OK) {
+
+ if (c->read->prev) {
+ ngx_delete_posted_event(c->read);
+ }
+
+ if (c->write->prev) {
+ ngx_delete_posted_event(c->write);
+ }
+
+ c->read->closed = 1;
+ c->write->closed = 1;
+
+ if (c->single_connection) {
+ ngx_unlock(&c->lock);
+ c->read->locked = 0;
+ c->write->locked = 0;
+ }
+
+ ngx_mutex_unlock(ngx_posted_events_mutex);
+ }
+
+#else
+
+ if (c->read->prev) {
+ ngx_delete_posted_event(c->read);
+ }
+
+ if (c->write->prev) {
+ ngx_delete_posted_event(c->write);
+ }
+
+ c->read->closed = 1;
+ c->write->closed = 1;
+
+#endif
+
+ fd = c->fd;
+ c->fd = (ngx_socket_t) -1;
+ c->data = NULL;
+
+ ngx_destroy_pool(c->pool);
+
+ if (ngx_close_socket(fd) == -1) {
+
+ /* we use ngx_cycle->log because c->log was in c->pool */
+
+ ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
+ ngx_close_socket_n " failed");
+ }
+}
+
+
+
ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
{
ngx_uint_t level;
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index c2bdcea4b..b84695685 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -129,9 +129,13 @@ struct ngx_connection_s {
#endif
+ngx_listening_t *ngx_listening_inet_stream_socket(ngx_conf_t *cf,
+ in_addr_t addr,
+ in_port_t port);
ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle);
ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle);
void ngx_close_listening_sockets(ngx_cycle_t *cycle);
+void ngx_close_connection(ngx_connection_t *c);
ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text);
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index a3f6e77cb..05ee4dd1d 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -47,7 +47,8 @@ static const char *err_levels[] = {
};
static const char *debug_levels[] = {
- "debug_core", "debug_alloc", "debug_mutex", "debug_event", "debug_http"
+ "debug_core", "debug_alloc", "debug_mutex", "debug_event",
+ "debug_http", "debug_imap"
};
diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
index 20fb227df..21d3e6b76 100644
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -21,9 +21,15 @@
#define NGX_LOG_DEBUG_MUTEX 0x040
#define NGX_LOG_DEBUG_EVENT 0x080
#define NGX_LOG_DEBUG_HTTP 0x100
+#define NGX_LOG_DEBUG_IMAP 0x200
+
+/*
+ * after the adding a new debug level do not forget to update
+ * debug_levels[] in src/core/ngx_log.c
+ */
#define NGX_LOG_DEBUG_FIRST NGX_LOG_DEBUG_CORE
-#define NGX_LOG_DEBUG_LAST NGX_LOG_DEBUG_HTTP
+#define NGX_LOG_DEBUG_LAST NGX_LOG_DEBUG_IMAP
#define NGX_LOG_DEBUG_CONNECTION 0x80000000
#define NGX_LOG_DEBUG_ALL 0x7ffffff0
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index b4933daf8..8c0185d77 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -388,6 +388,7 @@ extern ngx_event_actions_t ngx_event_actions;
#define ngx_recv ngx_io.recv
#define ngx_recv_chain ngx_io.recv_chain
+#define ngx_send ngx_io.send
#define ngx_send_chain ngx_io.send_chain
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 4b451379b..f0fb691d0 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -252,7 +252,7 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc)
ngx_memzero(&addr, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
- addr.sin_port = (u_short) peer->port;
+ addr.sin_port = peer->port;
addr.sin_addr.s_addr = peer->addr;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0,
diff --git a/src/http/modules/ngx_http_userid_filter.c b/src/http/modules/ngx_http_userid_filter.c
index 718cca7e2..e37accf8f 100644
--- a/src/http/modules/ngx_http_userid_filter.c
+++ b/src/http/modules/ngx_http_userid_filter.c
@@ -281,7 +281,6 @@ static ngx_int_t ngx_http_userid_set_uid(ngx_http_request_t *r,
size_t len;
socklen_t slen;
struct sockaddr_in addr_in;
- uint32_t service;
ngx_str_t src, dst;
ngx_table_elt_t *set_cookie;
@@ -542,7 +541,7 @@ char *ngx_conf_check_domain(ngx_conf_t *cf, void *post, void *data)
if (domain->len == 4 && ngx_strcmp(domain->data, "none") == 0) {
domain->len = 1;
- domain->data = ".";
+ domain->data = (u_char *) ".";
}
return NGX_CONF_OK;
diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c
index 711aad2f4..af9760c2e 100644
--- a/src/http/modules/proxy/ngx_http_proxy_handler.c
+++ b/src/http/modules/proxy/ngx_http_proxy_handler.c
@@ -1234,7 +1234,7 @@ static char *ngx_http_proxy_parse_upstream(ngx_str_t *url,
u->default_port = 1;
}
- u->port = htons((u_short) u->port);
+ u->port = htons(u->port);
return NULL;
}
}
@@ -1265,7 +1265,7 @@ static char *ngx_http_proxy_parse_upstream(ngx_str_t *url,
if (u->port_text.len > 0) {
u->port = ngx_atoi(u->port_text.data, u->port_text.len);
if (u->port > 0) {
- u->port = htons((u_short) u->port);
+ u->port = htons(u->port);
return NULL;
}
}
diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.h b/src/http/modules/proxy/ngx_http_proxy_handler.h
index 6e3725899..27799bbb9 100644
--- a/src/http/modules/proxy/ngx_http_proxy_handler.h
+++ b/src/http/modules/proxy/ngx_http_proxy_handler.h
@@ -41,7 +41,7 @@ typedef struct {
ngx_str_t port_text;
ngx_str_t *location;
- ngx_int_t port;
+ in_port_t port;
unsigned default_port:1;
} ngx_http_proxy_upstream_conf_t;
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index fabb2dd05..d02b2503a 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -500,48 +500,12 @@ static char *ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
in_addr = in_port[p].addrs.elts;
while (a < in_port[p].addrs.nelts) {
- if (!(ls = ngx_push_array(&cf->cycle->listening))) {
+ ls = ngx_listening_inet_stream_socket(cf, in_addr[a].addr,
+ in_port[p].port);
+ if (ls == NULL) {
return NGX_CONF_ERROR;
}
- ngx_memzero(ls, sizeof(ngx_listening_t));
-
- addr_in = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
- if (addr_in == NULL) {
- return NGX_CONF_ERROR;
- }
-
-#if (HAVE_SIN_LEN)
- addr_in->sin_len = sizeof(struct sockaddr_in);
-#endif
- addr_in->sin_family = AF_INET;
- addr_in->sin_addr.s_addr = in_addr[a].addr;
- addr_in->sin_port = htons((u_short) in_port[p].port);
-
- ls->addr_text.data = ngx_palloc(cf->pool, INET_ADDRSTRLEN + 6);
- if (ls->addr_text.data == NULL) {
- return NGX_CONF_ERROR;
- }
-
- ls->addr_text.len = ngx_inet_ntop(AF_INET, &in_addr[a].addr,
- ls->addr_text.data,
- INET_ADDRSTRLEN),
-
- ls->addr_text.len += ngx_snprintf((char *) ls->addr_text.data
- + ls->addr_text.len,
- 6, ":%d", in_port[p].port);
-
- ls->fd = (ngx_socket_t) -1;
- ls->family = AF_INET;
- ls->type = SOCK_STREAM;
- ls->protocol = IPPROTO_IP;
-#if (WIN32)
- ls->flags = WSA_FLAG_OVERLAPPED;
-#endif
- ls->sockaddr = (struct sockaddr *) addr_in;
- ls->socklen = sizeof(struct sockaddr_in);
- ls->addr = offsetof(struct sockaddr_in, sin_addr);
- ls->addr_text_max_len = INET_ADDRSTRLEN;
ls->backlog = -1;
#if 0
#if 0
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 78bb2a737..6c4f819b9 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1473,7 +1473,8 @@ static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_http_core_srv_conf_t *scf = conf;
u_char *addr;
- u_int p;
+ ngx_int_t port;
+ ngx_uint_t p;
struct hostent *h;
ngx_str_t *args;
ngx_http_listen_t *ls;
@@ -1505,14 +1506,14 @@ static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
p = 0;
}
- ls->port = ngx_atoi(&addr[p], args[1].len - p);
- if (ls->port == NGX_ERROR && p == 0) {
+ port = ngx_atoi(&addr[p], args[1].len - p);
+ if (port == NGX_ERROR && p == 0) {
/* "listen host" */
ls->port = 80;
- } else if ((ls->port == NGX_ERROR && p != 0) /* "listen host:NONNUMBER" */
- || (ls->port < 1 || ls->port > 65536)) { /* "listen 99999" */
+ } else if ((port == NGX_ERROR && p != 0) /* "listen host:NONNUMBER" */
+ || (port < 1 || port > 65536)) { /* "listen 99999" */
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid port \"%s\" in \"%s\" directive, "
@@ -1523,6 +1524,7 @@ static char *ngx_set_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} else if (p == 0) {
ls->addr = INADDR_ANY;
+ ls->port = (in_port_t) port;
return NGX_CONF_OK;
}
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 6c0e7a1b0..25101aa7c 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -9,7 +9,7 @@
typedef struct {
in_addr_t addr;
- int port;
+ in_port_t port;
int family;
ngx_str_t file_name;
int line;
@@ -78,7 +78,7 @@ typedef struct {
/* list of structures to find core_srv_conf quickly at run time */
typedef struct {
- int port;
+ in_port_t port;
ngx_str_t port_name;
ngx_array_t addrs; /* array of ngx_http_in_addr_t */
} ngx_http_in_port_t;
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 76fbb8006..8136f31d3 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -3,6 +3,7 @@
#include <ngx_core.h>
#include <ngx_http.h>
+
ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r)
{
u_char ch, *p, *m;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 52c7c4256..dcf53d746 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1899,109 +1899,10 @@ void ngx_ssl_close_handler(ngx_event_t *ev)
void ngx_http_close_connection(ngx_connection_t *c)
{
- ngx_socket_t fd;
-
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"close http connection: %d", c->fd);
- if (c->pool == NULL) {
- ngx_log_error(NGX_LOG_ALERT, c->log, 0, "connection already closed");
- return;
- }
-
-#if (NGX_HTTP_SSL)
-
- if (c->ssl) {
- if (ngx_ssl_shutdown(c) == NGX_AGAIN) {
- c->read->event_handler = ngx_ssl_close_handler;
- c->write->event_handler = ngx_ssl_close_handler;
- return;
- }
- }
-
-#endif
-
- if (c->read->timer_set) {
- ngx_del_timer(c->read);
- }
-
- if (c->write->timer_set) {
- ngx_del_timer(c->write);
- }
-
- if (ngx_del_conn) {
- ngx_del_conn(c, NGX_CLOSE_EVENT);
-
- } else {
- if (c->read->active || c->read->disabled) {
- ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
- }
-
- if (c->write->active || c->write->disabled) {
- ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
- }
- }
-
- /*
- * we have to clean the connection information before the closing
- * because another thread may reopen the same file descriptor
- * before we clean the connection
- */
-
-#if (NGX_THREADS)
-
- if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_OK) {
-
- if (c->read->prev) {
- ngx_delete_posted_event(c->read);
- }
-
- if (c->write->prev) {
- ngx_delete_posted_event(c->write);
- }
-
- c->read->closed = 1;
- c->write->closed = 1;
-
- if (c->single_connection) {
- ngx_unlock(&c->lock);
- c->read->locked = 0;
- c->write->locked = 0;
- }
-
- ngx_mutex_unlock(ngx_posted_events_mutex);
- }
-
-#else
-
- if (c->read->prev) {
- ngx_delete_posted_event(c->read);
- }
-
- if (c->write->prev) {
- ngx_delete_posted_event(c->write);
- }
-
- c->read->closed = 1;
- c->write->closed = 1;
-
-#endif
-
- fd = c->fd;
- c->fd = (ngx_socket_t) -1;
- c->data = NULL;
-
- ngx_destroy_pool(c->pool);
-
- if (ngx_close_socket(fd) == -1) {
-
- /* we use ngx_cycle->log because c->log was in c->pool */
-
- ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
- ngx_close_socket_n " failed");
- }
-
- return;
+ ngx_close_connection(c);
}
diff --git a/src/imap/ngx_imap.c b/src/imap/ngx_imap.c
index 900dcb347..13855f17d 100644
--- a/src/imap/ngx_imap.c
+++ b/src/imap/ngx_imap.c
@@ -2,6 +2,10 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
+#include <ngx_imap.h>
+
+
+static char *ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static ngx_command_t ngx_imap_commands[] = {
@@ -30,5 +34,28 @@ ngx_module_t ngx_imap_module = {
ngx_imap_commands, /* module directives */
NGX_CORE_MODULE, /* module type */
NULL, /* init module */
- NULL /* init child */
+ NULL /* init process */
};
+
+
+static char *ngx_imap_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+ ngx_listening_t *ls;
+
+ /* STUB */
+
+ ls = ngx_listening_inet_stream_socket(cf, 0, 8110);
+ if (ls == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ ls->backlog = -1;
+ ls->handler = ngx_imap_init_connection;
+ ls->pool_size = 16384;
+ /* ls->post_accept_timeout = 0; */
+ ls->log = cf->cycle->new_log;
+
+ /* */
+
+ return NGX_CONF_OK;
+}
diff --git a/src/imap/ngx_imap.h b/src/imap/ngx_imap.h
new file mode 100644
index 000000000..5dc48df80
--- /dev/null
+++ b/src/imap/ngx_imap.h
@@ -0,0 +1,32 @@
+#ifndef _NGX_IMAP_H_INCLUDED_
+#define _NGX_IMAP_H_INCLUDED_
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+typedef struct {
+ ngx_chain_t *send;
+} ngx_imap_request_t;
+
+
+#define NGX_POP3_USER 1
+#define NGX_POP3_PASS 2
+#define NGX_POP3_APOP 3
+#define NGX_POP3_STAT 4
+#define NGX_POP3_LIST 5
+#define NGX_POP3_RETR 6
+#define NGX_POP3_DELE 7
+#define NGX_POP3_NOOP 8
+#define NGX_POP3_RSET 9
+#define NGX_POP3_TOP 10
+#define NGX_POP3_UIDL 11
+#define NGX_POP3_QUIT 12
+
+
+void ngx_imap_init_connection(ngx_connection_t *c);
+void ngx_imap_close_connection(ngx_connection_t *c);
+
+
+#endif /* _NGX_IMAP_H_INCLUDED_ */
diff --git a/src/imap/ngx_imap_handler.c b/src/imap/ngx_imap_handler.c
index 635ae020c..bbedc9c56 100644
--- a/src/imap/ngx_imap_handler.c
+++ b/src/imap/ngx_imap_handler.c
@@ -2,18 +2,56 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_event.h>
+#include <ngx_imap.h>
+#include <nginx.h>
+
+
+static void ngx_imap_auth_state(ngx_event_t *rev);
+
+
+static char pop3_greeting[] = "+OK " NGINX_VER " ready" CRLF;
+static char imap_greeting[] = "* OK " NGINX_VER " ready" CRLF;
void ngx_imap_init_connection(ngx_connection_t *c)
{
+ ngx_int_t rc;
+
ngx_log_debug0(NGX_LOG_DEBUG_IMAP, c->log, 0,
"imap init connection");
- if (ngx_close_socket(c->fd) == -1) {
+ c->log_error = NGX_ERROR_INFO;
- /* we use ngx_cycle->log because c->log was in c->pool */
+ rc = ngx_send(c, pop3_greeting, sizeof(pop3_greeting) - 1);
- ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno,
- ngx_close_socket_n " failed");
+ if (rc == NGX_ERROR) {
+ ngx_imap_close_connection(c);
+ return;
}
+
+ c->read->event_handler = ngx_imap_auth_state;
+
+ if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ ngx_imap_close_connection(c);
+ return;
+ }
+}
+
+
+static void ngx_imap_auth_state(ngx_event_t *rev)
+{
+ ngx_connection_t *c;
+
+ c = rev->data;
+
+ ngx_imap_close_connection(c);
+}
+
+
+void ngx_imap_close_connection(ngx_connection_t *c)
+{
+ ngx_log_debug1(NGX_LOG_DEBUG_IMAP, c->log, 0,
+ "close imap connection: %d", c->fd);
+
+ ngx_close_connection(c);
}
diff --git a/src/imap/ngx_imap_parse.c b/src/imap/ngx_imap_parse.c
new file mode 100644
index 000000000..08ff86355
--- /dev/null
+++ b/src/imap/ngx_imap_parse.c
@@ -0,0 +1,68 @@
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+#include <ngx_imap.h>
+
+
+ngx_int_t ngx_pop3_parse_command(ngx_imap_request_t *r)
+{
+ u_char ch, *p, *c;
+ enum {
+ sw_start = 0,
+ sw_done
+ } state;
+
+ while (p < r->buf->last && state < sw_done) {
+ ch = *p++;
+
+ switch (state) {
+
+ /* POP3 commands */
+ case sw_start:
+ if (ch == ' ') {
+ c = r->buf->start;
+
+ if (p - 1 - m == 4) {
+
+ if (*c == 'U' && *(c + 1) == 'S'
+ && *(c + 2) == 'E' && *(c + 3) == 'R')
+ {
+ r->command = NGX_POP3_USER;
+
+ } else if (*c == 'P' && *(c + 1) == 'A'
+ && *(c + 2) == 'A' && *(c + 3) == 'S')
+ {
+ r->method = NGX_POP3_PASS;
+
+ } else if (*c == 'Q' && *(c + 1) == 'U'
+ && *(c + 2) == 'I' && *(c + 3) == 'T')
+ {
+ r->method = NGX_POP3_QUIT;
+
+ } else if (*c == 'N' && *(c + 1) == 'O'
+ && *(c + 2) == 'O' && *(c + 3) == 'P')
+ {
+ r->method = NGX_POP3_NOOP;
+ }
+ }
+
+ state = sw_spaces_before_arg;
+ break;
+ }
+
+ if (ch < 'A' || ch > 'Z') {
+ return NGX_IMAP_PARSE_INVALID_COMMAND;
+ }
+
+ break;
+ }
+
+ /* suppress warning */
+ case sw_done:
+ break;
+ }
+ }
+
+ return NGX_OK;
+}
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index 6e7db8565..fc51b312a 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -20,7 +20,7 @@ int ngx_freebsd_kern_ipc_zero_copy_send;
ngx_os_io_t ngx_os_io = {
ngx_unix_recv,
ngx_readv_chain,
- NULL,
+ ngx_unix_send,
#if (HAVE_SENDFILE)
ngx_freebsd_sendfile_chain,
NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index 9773e5626..7379c6a18 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -12,7 +12,7 @@ int ngx_linux_rtsig_max;
ngx_os_io_t ngx_os_io = {
ngx_unix_recv,
ngx_readv_chain,
- NULL,
+ ngx_unix_send,
#if (HAVE_SENDFILE)
ngx_linux_sendfile_chain,
NGX_IO_SENDFILE
diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h
index 385fac0a2..e4e94f2d8 100644
--- a/src/os/unix/ngx_os.h
+++ b/src/os/unix/ngx_os.h
@@ -33,7 +33,7 @@ typedef struct {
ngx_recv_chain_pt recv_chain;
ngx_send_pt send;
ngx_send_chain_pt send_chain;
- int flags;
+ ngx_uint_t flags;
} ngx_os_io_t;
@@ -46,6 +46,7 @@ int ngx_posix_post_conf_init(ngx_log_t *log);
ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *entry);
+ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
diff --git a/src/os/unix/ngx_send.c b/src/os/unix/ngx_send.c
new file mode 100644
index 000000000..5a1a0ff29
--- /dev/null
+++ b/src/os/unix/ngx_send.c
@@ -0,0 +1,63 @@
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_event.h>
+
+
+ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size)
+{
+ ssize_t n;
+ ngx_err_t err;
+ ngx_event_t *wev;
+
+ wev = c->write;
+
+#if (HAVE_KQUEUE)
+
+ if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->pending_eof) {
+ ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
+ "kevent() reported about an closed connection");
+
+ wev->error = 1;
+ return NGX_ERROR;
+ }
+
+#endif
+
+ for ( ;; ) {
+ n = send(c->fd, buf, size, 0);
+
+ ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "send: fd:%d %d of %d", c->fd, n, size);
+
+ if (n > 0) {
+ if (n < (ssize_t) size) {
+ wev->ready = 0;
+ }
+
+ return n;
+ }
+
+ err = ngx_socket_errno;
+
+ if (n == 0) {
+ ngx_log_error(NGX_LOG_ALERT, c->log, err, "send() returned zero");
+ }
+
+ if (err == NGX_EAGAIN || err == NGX_EINTR) {
+ wev->ready = 0;
+
+ ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+ "send() not ready");
+
+ if (err == NGX_EAGAIN) {
+ return NGX_AGAIN;
+ }
+
+ } else {
+ wev->error = 1;
+ ngx_connection_error(c, err, "recv() failed");
+ return NGX_ERROR;
+ }
+ }
+}
diff --git a/src/os/unix/ngx_solaris_init.c b/src/os/unix/ngx_solaris_init.c
index 59db3d870..25fa14dcc 100644
--- a/src/os/unix/ngx_solaris_init.c
+++ b/src/os/unix/ngx_solaris_init.c
@@ -11,7 +11,7 @@ char ngx_solaris_version[50];
ngx_os_io_t ngx_os_io = {
ngx_unix_recv,
ngx_readv_chain,
- NULL,
+ ngx_unix_send,
#if (HAVE_SENDFILE)
ngx_solaris_sendfilev_chain,
NGX_IO_SENDFILE
diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h
index a9ce3ff62..c04eacaa8 100644
--- a/src/os/win32/ngx_os.h
+++ b/src/os/win32/ngx_os.h
@@ -32,7 +32,7 @@ typedef struct {
ngx_recv_chain_pt recv_chain;
ngx_send_pt send;
ngx_send_chain_pt send_chain;
- int flags;
+ ngx_uint_t flags;
} ngx_os_io_t;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 14:01:09 +0000