Klaus Demo nginx / fc03bdd
Merge of r4500: fixed spelling in single-line comments. Maxim Dounin 8 years ago
21 changed file(s) with 38 addition(s) and 38 deletion(s). Raw diff Collapse all Expand all
286286
287287 days = n / 86400;
288288
289 /* Jaunary 1, 1970 was Thursday */
289 /* January 1, 1970 was Thursday */
290290
291291 wday = (4 + days) % 7;
292292
8282 #endif
8383
8484 #if (NGX_WIN32)
85 /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */
85 /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */
8686 unsigned accept_context_updated:1;
8787 #endif
8888
841841 case NGX_ERROR:
842842 c->read->error = 1;
843843
844 /* fall thruogh */
844 /* fall through */
845845
846846 case NGX_AGAIN:
847847 return c->ssl->last;
945945 return NGX_OK;
946946 }
947947
948 /* the first free buf is partialy filled, thus add the free buf after it */
948 /* the first free buf is partially filled, thus add the free buf after it */
949949
950950 cl->next = p->free_raw_bufs->next;
951951 p->free_raw_bufs->next = cl;
9494 NULL, /* create server configuration */
9595 NULL, /* merge server configuration */
9696
97 ngx_http_autoindex_create_loc_conf, /* create location configration */
98 ngx_http_autoindex_merge_loc_conf /* merge location configration */
97 ngx_http_autoindex_create_loc_conf, /* create location configuration */
98 ngx_http_autoindex_merge_loc_conf /* merge location configuration */
9999 };
100100
101101
6161 NULL, /* create server configuration */
6262 NULL, /* merge server configuration */
6363
64 ngx_http_index_create_loc_conf, /* create location configration */
65 ngx_http_index_merge_loc_conf /* merge location configration */
64 ngx_http_index_create_loc_conf, /* create location configuration */
65 ngx_http_index_merge_loc_conf /* merge location configuration */
6666 };
6767
6868
111111 NULL, /* create server configuration */
112112 NULL, /* merge server configuration */
113113
114 ngx_http_limit_req_create_conf, /* create location configration */
115 ngx_http_limit_req_merge_conf /* merge location configration */
114 ngx_http_limit_req_create_conf, /* create location configuration */
115 ngx_http_limit_req_merge_conf /* merge location configuration */
116116 };
117117
118118
9595 NULL, /* create server configuration */
9696 NULL, /* merge server configuration */
9797
98 ngx_http_limit_zone_create_conf, /* create location configration */
99 ngx_http_limit_zone_merge_conf /* merge location configration */
98 ngx_http_limit_zone_create_conf, /* create location configuration */
99 ngx_http_limit_zone_merge_conf /* merge location configuration */
100100 };
101101
102102
160160 NULL, /* create server configuration */
161161 NULL, /* merge server configuration */
162162
163 ngx_http_log_create_loc_conf, /* create location configration */
164 ngx_http_log_merge_loc_conf /* merge location configration */
163 ngx_http_log_create_loc_conf, /* create location configuration */
164 ngx_http_log_merge_loc_conf /* merge location configuration */
165165 };
166166
167167
374374
375375 if (!r->root_tested) {
376376
377 /* test root directory existance */
377 /* test root directory existence */
378378
379379 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) {
380 /* simulate successfull logging */
380 /* simulate successful logging */
381381 return len;
382382 }
383383
398398 != NGX_OK)
399399 {
400400 if (of.err == 0) {
401 /* simulate successfull logging */
401 /* simulate successful logging */
402402 return len;
403403 }
404404
405405 ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err,
406406 "testing \"%s\" existence failed", path.data);
407407
408 /* simulate successfull logging */
408 /* simulate successful logging */
409409 return len;
410410 }
411411
413413 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ENOTDIR,
414414 "testing \"%s\" existence failed", path.data);
415415
416 /* simulate successfull logging */
416 /* simulate successful logging */
417417 return len;
418418 }
419419 }
422422 script->values->elts)
423423 == NULL)
424424 {
425 /* simulate successfull logging */
425 /* simulate successful logging */
426426 return len;
427427 }
428428
446446 {
447447 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
448448 "%s \"%s\" failed", of.failed, log.data);
449 /* simulate successfull logging */
449 /* simulate successful logging */
450450 return len;
451451 }
452452
114114 NULL, /* create server configuration */
115115 NULL, /* merge server configuration */
116116
117 ngx_http_memcached_create_loc_conf, /* create location configration */
118 ngx_http_memcached_merge_loc_conf /* merge location configration */
117 ngx_http_memcached_create_loc_conf, /* create location configuration */
118 ngx_http_memcached_merge_loc_conf /* merge location configuration */
119119 };
120120
121121
457457 NULL, /* create server configuration */
458458 NULL, /* merge server configuration */
459459
460 ngx_http_proxy_create_loc_conf, /* create location configration */
461 ngx_http_proxy_merge_loc_conf /* merge location configration */
460 ngx_http_proxy_create_loc_conf, /* create location configuration */
461 ngx_http_proxy_merge_loc_conf /* merge location configuration */
462462 };
463463
464464
4848 NULL, /* create server configuration */
4949 NULL, /* merge server configuration */
5050
51 ngx_http_random_index_create_loc_conf, /* create location configration */
52 ngx_http_random_index_merge_loc_conf /* merge location configration */
51 ngx_http_random_index_create_loc_conf, /* create location configuration */
52 ngx_http_random_index_merge_loc_conf /* merge location configuration */
5353 };
5454
5555
111111 NULL, /* create server configuration */
112112 NULL, /* merge server configuration */
113113
114 ngx_http_rewrite_create_loc_conf, /* create location configration */
115 ngx_http_rewrite_merge_loc_conf /* merge location configration */
114 ngx_http_rewrite_create_loc_conf, /* create location configuration */
115 ngx_http_rewrite_merge_loc_conf /* merge location configuration */
116116 };
117117
118118
165165 NULL, /* create server configuration */
166166 NULL, /* merge server configuration */
167167
168 ngx_http_userid_create_conf, /* create location configration */
169 ngx_http_userid_merge_conf /* merge location configration */
168 ngx_http_userid_create_conf, /* create location configuration */
169 ngx_http_userid_merge_conf /* merge location configuration */
170170 };
171171
172172
241241 year -= 1;
242242 }
243243
244 /* Gauss' formula for Grigorian days since March 1, 1 BC */
244 /* Gauss' formula for Gregorian days since March 1, 1 BC */
245245
246246 time = (uint64_t) (
247247 /* days in years including leap years since March 1, 1 BC */
22622262 }
22632263
22642264 if (ngx_event_flags & NGX_USE_AIO_EVENT) {
2265 /* the posted aio operation may currupt a shadow buffer */
2265 /* the posted aio operation may corrupt a shadow buffer */
22662266 p->single_buf = 1;
22672267 }
22682268
217217
218218 break;
219219
220 /* suppress warinings */
220 /* suppress warnings */
221221 case ngx_pop3_passwd:
222222 break;
223223
172172
173173 if (file && header.nelts == 0) {
174174
175 /* create the tailer iovec and coalesce the neighbouring bufs */
175 /* create the trailer iovec and coalesce the neighbouring bufs */
176176
177177 prev = NULL;
178178 iov = NULL;
177177
178178 if (file) {
179179
180 /* create the tailer iovec and coalesce the neighbouring bufs */
180 /* create the trailer iovec and coalesce the neighbouring bufs */
181181
182182 prev = NULL;
183183 iov = NULL;
6666
6767 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
6868
69 /* crypt() is a time consuming funtion, so we only try to lock */
69 /* crypt() is a time consuming function, so we only try to lock */
7070
7171 if (ngx_mutex_trylock(ngx_crypt_mutex) != NGX_OK) {
7272 return NGX_AGAIN;
1919 {
2020 /* primary thread */
2121
22 /* StartServiceCtrlDispatcher() shouxpdl be called within 30 seconds */
22 /* StartServiceCtrlDispatcher() should be called within 30 seconds */
2323
2424 if (StartServiceCtrlDispatcher(st) == 0) {
2525 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,