comparison src/http/ngx_http_request.c @ 635:18268abd340c release-0.3.39

nginx-0.3.39-RELEASE import *) Feature: the "uninitialized_variable_warn" directive; the logging level of the "uninitialized variable" message was lowered from "alert" to "warn". *) Feature: the "override_charset" directive. *) Change: now if the unknown variable is used in the "echo" and "if expr='$name'" SSI-commands, then the "unknown variable" message is not logged. *) Bugfix: the active connection counter increased on the exceeding of the connection limit specified by the "worker_connections" directive; the bug had appeared in 0.2.0. *) Bugfix: the limit rate might not work on some condition; the bug had appeared in 0.3.38.
author Igor Sysoev <igor@sysoev.ru>
date Mon, 17 Apr 2006 19:55:41 +0000
parents f971949ffb58
children e60fe4cf1d4e
comparison
equal deleted inserted replaced
634:af8e20368022 635:18268abd340c
1471 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 1471 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1472 "http wake parent request: \"%V?%V\"", 1472 "http wake parent request: \"%V?%V\"",
1473 &pr->uri, &pr->args); 1473 &pr->uri, &pr->args);
1474 1474
1475 pr->write_event_handler(pr); 1475 pr->write_event_handler(pr);
1476
1477 #if 0
1478 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1479 "http request: \"%V?%V\" still has postponed",
1480 &pr->uri, &pr->args);
1481
1482 if (pr->done || pr->postponed->out) {
1483 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
1484 "http wake parent request: \"%V?%V\"",
1485 &pr->uri, &pr->args);
1486
1487 pr->write_event_handler(pr);
1488 }
1489 #endif
1490
1491 } 1476 }
1492 1477
1493 return; 1478 return;
1494 } 1479 }
1495 1480
1854 && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) 1839 && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
1855 { 1840 {
1856 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay"); 1841 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
1857 1842
1858 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, 1843 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
1859 (const void *) &tcp_nodelay, sizeof(int)) == -1) 1844 (const void *) &tcp_nodelay, sizeof(int))
1845 == -1)
1860 { 1846 {
1861 ngx_connection_error(c, ngx_socket_errno, 1847 ngx_connection_error(c, ngx_socket_errno,
1862 "setsockopt(TCP_NODELAY) failed"); 1848 "setsockopt(TCP_NODELAY) failed");
1863 ngx_http_close_connection(c); 1849 ngx_http_close_connection(c);
1864 return; 1850 return;