nginx 1.0.8

*) Bugfix: nginx could not be built --with-http_mp4_module and without --with-debug option.
catap · Sep 30, 2011 · 0fd2901 · 0fd2901
1 parent 8b54097
commit 0fd2901
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);