mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-10 07:04:03 +00:00
Update from 0.7.59 to 0.8.0.
Remove IGNORE cause this is new development version (tree). Update patch for fancyindex module. <ChangeLog> *) Feature: the "keepalive_requests" directive. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Bugfix: XLST filter did not work in subrequests. *) Bugfix: in relative paths handling in nginx/Windows. *) Bugfix: in proxy_store, fastcgi_store, proxy_cache, and fastcgi_cache in nginx/Windows. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy. </ChangeLog>
This commit is contained in:
parent
d5e6d874d2
commit
ab1587bed2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235115
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= nginx
|
||||
PORTVERSION= 0.7.59
|
||||
PORTVERSION= 0.8.0
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://sysoev.ru/nginx/
|
||||
MASTER_SITES+= ${MASTER_SITE_LOCAL}
|
||||
@ -17,8 +17,6 @@ PKGNAMESUFFIX= -devel
|
||||
MAINTAINER= osa@FreeBSD.org
|
||||
COMMENT= Robust and small WWW server
|
||||
|
||||
IGNORE= The same version available in www/nginx
|
||||
|
||||
OPTIONS= DEBUG "Enable nginx debugging" off \
|
||||
IPV6 "Enable IPv6" off \
|
||||
GOOGLE_PERFTOOLS "Enable google perftools module" off \
|
||||
|
@ -1,6 +1,6 @@
|
||||
MD5 (nginx-0.7.59.tar.gz) = d981b03b4c3ba43de580553355608b63
|
||||
SHA256 (nginx-0.7.59.tar.gz) = e12f0ec0f97e635ec1a249719bbe23ca1c9d3809e4019dde404e72ccdf277d75
|
||||
SIZE (nginx-0.7.59.tar.gz) = 593586
|
||||
MD5 (nginx-0.8.0.tar.gz) = 0b1fdb5416a130483b62309a5235c0f3
|
||||
SHA256 (nginx-0.8.0.tar.gz) = b92567c5cbeb4986268729807abaa473266458c8ef0334b51db9b54480b225d0
|
||||
SIZE (nginx-0.8.0.tar.gz) = 594153
|
||||
MD5 (nginx-accesskey-2.0.3.tar.gz) = 9b5304346d5139b1841f5baa01ab0cbe
|
||||
SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
|
||||
SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c.orig 2007-09-29 01:02:05.000000000 +0400
|
||||
+++ ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c 2008-08-11 17:33:42.810249087 +0400
|
||||
@@ -290,7 +290,7 @@
|
||||
+++ ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c 2009-06-03 16:41:36.000000000 +0400
|
||||
@@ -290,12 +290,12 @@
|
||||
ngx_http_fancyindex_entry_t *entry;
|
||||
|
||||
off_t length;
|
||||
@ -9,16 +9,40 @@
|
||||
u_char *filename, *last, scale;
|
||||
ngx_tm_t tm;
|
||||
ngx_array_t entries;
|
||||
@@ -426,7 +426,7 @@
|
||||
ngx_time_t *tp;
|
||||
- ngx_uint_t i;
|
||||
+ ngx_uint_t i, utf8;
|
||||
ngx_int_t size;
|
||||
ngx_str_t path;
|
||||
ngx_str_t readme_path;
|
||||
@@ -355,6 +355,15 @@
|
||||
filename = path.data;
|
||||
filename[path.len] = '/';
|
||||
|
||||
+ if (r->headers_out.charset.len == 5
|
||||
+ && ngx_strncasecmp(r->headers_out.charset.data, (u_char *) "utf-8", 5)
|
||||
+ == 0)
|
||||
+ {
|
||||
+ utf8 = 1;
|
||||
+ } else {
|
||||
+ utf8 = 0;
|
||||
+ }
|
||||
+
|
||||
/* Read directory entries and their associated information. */
|
||||
for (;;) {
|
||||
ngx_set_errno(0);
|
||||
@@ -425,8 +434,8 @@
|
||||
entry->dir = ngx_de_is_dir(&dir);
|
||||
entry->mtime = ngx_de_mtime(&dir);
|
||||
entry->size = ngx_de_size(&dir);
|
||||
entry->utf_len = (r->utf8)
|
||||
- entry->utf_len = (r->utf8)
|
||||
- ? ngx_utf_length(entry->name.data, entry->name.len)
|
||||
+ entry->utf_len = utf8
|
||||
+ ? ngx_utf8_length(entry->name.data, entry->name.len)
|
||||
: len;
|
||||
}
|
||||
|
||||
@@ -563,12 +563,13 @@
|
||||
@@ -563,12 +572,13 @@
|
||||
|
||||
if (entry[i].name.len - len) {
|
||||
if (len > NGX_HTTP_FANCYINDEX_NAME_LEN) {
|
||||
|
Loading…
Reference in New Issue
Block a user