diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2010-04-01 17:03:35 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2010-04-01 17:03:35 +0000 |
| commit | 2c0d6d89b12f8c265979be53ed224162d95f284b (patch) | |
| tree | 8e2eeec37d5e6947e982f3a5f2e9145e94fb4dbd | |
| parent | 8e604ae7c69d4b6e66f6545e93b659444493d5f3 (diff) | |
| download | ports-2c0d6d89b12f8c265979be53ed224162d95f284b.tar.gz ports-2c0d6d89b12f8c265979be53ed224162d95f284b.zip | |
Notes
| -rw-r--r-- | www/nginx-devel/Makefile | 6 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-ngx_http_echo_timer.c | 28 |
3 files changed, 36 insertions, 4 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 983c23d9753a..1996d5a8f983 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nginx -PORTVERSION= 0.8.34 +PORTVERSION= 0.8.35 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -461,6 +461,10 @@ post-patch: @${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \ s!%%PREFIX%%!${PREFIX}!' \ ${WRKSRC}/conf/nginx.conf +.if defined(WITH_ECHO_MODULE) + @${PATCH} ${PATCH_ARGS} < \ + ${PATCHDIR}/extra-patch-ngx_http_echo_timer.c +.endif .if defined(WITH_HTTP_ACCESSKEY_MODULE) @${REINPLACE_CMD} \ 's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \ diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 0fd2ccaea748..129920126c59 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (nginx-0.8.34.tar.gz) = cc49e53b64fc64b0e9e5e57acb94d4d6 -SHA256 (nginx-0.8.34.tar.gz) = f7cf3bcd0dcd3473ebff76aeee12974112d035737a2fc7f38b0a190f3a2949f6 -SIZE (nginx-0.8.34.tar.gz) = 621534 +MD5 (nginx-0.8.35.tar.gz) = e6d6d500625a6b786f457894768be930 +SHA256 (nginx-0.8.35.tar.gz) = 2b6c492eadc525b6a21aa8e6fcff8be8fc06b13682776364d403c6f2d544451b +SIZE (nginx-0.8.35.tar.gz) = 622870 MD5 (nginx_accept_language_module.tar.gz) = 330a8d3b2376fb476b5d3111a7905ec3 SHA256 (nginx_accept_language_module.tar.gz) = 7a4c2d42a83c5b6efd2b7b13ad232850b6ab0ca4261df6b46fb7d2d2738b1c0a SIZE (nginx_accept_language_module.tar.gz) = 3299 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_echo_timer.c b/www/nginx-devel/files/extra-patch-ngx_http_echo_timer.c new file mode 100644 index 000000000000..8465aa7d0884 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_echo_timer.c @@ -0,0 +1,28 @@ +--- ../ngx_echo_module-0.26/src/ngx_http_echo_timer.c.orig 2010-04-01 19:33:04.000000000 +0400 ++++ ../ngx_echo_module-0.26/src/ngx_http_echo_timer.c 2010-04-01 19:33:09.000000000 +0400 +@@ -23,7 +23,11 @@ + ctx->timer_begin.msec = (ngx_msec_t) r->start_msec; + } + +- ngx_time_update(0, 0); /* force the ngx timer to update */ ++#if defined nginx_version && nginx_version >= 8035 ++ ngx_time_update(); /* force the ngx timer to update */ ++#else ++ ngx_time_update(0, 0); /* force the ngx timer to update */ ++#endif + tp = ngx_timeofday(); + + dd("old sec msec: %ld %d\n", ctx->timer_begin.sec, ctx->timer_begin.msec); +@@ -52,7 +56,11 @@ + ngx_http_echo_ctx_t *ctx) + { + dd("Exec timer..."); +- ngx_time_update(0, 0); /* force the ngx timer to update */ ++#if defined nginx_version && nginx_version >= 8035 ++ ngx_time_update(); /* force the ngx timer to update */ ++#else ++ ngx_time_update(0, 0); /* force the ngx timer to update */ ++#endif + + ctx->timer_begin = *ngx_timeofday(); + return NGX_OK; |