Navigation Menu

Skip to content

Commit

Permalink
nginx: update to latest release
Browse files Browse the repository at this point in the history
  % make update-nginx NEW_NGINX_VERSION=1.8.0
  • Loading branch information
kenhys committed Apr 24, 2015
1 parent 0e18880 commit d1bfb8e
Show file tree
Hide file tree
Showing 417 changed files with 316 additions and 112 deletions.
2 changes: 1 addition & 1 deletion nginx_version
@@ -1 +1 @@
1.7.11
1.8.0
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -8,7 +8,7 @@ echo "creating $NGX_MAKEFILE"
mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
$NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
$NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
$NGX_OBJS/src/http/modules/perl \
$NGX_OBJS/src/http/modules/perl \
$NGX_OBJS/src/mail \
$NGX_OBJS/src/misc

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -5,6 +5,83 @@
<change_log title="nginx">


<changes ver="1.8.0" date="21.04.2015">

<change>
<para lang="ru">
Стабильная ветка 1.8.x.
</para>
<para lang="en">
1.8.x stable branch.
</para>
</change>

</changes>


<changes ver="1.7.12" date="07.04.2015">

<change type="feature">
<para lang="ru">
теперь директива tcp_nodelay работает для SSL-соединений с бэкендами.
</para>
<para lang="en">
now the "tcp_nodelay" directive works with backend SSL connections.
</para>
</change>

<change type="feature">
<para lang="ru">
теперь потоки могут использоваться для чтения заголовков файлов в кэше.
</para>
<para lang="en">
now thread pools can be used to read cache file headers.
</para>
</change>

<change type="bugfix">
<para lang="ru">
в директиве proxy_request_buffering.
</para>
<para lang="en">
in the "proxy_request_buffering" directive.
</para>
</change>

<change type="bugfix">
<para lang="ru">
при использовании потоков на Linux
в рабочем процессе мог произойти segmentation fault.
</para>
<para lang="en">
a segmentation fault might occur in a worker process
when using thread pools on Linux.
</para>
</change>

<change type="bugfix">
<para lang="ru">
в обработке ошибок при использовании директивы ssl_stapling.<br/>
Спасибо Filipe da Silva.
</para>
<para lang="en">
in error handling when using the "ssl_stapling" directive.<br/>
Thanks to Filipe da Silva.
</para>
</change>

<change type="bugfix">
<para lang="ru">
в модуле ngx_http_spdy_module.
</para>
<para lang="en">
in the ngx_http_spdy_module.
</para>
</change>

</changes>


<changes ver="1.7.11" date="24.03.2015">

<change type="change">
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -248,18 +248,30 @@ main(int argc, char *const *argv)
}

if (ngx_show_configure) {
ngx_write_stderr(

#ifdef NGX_COMPILER
"built by " NGX_COMPILER NGX_LINEFEED
ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED);
#endif

#if (NGX_SSL)
if (SSLeay() == SSLEAY_VERSION_NUMBER) {
ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
NGX_LINEFEED);
} else {
ngx_write_stderr("built with " OPENSSL_VERSION_TEXT
" (running with ");
ngx_write_stderr((char *) (uintptr_t)
SSLeay_version(SSLEAY_VERSION));
ngx_write_stderr(")" NGX_LINEFEED);
}
#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
"TLS SNI support enabled" NGX_LINEFEED
ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED);
#else
"TLS SNI support disabled" NGX_LINEFEED
ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED);
#endif
#endif
"configure arguments:" NGX_CONFIGURE NGX_LINEFEED);

ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
}

if (!ngx_test_config) {
Expand Down
Expand Up @@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_


#define nginx_version 1007011
#define NGINX_VERSION "1.7.11"
#define nginx_version 1008000
#define NGINX_VERSION "1.8.0"
#define NGINX_VER "nginx/" NGINX_VERSION

#ifdef NGX_BUILD
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -9,6 +9,9 @@
#define _NGX_CORE_H_INCLUDED_


#include <ngx_config.h>


typedef struct ngx_module_s ngx_module_t;
typedef struct ngx_conf_s ngx_conf_t;
typedef struct ngx_cycle_s ngx_cycle_t;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -356,7 +356,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}

if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
return NULL;
return NGX_CONF_ERROR;
}

path->conf_file = cf->conf_file->file.name.data;
Expand All @@ -372,8 +372,8 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->len += level + 1;
}

