annotate auto/summary @ 4687:7f50a4063100

Mp4: fixed non-keyframe seeks in some cases (ticket #175). Number of entries in stsc atom was wrong if we've added an entry to split a chunk. Additionally, there is no need to add an entry if we are going to split last chunk in an entry, it's enough to update the entry we already have. Previously new entry was added and old one was left as is, resulting in incorrect entry with zero chunks which might confuse some software.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 18 Jun 2012 14:01:18 +0000
parents d620f497c50f
children 83d54192e97b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 4280
diff changeset
3 # Copyright (C) Nginx, Inc.
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
4
210
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
543
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
6 ### STUB
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
7
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
8 if [ $USE_THREADS != NO ]; then
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
9
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
10 cat << END
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
11
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
12 $0: error: the threads support is broken now.
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
13
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
14 END
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
15 exit 1
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
16 fi
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
17
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
18 ###
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
19
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
20
210
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 echo
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 echo "Configuration summary"
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
23
337
4feff829a849 nginx-0.0.3-2004-05-19-00:28:54 import
Igor Sysoev <igor@sysoev.ru>
parents: 285
diff changeset
24
1979
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
25 #case $USE_THREADS in
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
26 # rfork) echo " + using rfork()ed threads" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
27 # pthreads) echo " + using libpthread threads library" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
28 # libthr) echo " + using FreeBSD libthr threads library" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
29 # libc_r) echo " + using FreeBSD libc_r threads library" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
30 # linuxthreads) echo " + using FreeBSD LinuxThreads port library" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
31 # NO) echo " + threads are not used" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
32 # *) echo " + using lib$USE_THREADS threads library" ;;
278a1d3b4dbf disable confusing messages about threads
Igor Sysoev <igor@sysoev.ru>
parents: 1352
diff changeset
33 #esac
457
ded1284520cc nginx-0.1.3-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 446
diff changeset
34
265
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
35 if [ $USE_PCRE = DISABLED ]; then
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
36 echo " + PCRE library is disabled"
265
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
37
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
38 else
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
39 case $PCRE in
425
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
40 YES) echo " + using system PCRE library" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
41 NONE) echo " + PCRE library is not used" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
42 *) echo " + using PCRE library: $PCRE" ;;
265
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
43 esac
6468241715e6 nginx-0.0.2-2004-02-20-19:48:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 255
diff changeset
44 fi
212
679f60139863 nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents: 210
diff changeset
45
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents: 337
diff changeset
46 case $OPENSSL in
425
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
47 YES) echo " + using system OpenSSL library" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
48 NONE) echo " + OpenSSL library is not used" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
49 *) echo " + using OpenSSL library: $OPENSSL" ;;
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents: 337
diff changeset
50 esac
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents: 337
diff changeset
51
477
ad1e9ebf93bb nginx-0.1.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
52 case $MD5 in
2010
bd6cc5370fc1 simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents: 1979
diff changeset
53 YES) echo " + md5: using $MD5_LIB library" ;;
477
ad1e9ebf93bb nginx-0.1.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
54 NONE) echo " + md5 library is not used" ;;
3895
b659514a3948 an internal MD5 implemenation
Igor Sysoev <igor@sysoev.ru>
parents: 3684
diff changeset
55 NO) echo " + using builtin md5 code" ;;
477
ad1e9ebf93bb nginx-0.1.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
56 *) echo " + using md5 library: $MD5" ;;
ad1e9ebf93bb nginx-0.1.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
57 esac
ad1e9ebf93bb nginx-0.1.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
58
653
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
59 case $SHA1 in
2010
bd6cc5370fc1 simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents: 1979
diff changeset
60 YES) echo " + sha1: using $SHA1_LIB library" ;;
653
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
61 NONE) echo " + sha1 library is not used" ;;
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
62 NO) echo " + sha1 library is not found" ;;
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
63 *) echo " + using sha1 library: $SHA1" ;;
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
64 esac
7cbef16c71a1 nginx-0.3.48-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 543
diff changeset
65
210
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
66 case $ZLIB in
425
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
67 YES) echo " + using system zlib library" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
68 NONE) echo " + zlib library is not used" ;;
bd39260a1383 nginx-0.0.10-2004-09-14-19:55:24 import
Igor Sysoev <igor@sysoev.ru>
parents: 424
diff changeset
69 *) echo " + using zlib library: $ZLIB" ;;
210
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
70 esac
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
71
3380
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
72 case $NGX_LIBATOMIC in
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
73 YES) echo " + using system libatomic_ops library" ;;
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
74 NO) ;; # not used
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
75 *) echo " + using libatomic_ops library: $NGX_LIBATOMIC" ;;
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
76 esac
1d9063f7483c print libatomic configure summary
Igor Sysoev <igor@sysoev.ru>
parents: 2893
diff changeset
77
210
00cafae0bdf1 nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
78 echo
255
e6938ca7331a nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents: 253
diff changeset
79
e6938ca7331a nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents: 253
diff changeset
80
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
81 cat << END
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
82 nginx path prefix: "$NGX_PREFIX"
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
83 nginx binary file: "$NGX_SBIN_PATH"
1352
e958b3cab51a --sysconfdir=DIR
Igor Sysoev <igor@sysoev.ru>
parents: 653
diff changeset
84 nginx configuration prefix: "$NGX_CONF_PREFIX"
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
85 nginx configuration file: "$NGX_CONF_PATH"
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
86 nginx pid file: "$NGX_PID_PATH"
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
87 END
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
88
469
2ff194b74f1e nginx-0.1.9-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 457
diff changeset
89 if test -n "$NGX_ERROR_LOG_PATH"; then
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
90 echo " nginx error log file: \"$NGX_ERROR_LOG_PATH\""
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
91 else
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
92 echo " nginx logs errors to stderr"
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 425
diff changeset
93 fi
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
94
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
95 cat << END
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
96 nginx http access log file: "$NGX_HTTP_LOG_PATH"
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 479
diff changeset
97 nginx http client request body temporary files: "$NGX_HTTP_CLIENT_TEMP_PATH"
3557
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
98 END
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
99
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
100 if [ $HTTP_PROXY = YES ]; then
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
101 echo " nginx http proxy temporary files: \"$NGX_HTTP_PROXY_TEMP_PATH\""
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
102 fi
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 477
diff changeset
103
3557
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
104 if [ $HTTP_FASTCGI = YES ]; then
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
105 echo " nginx http fastcgi temporary files: \"$NGX_HTTP_FASTCGI_TEMP_PATH\""
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
106 fi
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
107
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
108 if [ $HTTP_UWSGI = YES ]; then
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
109 echo " nginx http uwsgi temporary files: \"$NGX_HTTP_UWSGI_TEMP_PATH\""
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
110 fi
77188d729402 print default module temporary directory path in summary
Igor Sysoev <igor@sysoev.ru>
parents: 3549
diff changeset
111
3637
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3557
diff changeset
112 if [ $HTTP_SCGI = YES ]; then
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3557
diff changeset
113 echo " nginx http scgi temporary files: \"$NGX_HTTP_SCGI_TEMP_PATH\""
d656caa72ec9 ngx_http_scgi_module
Igor Sysoev <igor@sysoev.ru>
parents: 3557
diff changeset
114 fi
4280
91874133fb27 Renamed ngx_http_limit_zone_module to ngx_http_limit_conn_module.
Valentin Bartenev <vbart@nginx.com>
parents: 3895
diff changeset
115
91874133fb27 Renamed ngx_http_limit_zone_module to ngx_http_limit_conn_module.
Valentin Bartenev <vbart@nginx.com>
parents: 3895
diff changeset
116 echo "$NGX_POST_CONF_MSG"