diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-10-01 06:06:17 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2011-10-01 06:06:17 +0000 |
| commit | e644e370794b350f4d05ae0058dd035253aa5e51 (patch) | |
| tree | b47f198e0c9dd53cbdfc9cc5f4b3f34630930e7a | |
| parent | ceabf6221ad8c935df53476e397b4a00475fabe1 (diff) | |
| download | nginx-e644e370794b350f4d05ae0058dd035253aa5e51.tar.gz | |
Changes with nginx 1.0.8 01 Oct 2011v1.0.8
*) Bugfix: nginx could not be built --with-http_mp4_module and without
--with-debug option.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_mp4_module.c | 8 | ||||
| -rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
5 files changed, 19 insertions, 7 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 1.0.8 01 Oct 2011 + + *) Bugfix: nginx could not be built --with-http_mp4_module and without + --with-debug option. + + Changes with nginx 1.0.7 30 Sep 2011 *) Change: now if total size of all ranges is greater than source diff --git a/CHANGES.ru b/CHANGES.ru index 8bc4f914f..aa07dc94a 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 1.0.8 01.10.2011 + + *) Исправление: nginx не собирался с модулем ngx_http_mp4_module и без + параметра --with-debug. + + Изменения в nginx 1.0.7 30.09.2011 *) Изменение: теперь, если суммарный размер всех диапазонов больше diff --git a/src/core/nginx.h b/src/core/nginx.h index 684aa5ad9..713daae02 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1000007 -#define NGINX_VERSION "1.0.7" +#define nginx_version 1000008 +#define NGINX_VERSION "1.0.8" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c index acbb94866..1140d9174 100644 --- a/src/http/modules/ngx_http_mp4_module.c +++ b/src/http/modules/ngx_http_mp4_module.c @@ -742,7 +742,7 @@ ngx_http_mp4_process(ngx_http_mp4_file_t *mp4) + ngx_http_mp4_update_mdat_atom(mp4, start_offset) - start_offset; - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 adjustment:%D", adjustment); for (i = 0; i < mp4->trak.nelts; i++) { @@ -836,7 +836,7 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4, atom_name = atom_header + sizeof(uint32_t); - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, + ngx_log_debug4(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mp4 atom: %*s @%O:%uL", 4, atom_name, mp4->offset, atom_size); @@ -1068,7 +1068,7 @@ ngx_http_mp4_update_mdat_atom(ngx_http_mp4_file_t *mp4, off_t start_offset) mp4->mdat_data.buf->file_pos = start_offset; mp4->content_length += atom_data_size; - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "mdat new offset @%O:%O", start_offset, atom_data_size); atom_header = mp4->mdat_atom_header; @@ -2179,7 +2179,7 @@ ngx_http_mp4_update_ctts_atom(ngx_http_mp4_file_t *mp4, while (entry < end) { count = ngx_mp4_get_32value(entry->count); - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, "start:%uD, count:%uD, offset:%uD", start_sample, count, ngx_mp4_get_32value(entry->offset)); diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 911502f6e..a4736a4cb 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -48,7 +48,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '1.0.7'; +our $VERSION = '1.0.8'; require XSLoader; XSLoader::load('nginx', $VERSION); |