while (i < 3) {
path->level[i++] = 0;
if (path->len > 10 + i) {
return "invalid value";
}

*slot = path;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -42,7 +42,7 @@ ngx_spinlock(ngx_atomic_t *lock, ngx_atomic_int_t value, ngx_uint_t spin)

#else

#if (NGX_OLD_THREADS)
#if (NGX_THREADS)

#error ngx_spinlock() or ngx_atomic_cmp_set() are not defined !

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -683,14 +683,14 @@ ngx_epoll_notify(ngx_event_handler_pt handler)
{
static uint64_t inc = 1;

notify_event.data = handler;

if ((size_t) write(notify_fd, &inc, sizeof(uint64_t)) != sizeof(uint64_t)) {
ngx_log_error(NGX_LOG_ALERT, notify_event.log, ngx_errno,
"write() to eventfd %d failed", notify_fd);
return NGX_ERROR;
}

notify_event.data = handler;

return NGX_OK;
}

Expand Down
File renamed without changes.
File renamed without changes.
Expand Up @@ -310,6 +310,7 @@ ngx_ssl_stapling_issuer(ngx_conf_t *cf, ngx_ssl_t *ssl)
if (X509_STORE_CTX_init(store_ctx, store, NULL, NULL) == 0) {
ngx_ssl_error(NGX_LOG_EMERG, ssl->log, 0,
"X509_STORE_CTX_init() failed");
X509_STORE_CTX_free(store_ctx);
return NGX_ERROR;
}

Expand Down Expand Up @@ -1118,6 +1119,7 @@ ngx_ssl_ocsp_create_request(ngx_ssl_ocsp_ctx_t *ctx)
if (OCSP_request_add0_id(ocsp, id) == NULL) {
ngx_ssl_error(NGX_LOG_CRIT, ctx->log, 0,
"OCSP_request_add0_id() failed");
OCSP_CERTID_free(id);
goto failed;
}

Expand Down
Expand Up @@ -16,24 +16,24 @@

#define ngx_post_event(ev, q) \
\
if (!ev->posted) { \
ev->posted = 1; \
ngx_queue_insert_tail(q, &ev->queue); \
if (!(ev)->posted) { \
(ev)->posted = 1; \
ngx_queue_insert_tail(q, &(ev)->queue); \
\
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "post event %p", ev); \
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, "post event %p", ev);\
\
} else { \
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, \
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, \
"update posted event %p", ev); \
}


#define ngx_delete_posted_event(ev) \
\
ev->posted = 0; \
ngx_queue_remove(&ev->queue); \
(ev)->posted = 0; \
ngx_queue_remove(&(ev)->queue); \
\
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, \
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, \
"delete posted event %p", ev);


Expand Down
Expand Up @@ -378,7 +378,7 @@ ngx_http_parse_expires(ngx_str_t *value, ngx_http_expires_t *expires,
}
}

if (value->data[0] == '@') {
if (value->len && value->data[0] == '@') {
value->data++;
value->len--;
minus = 0;
Expand All @@ -390,12 +390,12 @@ ngx_http_parse_expires(ngx_str_t *value, ngx_http_expires_t *expires,

*expires = NGX_HTTP_EXPIRES_DAILY;

} else if (value->data[0] == '+') {
} else if (value->len && value->data[0] == '+') {
value->data++;
value->len--;
minus = 0;

} else if (value->data[0] == '-') {
} else if (value->len && value->data[0] == '-') {
value->data++;
value->len--;
minus = 1;
Expand Down
Expand Up @@ -1503,7 +1503,7 @@ ngx_http_proxy_body_output_filter(void *data, ngx_chain_t *in)
u_char *chunk;
ngx_int_t rc;
ngx_buf_t *b;
ngx_chain_t *out, *cl, *tl, **ll;
ngx_chain_t *out, *cl, *tl, **ll, **fl;
ngx_http_proxy_ctx_t *ctx;

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
Expand Down Expand Up @@ -1546,6 +1546,7 @@ ngx_http_proxy_body_output_filter(void *data, ngx_chain_t *in)

size = 0;
cl = in;
fl = ll;

for ( ;; ) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
Expand Down Expand Up @@ -1602,8 +1603,8 @@ ngx_http_proxy_body_output_filter(void *data, ngx_chain_t *in)
b->pos = chunk;
b->last = ngx_sprintf(chunk, "%xO" CRLF, size);

tl->next = out;
out = tl;
tl->next = *fl;
*fl = tl;
}

if (cl->buf->last_buf) {
Expand Down
File renamed without changes.
File renamed without changes.
Expand Up @@ -91,6 +91,10 @@ struct ngx_http_cache_s {
ngx_http_file_cache_t *file_cache;
ngx_http_file_cache_node_t *node;

#if (NGX_THREADS)
ngx_thread_task_t *thread_task;
#endif

ngx_msec_t lock_timeout;
ngx_msec_t lock_age;
ngx_msec_t lock_time;
Expand Down

0 comments on commit d1bfb8e

Please sign in to comment.