View | Details | Raw Unified | Return to bug 240460 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-8 / +8 lines)
Lines 82-95 Link Here
82
	ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
82
	ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
83
	GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
83
	GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
84
	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
84
	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
85
	HTTP_FOOTER HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \
85
	HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS \
86
	HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE \
86
	HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM \
87
	HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS \
87
	HTTP_REDIS HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \
88
	HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \
88
	HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
89
	HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA MEMC MODSECURITY \
89
	HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA \
90
	MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \
90
	MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
91
	SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS \
91
	RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \
92
	WEBSOCKIFY
92
	SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
93
OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
93
OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
94
OPTIONS_DEFINE=	DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
94
OPTIONS_DEFINE=	DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
95
OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
95
OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
(-)Makefile.extmod (+8 lines)
Lines 108-113 Link Here
108
HTTP_GEOIP2_VARS=		DSO_EXTMODS+=geoip2
108
HTTP_GEOIP2_VARS=		DSO_EXTMODS+=geoip2
109
HTTP_GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
109
HTTP_GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
110
110
111
HTTP_IP2LOCATION_GH_TUPLE=	ip2location:ip2location-nginx:d47d248:ip2location
112
HTTP_IP2LOCATION_LIB_DEPENDS=	libIP2Location.so:net/ip2location
113
HTTP_IP2LOCATION_CONFIGURE_ON=	--add-module=${WRKSRC_ip2location}
114
115
HTTP_IP2PROXY_GH_TUPLE=		ip2location:ip2proxy-nginx:d6fd05a:ip2proxy
116
HTTP_IP2PROXY_LIB_DEPENDS=	libIP2Location.so:net/ip2location
117
HTTP_IP2PROXY_CONFIGURE_ON=	--add-module=${WRKSRC_ip2proxy}
118
111
HTTP_JSON_STATUS_GH_TUPLE=	nginx-modules:ngx_http_json_status_module:1d2f303:json_status
119
HTTP_JSON_STATUS_GH_TUPLE=	nginx-modules:ngx_http_json_status_module:1d2f303:json_status
112
HTTP_JSON_STATUS_CONFIGURE_ON=	--add-module=${WRKSRC_json_status}
120
HTTP_JSON_STATUS_CONFIGURE_ON=	--add-module=${WRKSRC_json_status}
113
121
(-)Makefile.options.desc (+2 lines)
Lines 43-48 Link Here
43
HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
43
HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
44
HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
44
HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
45
HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
45
HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
46
HTTP_IP2LOCATION_DESC=		3rd party ip2location-nginx module
47
HTTP_IP2PROXY_DESC=		3rd party ip2proxy-nginx module
46
HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
48
HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
47
HTTP_MOGILEFS_DESC=		3rd party mogilefs module
49
HTTP_MOGILEFS_DESC=		3rd party mogilefs module
48
HTTP_MP4_DESC=			Enable http_mp4 module
50
HTTP_MP4_DESC=			Enable http_mp4 module
(-)distinfo (+4 lines)
Lines 137-139 Link Here
137
SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
137
SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
138
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
138
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
139
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
139
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
140
SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
141
SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
142
SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
143
SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573

Return to bug 240460