Index: branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h
===================================================================
--- branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h	(nonexistent)
+++ branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h	(revision 498742)
@@ -0,0 +1,11 @@
+--- src/security/ServerOptions.h.orig	2019-02-19 02:46:22 UTC
++++ src/security/ServerOptions.h
+@@ -35,7 +35,7 @@ class ServerOptions : public PeerOptions (public)
+         // is more secure to have only a small set of trusted CA.
+         flags.tlsDefaultCa.defaultTo(false);
+     }
+-    ServerOptions(const ServerOptions &) = default;
++    ServerOptions(const ServerOptions &) = delete;
+     ServerOptions &operator =(const ServerOptions &);
+     ServerOptions(ServerOptions &&o) { this->operator =(o); }
+     ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; }

Property changes on: branches/2019Q2/www/squid/files/patch-src_security_ServerOptions.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h
===================================================================
--- branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h	(nonexistent)
+++ branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h	(revision 498742)
@@ -0,0 +1,11 @@
+--- src/security/ServerOptions.h.orig	2018-06-11 16:30:57 UTC
++++ src/security/ServerOptions.h
+@@ -29,7 +29,7 @@ class ServerOptions : public PeerOptions (public)
+         // is more secure to have only a small set of trusted CA.
+         flags.tlsDefaultCa.defaultTo(false);
+     }
+-    ServerOptions(const ServerOptions &) = default;
++    ServerOptions(const ServerOptions &) = delete;
+     ServerOptions &operator =(const ServerOptions &);
+     ServerOptions(ServerOptions &&o) { this->operator =(o); }
+     ServerOptions &operator =(ServerOptions &&o) { this->operator =(o); return *this; }

Property changes on: branches/2019Q2/www/squid-devel/files/patch-src_security_ServerOptions.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 498741)
+++ branches/2019Q2	(revision 498742)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r498377