← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nginx/quantal-updates

« back to all changes in this revision

Viewing changes to debian/modules/nginx-development-kit/objs/ndk_conf_merge.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lustfield, Micheal Lustfield, Kartik Mistry
  • Date: 2011-03-03 23:39:07 UTC
  • mfrom: (4.2.29 sid)
  • Revision ID: james.westby@ubuntu.com-20110303233907-y48yifhfnn5qjuxz
Tags: 0.8.54-4
http://bugs.debian.org/610946
https://launchpad.net/bugs/699736
http://bugs.debian.org/609343
http://bugs.debian.org/608983
http://bugs.debian.org/610289
http://bugs.debian.org/610290
http://bugs.debian.org/609797
http://bugs.debian.org/610983
http://bugs.debian.org/612832
http://bugs.debian.org/613175
http://bugs.debian.org/613355
http://bugs.debian.org/613851
http://bugs.debian.org/614987
http://bugs.debian.org/614980
[Micheal Lustfield]
* debian/nginx-{full,light,extras}.default:
  + Added comment about alternative to ULIMIT.
* debian/nginx-{full,light,extras}.init.d:
  + Added quotes around a test variable. (Closes: #610946, LP: #699736)
* debian/patches/609343-log-time-iso8601.diff:
  + Added patch to add $time_iso8601 variable to logs. (Closes: #609343)
* Clean up old logrotate files. (Closes: #608983, Closes: #610289)
  + Added Files:
    - debian/nginx-common.preinst
  + Modified Files:
    - debian/rules
  + Moved debian/nginx-common.logrotate to debian/logrotate.
* Added common files to nginx-common package. (Closes: #610290)
  + Removed Files:
    - debian/nginx-full.dirs
    - debian/nginx-light.dirs
    - debian/nginx-full.install
    - debian/nginx-light.install
    - debian/nginx-extras.install
    - debian/nginx.*
  + Added Files:
    - debian/nginx-common.default
    - debian/nginx-common.dirs
    - debian/nginx-common.init.d
    - debian/nginx-common.install
    - debian/nginx-common.manpages
    - debian/logrotate
  + Modified Files:
    - debian/nginx-extras.dirs
    - debian/control
    - debian/rules
* debian/nginx-*.install: (Closes: #609797)
  + Removed NEWS.Debian from nginx-{full,light,extras}.install.
  + Added NEWS.Debian to nginx-common.install.
* nginx-common.postinst:
  + Enforce /var/log/nginx mode and user:group. (Closes: #610983)
  + Enforce /var/log/nginx/*.log mode and user:group. (Closes: #612832)
* debian/rules:
  + Added --with-file-aio to nginx-extras. (Closes: #613175)
  + Removed split clients and user id modules from nginx-light.
* debian/conf/sites-available/default:
  + Fixed a minor typo ( s/Quickstart/QuickStart/ ). (Closes: #613355)
* debian/conf/mime.types:
  + Changed xml type to application/xhtml+xml. (Closes: #613851)
* debian/help/docs/fcgiwrap:
  + Removed Ubuntu specific line in docs. (Closes: #614987)
* debian/conf/sites-available/default:
  + Fixed a pointer to a file. (Closes: #614980)

[Kartik Mistry]
* debian/*.lintian-overrides:
  + Add Lintian overrides for nginx man page. We've manpage in nginx-common
    binary

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/modules/nginx-development-kit/objs/ndk_conf_merge.h
 
1
 
 
2
/* 
 
3
 * 2010 (C) Marcus Clyne 
 
4
 *
 
5
 * DO NOT EDIT THIS FILE MANUALLY
 
6
 * ------------------------------
 
7
 * This file has been generated automatically from scripts in the $base/auto dir and
 
8
 * data in the $base/auto/data dir. If you wish to edit the output of this file, then
 
9
 * you should edit these files instead.
 
10
 *
 
11
*/
 
12
 
 
13
 
 
14
// conf-merge-value macros
 
15
 
 
16
// TODO : check that all the main types have a corresponding merge function
 
17
 
 
18
#define     ndk_conf_merge_value            ngx_conf_merge_value
 
19
#define     ndk_conf_merge_off_value        ngx_conf_merge_off_value 
 
20
#define     ndk_conf_merge_ptr_value        ngx_conf_merge_ptr_value
 
21
#define     ndk_conf_merge_str_value        ngx_conf_merge_str_value
 
22
#define     ndk_conf_merge_size_value       ngx_conf_merge_size_value 
 
23
 
 
24
 
 
25
#define     ndk_conf_merge_keyval_value(conf,prev,default)                                  \
 
26
                                                                                            \
 
27
                conf = prev ? prev : default;
 
28
 
 
29
#define     ndk_conf_merge_str_array_value(conf,prev,val1,...)                              \
 
30
                                                                                            \
 
31
                if (conf == NGX_CONF_UNSET_PTR) {                                           \
 
32
                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
 
33
                        if (val1 == NULL) {                                                 \
 
34
                            conf = NULL;                                                    \
 
35
                        } else {                                                            \
 
36
                            char * elts[] = {val1,##__VA_ARGS__};                           \
 
37
                            int    n = sizeof(elts)/sizeof(char*);                          \
 
38
                                                                                            \
 
39
                            conf = ndk_str_array_create (cf->pool, elts, n);                \
 
40
                                                                                            \
 
41
                            if (conf == NULL)                                               \
 
42
                                return  NGX_CONF_ERROR;                                     \
 
43
                        }                                                                   \
 
44
                    } else {                                                                \
 
45
                        conf = prev;                                                        \
 
46
                    }                                                                       \
 
47
                }
 
48
 
 
49
#define     ndk_conf_merge_http_complex_value_value(conf,prev,default)                      \
 
50
                                                                                            \
 
51
                if (!conf.str.len) {                                                        \
 
52
                    if (prev.str.len) {                                                     \
 
53
                        conf = prev;                                                        \
 
54
                    } else {                                                                \
 
55
                        conf.str.data = (u_char *) default;                                 \
 
56
                        conf.str.len = sizeof (default) - 1;                                \
 
57
                                                                                            \
 
58
                        if (ndk_http_complex_value_compile (cf, &conf))                     \
 
59
                            return  NGX_CONF_ERROR;                                         \
 
60
                    }                                                                       \
 
61
                }
 
62
 
 
63
#define     ndk_conf_merge_http_complex_value_array_value(conf,prev,val1,...)               \
 
64
                                                                                            \
 
65
                if (conf == NGX_CONF_UNSET_PTR) {                                           \
 
66
                    if (prev == NGX_CONF_UNSET_PTR) {                                       \
 
67
                        if (val1 == NULL)                                                   \
 
68
                            conf = NULL;                                                    \
 
69
                        else {                                                              \
 
70
                            char * elts[] = {val1,##__VA_ARGS__};                           \
 
71
                            int    n = sizeof(elts)/sizeof(char*);                          \
 
72
                                                                                            \
 
73
                            conf = ndk_http_complex_value_array_create (cf, elts, n);       \
 
74
                                                                                            \
 
75
                            if (conf == NULL)                                               \
 
76
                                return  NGX_CONF_ERROR;                                     \
 
77
                        }                                                                   \
 
78
                    } else {                                                                \
 
79
                        conf = prev;                                                        \
 
80
                    }                                                                       \
 
81
                }
 
82
 
 
83
#define     ndk_conf_merge_http_complex_path_value(conf,prev,...)                           \
 
84
                ndk_conf_merge_http_complex_value_array_value (conf.a, prev.a, __VA_ARGS__)
 
85
 
 
86
#define     ndk_conf_merge_split_path_value(conf,prev,path)                                 \
 
87
                                                                                            \
 
88
                if (conf == NGX_CONF_UNSET_PTR)  {                                          \
 
89
                    conf = (prev == NGX_CONF_UNSET_PTR ?                                    \
 
90
                        ndk_split_path_create_raw (cf, path) : prev);                       \
 
91
                }
 
92
 
 
93
 
 
94
// conf-merge-prop macros
 
95
 
 
96
#define     ndk_conf_merge_prop(prop,default)\
 
97
            ndk_conf_merge_value\
 
98
                (conf->prop, prev->prop, default)
 
99
 
 
100
#define     ndk_conf_merge_bitmask_prop(prop,default,...)\
 
101
            ndk_conf_merge_bitmask_value\
 
102
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
103
    
 
104
#define     ndk_conf_merge_bufs_prop(prop,default,...)\
 
105
            ndk_conf_merge_bufs_value\
 
106
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
107
    
 
108
#define     ndk_conf_merge_encoding_prop(prop,default,...)\
 
109
            ndk_conf_merge_encoding_value\
 
110
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
111
    
 
112
#define     ndk_conf_merge_enum_prop(prop,default,...)\
 
113
            ndk_conf_merge_enum_value\
 
114
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
115
    
 
116
#define     ndk_conf_merge_false_prop(prop,default,...)\
 
117
            ndk_conf_merge_false_value\
 
118
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
119
    
 
120
#define     ndk_conf_merge_flag_prop(prop,default,...)\
 
121
            ndk_conf_merge_flag_value\
 
122
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
123
    
 
124
#define     ndk_conf_merge_full_path_prop(prop,default,...)\
 
125
            ndk_conf_merge_full_path_value\
 
126
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
127
    
 
128
#define     ndk_conf_merge_http_complex_keyval_prop(prop,default,...)\
 
129
            ndk_conf_merge_http_complex_keyval_value\
 
130
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
131
    
 
132
#define     ndk_conf_merge_http_complex_path_prop(prop,default,...)\
 
133
            ndk_conf_merge_http_complex_path_value\
 
134
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
135
    
 
136
#define     ndk_conf_merge_http_complex_value_prop(prop,default,...)\
 
137
            ndk_conf_merge_http_complex_value_value\
 
138
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
139
    
 
140
#define     ndk_conf_merge_http_complex_value_array_prop(prop,default,...)\
 
141
            ndk_conf_merge_http_complex_value_array_value\
 
142
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
143
    
 
144
#define     ndk_conf_merge_keyval_prop(prop,default,...)\
 
145
            ndk_conf_merge_keyval_value\
 
146
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
147
    
 
148
#define     ndk_conf_merge_keyval1_prop(prop,default,...)\
 
149
            ndk_conf_merge_keyval1_value\
 
150
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
151
    
 
152
#define     ndk_conf_merge_msec_prop(prop,default,...)\
 
153
            ndk_conf_merge_msec_value\
 
154
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
155
    
 
156
#define     ndk_conf_merge_null_prop(prop,default,...)\
 
157
            ndk_conf_merge_null_value\
 
158
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
159
    
 
160
#define     ndk_conf_merge_num_prop(prop,default,...)\
 
161
            ndk_conf_merge_num_value\
 
162
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
163
    
 
164
#define     ndk_conf_merge_num64_prop(prop,default,...)\
 
165
            ndk_conf_merge_num64_value\
 
166
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
167
    
 
168
#define     ndk_conf_merge_num_flag_prop(prop,default,...)\
 
169
            ndk_conf_merge_num_flag_value\
 
170
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
171
    
 
172
#define     ndk_conf_merge_off_prop(prop,default,...)\
 
173
            ndk_conf_merge_off_value\
 
174
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
175
    
 
176
#define     ndk_conf_merge_ptr_prop(prop,default,...)\
 
177
            ndk_conf_merge_ptr_value\
 
178
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
179
    
 
180
#define     ndk_conf_merge_regex_prop(prop,default,...)\
 
181
            ndk_conf_merge_regex_value\
 
182
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
183
    
 
184
#define     ndk_conf_merge_regex_array_prop(prop,default,...)\
 
185
            ndk_conf_merge_regex_array_value\
 
186
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
187
    
 
188
#define     ndk_conf_merge_regex_array_caseless_prop(prop,default,...)\
 
189
            ndk_conf_merge_regex_array_caseless_value\
 
190
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
191
    
 
192
#define     ndk_conf_merge_regex_caseless_prop(prop,default,...)\
 
193
            ndk_conf_merge_regex_caseless_value\
 
194
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
195
    
 
196
#define     ndk_conf_merge_sec_prop(prop,default,...)\
 
197
            ndk_conf_merge_sec_value\
 
198
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
199
    
 
200
#define     ndk_conf_merge_sec_flag_prop(prop,default,...)\
 
201
            ndk_conf_merge_sec_flag_value\
 
202
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
203
    
 
204
#define     ndk_conf_merge_size_prop(prop,default,...)\
 
205
            ndk_conf_merge_size_value\
 
206
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
207
    
 
208
#define     ndk_conf_merge_split_path_prop(prop,default,...)\
 
209
            ndk_conf_merge_split_path_value\
 
210
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
211
    
 
212
#define     ndk_conf_merge_str_prop(prop,default,...)\
 
213
            ndk_conf_merge_str_value\
 
214
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
215
    
 
216
#define     ndk_conf_merge_str_array_prop(prop,default,...)\
 
217
            ndk_conf_merge_str_array_value\
 
218
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
219
    
 
220
#define     ndk_conf_merge_str_array_multi_prop(prop,default,...)\
 
221
            ndk_conf_merge_str_array_multi_value\
 
222
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
223
    
 
224
#define     ndk_conf_merge_true_prop(prop,default,...)\
 
225
            ndk_conf_merge_true_value\
 
226
                (conf->prop, prev->prop, default,##__VA_ARGS__)
 
227