Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx-0.3.4-RELEASE import

Browse source 
*) 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:
Igor Sysoev 2005-10-19 13:34:28 +00:00
parent 87387f788f
commit a4043c79f3
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/xml/nginx/changes.xml
View file

@ -9,6 +9,22 @@
<title lang="en">nginx changelog</title>
<changes ver="0.3.4" date="19.09.2005">
<change type="bugfix">
<para lang="ru">
nginx ÎÅ ÓÏÂÉÒÁÌÓÑ ÎÁ Linux 2.4+ É MacOS X;
ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.3.3.
</para>
<para lang="en">
nginx could not be built on Linux 2.4+ and MacOS X;
bug appeared in 0.3.3.
</para>
</change>
</changes>
<changes ver="0.3.3" date="19.10.2005">
<change type="change">

2
src/core/nginx.h
View file

@ -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"

2
src/core/ngx_connection.c
View file

@ -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;
}

6
src/event/modules/ngx_kqueue_module.c
View file

@ -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);