summaryrefslogtreecommitdiff
path: root/src/event/ngx_event_connect.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-07-12 11:23:11 +0000
committerJonathan Kolb <jon@b0g.us>2007-07-12 11:23:11 +0000
commit7f4fcbdaef8d52d0a390c980cb1a7fa85330fecc (patch)
treece4ffa8a6ed6f7c06b2117868c85f9c586dd4c0c /src/event/ngx_event_connect.h
parent8aa92bfd2642d24b664564c39290185efe1ed670 (diff)
downloadnginx-7f4fcbdaef8d52d0a390c980cb1a7fa85330fecc.tar.gz
Changes with nginx 0.6.3 12 Jul 2007v0.6.3
*) Feature: the "proxy_store" and "fastcgi_store" directives. *) Bugfix: a segmentation fault might occur in worker process if the "auth_http_header" directive was used. *) Bugfix: a segmentation fault occurred in worker process if the CRAM-MD5 authentication method was used, but it was not enabled. *) Bugfix: a segmentation fault might occur in worker process when the HTTPS protocol was used in the "proxy_pass" directive. *) Bugfix: a segmentation fault might occur in worker process if the eventport method was used. *) Bugfix: the "proxy_ignore_client_abort" and "fastcgi_ignore_client_abort" directives did not work; bug appeared in 0.5.13.
Diffstat (limited to 'src/event/ngx_event_connect.h')
-rw-r--r--src/event/ngx_event_connect.h48
1 files changed, 27 insertions, 21 deletions
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index f8a7de944..6cad04279 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -13,50 +13,56 @@
#include <ngx_event.h>
-#define NGX_PEER_KEEPALIVE 1
-#define NGX_PEER_NEXT 2
-#define NGX_PEER_FAILED 4
+#define NGX_PEER_KEEPALIVE 1
+#define NGX_PEER_NEXT 2
+#define NGX_PEER_FAILED 4
typedef struct ngx_peer_connection_s ngx_peer_connection_t;
typedef ngx_int_t (*ngx_event_get_peer_pt)(ngx_peer_connection_t *pc,
void *data);
-#if (NGX_SSL)
-typedef void (*ngx_event_save_peer_pt)(ngx_peer_connection_t *pc, void *data);
-#endif
typedef void (*ngx_event_free_peer_pt)(ngx_peer_connection_t *pc, void *data,
ngx_uint_t state);
+#if (NGX_SSL)
+
+typedef ngx_int_t (*ngx_event_set_peer_session_pt)(ngx_peer_connection_t *pc,
+ void *data);
+typedef void (*ngx_event_save_peer_session_pt)(ngx_peer_connection_t *pc,
+ void *data);
+#endif
struct ngx_peer_connection_s {
- ngx_connection_t *connection;
+ ngx_connection_t *connection;
- struct sockaddr *sockaddr;
- socklen_t socklen;
- ngx_str_t *name;
+ struct sockaddr *sockaddr;
+ socklen_t socklen;
+ ngx_str_t *name;
- ngx_uint_t tries;
+ ngx_uint_t tries;
- ngx_event_get_peer_pt get;
- ngx_event_free_peer_pt free;
- void *data;
+ ngx_event_get_peer_pt get;
+ ngx_event_free_peer_pt free;
+ void *data;
#if (NGX_SSL)
- ngx_ssl_session_t *ssl_session;
- ngx_event_save_peer_pt save_session;
+ ngx_event_set_peer_session_pt set_session;
+ ngx_event_save_peer_session_pt save_session;
#endif
#if (NGX_THREADS)
- ngx_atomic_t *lock;
+ ngx_atomic_t *lock;
#endif
- int rcvbuf;
+ int rcvbuf;
+
+ ngx_log_t *log;
- ngx_log_t *log;
+ unsigned cached:1;
- unsigned cached:1;
- unsigned log_error:2; /* ngx_connection_log_error_e */
+ /* ngx_connection_log_error_e */
+ unsigned log_error:2;
};