mirror of
https://github.com/nginx/nginx.git
synced 2026-08-28 12:45:21 +00:00
nginx-0.3.4-RELEASE import
*) Bugfix: nginx could not be built on Linux 2.4+ and MacOS X; the bug
had appeared in 0.3.3.
This commit is contained in:
parent
2962ffedf6
commit
e173ceabff
4 changed files with 22 additions and 4 deletions
|
|
@ -8,7 +8,7 @@
|
|||
#define _NGINX_H_INCLUDED_
|
||||
|
||||
|
||||
#define NGINX_VER "nginx/0.3.3"
|
||||
#define NGINX_VER "nginx/0.3.4"
|
||||
|
||||
#define NGINX_VAR "NGINX"
|
||||
#define NGX_OLDPID_EXT ".oldbin"
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (tlen < sizeof(int) || timeout == 0) {
|
||||
if (olen < sizeof(int) || timeout == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -114,9 +114,11 @@ ngx_module_t ngx_kqueue_module = {
|
|||
static ngx_int_t
|
||||
ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer)
|
||||
{
|
||||
struct kevent kev;
|
||||
struct timespec ts;
|
||||
ngx_kqueue_conf_t *kcf;
|
||||
struct timespec ts;
|
||||
#if (NGX_HAVE_TIMER_EVENT)
|
||||
struct kevent kev;
|
||||
#endif
|
||||
|
||||
kcf = ngx_event_get_conf(cycle->conf_ctx, ngx_kqueue_module);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue