comparison src/event/ngx_event.c @ 502:89dc5654117c NGINX_0_7_63

nginx 0.7.63 *) Security: now "/../" are disabled in "Destination" request header line. *) Change: minimum supported OpenSSL version is 0.9.7. *) Change: the "ask" parameter of the "ssl_verify_client" directive was changed to the "optional" parameter and now it checks a client certificate if it was offered. Thanks to Brice Figureau. *) Feature: now the "-V" switch shows TLS SNI support. *) Feature: the $ssl_client_verify variable. Thanks to Brice Figureau. *) Feature: the "ssl_crl" directive. Thanks to Brice Figureau. *) Bugfix: the $ssl_client_cert variable usage corrupted memory; the bug had appeared in 0.7.7. Thanks to Sergey Zhuravlev. *) Feature: now the start cache loader runs in a separate process; this should improve large caches handling. *) Feature: now temporary files and permanent storage area may reside at different file systems. *) Bugfix: nginx counted incorrectly disk cache size. *) Change: now directive "gzip_disable msie6" does not disable gzipping for MSIE 6.0 SV1. *) Bugfix: nginx always added "Vary: Accept-Encoding" response header line, if both "gzip_static" and "gzip_vary" were on. *) Feature: the "proxy" parameter of the "geo" directive. *) Feature: the ngx_http_geoip_module. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Feature: the "limit_req_log_level" and "limit_conn_log_level" directives. *) Bugfix: now "limit_req" directive conforms to the leaky bucket algorithm. Thanks to Maxim Dounin. *) Bugfix: in ngx_http_limit_req_module. Thanks to Maxim Dounin. *) Bugfix: now nginx allows underscores in a request method. *) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset" lines from backend response header. Thanks to Maxim Dounin. *) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend response header lines; the bug had appeared in 0.7.44. Thanks to Maxim Dounin. *) Feature: the "image_filter_transparency" directive. *) Feature: the "image_filter" directive supports variables for setting size. *) Bugfix: in PNG alpha-channel support in the ngx_http_image_filter_module. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Feature: now several "perl_modules" directives may be used. *) Bugfix: ngx_http_perl_module responses did not work in subrequests. *) Bugfix: nginx sent '\0' in a "Location" response header line on MKCOL request. Thanks to Xie Zhenye. *) Bugfix: an "error_page" directive did not redirect a 413 error; the bug had appeared in 0.6.10. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Oct 2009 00:00:00 +0300
parents ed5e10fb40fc
children 68c0ae0a4959
comparison
equal deleted inserted replaced
501:dc87c92181c7 502:89dc5654117c
41 41
42 ngx_uint_t ngx_event_flags; 42 ngx_uint_t ngx_event_flags;
43 ngx_event_actions_t ngx_event_actions; 43 ngx_event_actions_t ngx_event_actions;
44 44
45 45
46 ngx_atomic_t connection_counter = 1; 46 static ngx_atomic_t connection_counter = 1;
47 ngx_atomic_t *ngx_connection_counter = &connection_counter; 47 ngx_atomic_t *ngx_connection_counter = &connection_counter;
48 48
49 49
50 ngx_atomic_t *ngx_accept_mutex_ptr; 50 ngx_atomic_t *ngx_accept_mutex_ptr;
51 ngx_shmtx_t ngx_accept_mutex; 51 ngx_shmtx_t ngx_accept_mutex;
427 { 427 {
428 void ***cf; 428 void ***cf;
429 u_char *shared; 429 u_char *shared;
430 size_t size, cl; 430 size_t size, cl;
431 ngx_shm_t shm; 431 ngx_shm_t shm;
432 ngx_time_t *tp;
432 ngx_core_conf_t *ccf; 433 ngx_core_conf_t *ccf;
433 ngx_event_conf_t *ecf; 434 ngx_event_conf_t *ecf;
434 435
435 cf = ngx_get_conf(cycle->conf_ctx, ngx_events_module); 436 cf = ngx_get_conf(cycle->conf_ctx, ngx_events_module);
436 437
490 /* cl should be equal or bigger than cache line size */ 491 /* cl should be equal or bigger than cache line size */
491 492
492 cl = 128; 493 cl = 128;
493 494
494 size = cl /* ngx_accept_mutex */ 495 size = cl /* ngx_accept_mutex */
495 + cl; /* ngx_connection_counter */ 496 + cl /* ngx_connection_counter */
497 + cl; /* ngx_temp_number */
496 498
497 #if (NGX_STAT_STUB) 499 #if (NGX_STAT_STUB)
498 500
499 size += cl /* ngx_stat_accepted */ 501 size += cl /* ngx_stat_accepted */
500 + cl /* ngx_stat_handled */ 502 + cl /* ngx_stat_handled */
524 return NGX_ERROR; 526 return NGX_ERROR;
525 } 527 }
526 528
527 ngx_connection_counter = (ngx_atomic_t *) (shared + 1 * cl); 529 ngx_connection_counter = (ngx_atomic_t *) (shared + 1 * cl);
528 530
529 #if (NGX_STAT_STUB)
530
531 ngx_stat_accepted = (ngx_atomic_t *) (shared + 2 * cl);
532 ngx_stat_handled = (ngx_atomic_t *) (shared + 3 * cl);
533 ngx_stat_requests = (ngx_atomic_t *) (shared + 4 * cl);
534 ngx_stat_active = (ngx_atomic_t *) (shared + 5 * cl);
535 ngx_stat_reading = (ngx_atomic_t *) (shared + 6 * cl);
536 ngx_stat_writing = (ngx_atomic_t *) (shared + 7 * cl);
537
538 #endif
539
540 (void) ngx_atomic_cmp_set(ngx_connection_counter, 0, 1); 531 (void) ngx_atomic_cmp_set(ngx_connection_counter, 0, 1);
541 532
542 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 533 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
543 "counter: %p, %d", 534 "counter: %p, %d",
544 ngx_connection_counter, *ngx_connection_counter); 535 ngx_connection_counter, *ngx_connection_counter);
536
537 ngx_temp_number = (ngx_atomic_t *) (shared + 2 * cl);
538
539 tp = ngx_timeofday();
540
541 ngx_random_number = (tp->msec << 16) + ngx_pid;
542
543 #if (NGX_STAT_STUB)
544
545 ngx_stat_accepted = (ngx_atomic_t *) (shared + 3 * cl);
546 ngx_stat_handled = (ngx_atomic_t *) (shared + 4 * cl);
547 ngx_stat_requests = (ngx_atomic_t *) (shared + 5 * cl);
548 ngx_stat_active = (ngx_atomic_t *) (shared + 6 * cl);
549 ngx_stat_reading = (ngx_atomic_t *) (shared + 7 * cl);
550 ngx_stat_writing = (ngx_atomic_t *) (shared + 8 * cl);
551
552 #endif
545 553
546 return NGX_OK; 554 return NGX_OK;
547 } 555 }
548 556
549 557
1111 { 1119 {
1112 ngx_event_conf_t *ecf; 1120 ngx_event_conf_t *ecf;
1113 1121
1114 ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)); 1122 ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t));
1115 if (ecf == NULL) { 1123 if (ecf == NULL) {
1116 return NGX_CONF_ERROR; 1124 return NULL;
1117 } 1125 }
1118 1126
1119 ecf->connections = NGX_CONF_UNSET_UINT; 1127 ecf->connections = NGX_CONF_UNSET_UINT;
1120 ecf->use = NGX_CONF_UNSET_UINT; 1128 ecf->use = NGX_CONF_UNSET_UINT;
1121 ecf->multi_accept = NGX_CONF_UNSET; 1129 ecf->multi_accept = NGX_CONF_UNSET;
1126 #if (NGX_DEBUG) 1134 #if (NGX_DEBUG)
1127 1135
1128 if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4, 1136 if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4,
1129 sizeof(ngx_event_debug_t)) == NGX_ERROR) 1137 sizeof(ngx_event_debug_t)) == NGX_ERROR)
1130 { 1138 {
1131 return NGX_CONF_ERROR; 1139 return NULL;
1132 } 1140 }
1133 1141
1134 #endif 1142 #endif
1135 1143
1136 return ecf; 1144 return ecf;