From b85fd593e08b8f27a18fb7e2feda02f01d9db15d Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 23 Aug 2005 15:36:54 +0000
Subject: nginx-0.1.42-RELEASE import

    *) Bugfix: if the request URI had a zero length after the processing in
       the ngx_http_proxy_module, then the segmentation fault or bus error
       occurred in the ngx_http_proxy_module.

    *) Bugfix: the "limit_rate" directive did not work inside the "if"
       block; the bug had appeared in 0.1.38.
---
 src/event/ngx_event_timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/event/ngx_event_timer.c')

diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index 53bbc5f09..4d6c647da 100644
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -67,7 +67,7 @@ ngx_event_find_timer(void)
                          (node->key * NGX_TIMER_RESOLUTION - ngx_elapsed_msec);
 #endif
 
-    return timer > 0 ? timer: 0 ;
+    return timer > 0 ? timer : 0 ;
 }
 
 
-- 
cgit