svn commit: r366115 - head/www/squid33

[John Marino]

Author: marino
Date: Mon Aug 25 17:54:18 2014
New Revision: 366115
URL: http://svnweb.freebsd.org/changeset/ports/366115
QAT: https://qat.redports.org/buildarchive/r366115/

Log:
  www/squid33: Clarify option for http-violations
  
  The option STRICT_HTTP was highly misleading.  If enabled, it disabled
  strict checking, the opposite of what somebody would reasonably assume.
  Rename the option to LAX_HTTP and improve the description to ward off
  potential confusion.
  
  PR:		192980
  Reported by:	screenblack (gmail)

Modified:
  head/www/squid33/Makefile

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Mon Aug 25 17:53:26 2014	(r366114)
+++ head/www/squid33/Makefile	Mon Aug 25 17:54:18 2014	(r366115)
@@ -51,9 +51,11 @@ OPTIONS_DEFINE=	ARP_ACL AUTH_KERB AUTH_L
 		AUTH_SQL \
 		CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \
 		FOLLOW_XFF FS_AUFS FS_COSS HTCP ICAP ICMP IDENT IPV6 KQUEUE \
-		LARGEFILE SNMP SSL SSL_CRTD STACKTRACES STRICT_HTTP \
+		LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
 		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
 
+OPTIONS_DEFAULT=AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE SNMP WCCP WCCPV2
+
 # TODO:
 # add an option for external_acl/session (requires some kind of external
 # Berkeley DB support, unsure which one)
@@ -83,7 +85,7 @@ SNMP_DESC=	Enable SNMP support
 SSL_CRTD_DESC=	Use ssl_crtd to handle SSL cert requests
 SSL_DESC=	Enable SSL gatewaying support
 STACKTRACES_DESC=	Enable automatic backtraces on fatal errors
-STRICT_HTTP_DESC=	Make Squid strictly HTTP compliant
+LAX_HTTP_DESC=	Do not enforce strict HTTP compliance
 TP_IPFW_DESC=	Enable transparent proxying with IPFW
 TP_IPF_DESC=	Enable transparent proxying with IPFilter
 TP_PF_DESC=	Enable transparent proxying with PF
@@ -91,9 +93,6 @@ VIA_DB_DESC=	Enable Forward/Via database
 WCCPV2_DESC=	Enable Web Cache Coordination Protocol v2
 WCCP_DESC=	Enable Web Cache Coordination Protocol
 
-OPTIONS_DEFAULT=	AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE \
-			SNMP WCCP WCCPV2
-
 ECAP_USES=		pkgconfig:build
 
 change_files=	ChangeLog\
@@ -128,7 +127,7 @@ VIA_DB_CONFIGURE_ENABLE=	forw-via-db
 CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
 WCCP_CONFIGURE_ENABLE=		wccp
 WCCPV2_CONFIGURE_ENABLE=	wccpv2
-STRICT_HTTP_CONFIGURE_ENABLE=	http-violations
+LAX_HTTP_CONFIGURE_ENABLE=	http-violations
 IDENT_CONFIGURE_ENABLE=		ident-lookups
 ARP_ACL_CONFIGURE_ENABLE=	eui
 TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent