summaryrefslogtreecommitdiff
path: root/src/event/ngx_event_openssl.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-06-02 16:22:32 +0000
committerJonathan Kolb <jon@b0g.us>2009-06-02 16:22:32 +0000
commit48a71b870032c0787bc31650f3143465a4cd417b (patch)
treecdbc3eed0e6881d3632461f027b2547ab3b12f17 /src/event/ngx_event_openssl.c
parent8e691fc5d70edca2a685bc341bbef7a097371349 (diff)
downloadnginx-48a71b870032c0787bc31650f3143465a4cd417b.tar.gz
Changes with nginx 0.8.0 02 Jun 2009v0.8.0
*) Feature: the "keepalive_requests" directive. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Bugfix: XLST filter did not work in subrequests. *) Bugfix: in relative paths handling in nginx/Windows. *) Bugfix: in proxy_store, fastcgi_store, proxy_cache, and fastcgi_cache in nginx/Windows. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
Diffstat (limited to 'src/event/ngx_event_openssl.c')
-rw-r--r--src/event/ngx_event_openssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 23a4fbec4..1607814ce 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2115,7 +2115,7 @@ ngx_openssl_create_conf(ngx_cycle_t *cycle)
oscf = ngx_pcalloc(cycle->pool, sizeof(ngx_openssl_conf_t));
if (oscf == NULL) {
- return NGX_CONF_ERROR;
+ return NULL;
}
/*