Move helpers/defines.h to src/helper/protocol_defines.h

diff --git a/configure.ac b/configure.ac
index b91cf976e3422b879028c39f0a8a42e0f3926e3b..d61e5260cce4adbd86dd843bd54db6932013d4d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3796,7 +3796,6 @@ AC_CONFIG_FILES([
        doc/manuals/Makefile
        doc/release-notes/Makefile
        errors/Makefile
-       helpers/Makefile
        icons/Makefile
        lib/Makefile
        lib/libTrie/Makefile

diff --git a/helpers/Makefile.am b/helpers/Makefile.am
deleted file mode 100644 (file)
index 5051f96..0000000
--- a/helpers/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-
-EXTRA_DIST = defines.h

diff --git a/src/acl/external/AD_group/ext_ad_group_acl.cc b/src/acl/external/AD_group/ext_ad_group_acl.cc
index 4f06fa75615b770bcc65c294d5368d161a90583a..87342de30e4ca6ee579a58a2fd8ceed2b01d2fe4 100644 (file)
--- a/src/acl/external/AD_group/ext_ad_group_acl.cc
+++ b/src/acl/external/AD_group/ext_ad_group_acl.cc
@@ -66,7 +66,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "include/util.h"
 
 #if _SQUID_CYGWIN_

diff --git a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
index af500eb642379023ea85cf226e16010c44af579a..0356873b780ac378d0c6f1b1ed3354faaf6745da 100644 (file)
--- a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
+++ b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc
@@ -38,7 +38,7 @@
  * OpenSSL libraries linked into openldap. See http://www.openssl.org/
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/acl/external/LM_group/ext_lm_group_acl.cc b/src/acl/external/LM_group/ext_lm_group_acl.cc
index 5beac3d969f8d1ad8ee571ebc1ff5347ebe6ffbc..1c8cdff27fc5e452e144e3d888f1bb30c2f9c805 100644 (file)
--- a/src/acl/external/LM_group/ext_lm_group_acl.cc
+++ b/src/acl/external/LM_group/ext_lm_group_acl.cc
@@ -76,7 +76,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
index e27d6dedda90a38cfd2e3dfe5bbf2a65cfcbcb6d..f42902420c57cf06d0a0e422e27c30a56308e3ab 100644 (file)
--- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
+++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
@@ -36,7 +36,7 @@
 
 /* Squid-3.X includes */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/acl/external/file_userip/ext_file_userip_acl.cc b/src/acl/external/file_userip/ext_file_userip_acl.cc
index 6c1e5b9b297f73187231fd0eae27a8ce36c1921d..f9ed7fb18af4606cfeb8fc913e5fc0cdeacba221 100644 (file)
--- a/src/acl/external/file_userip/ext_file_userip_acl.cc
+++ b/src/acl/external/file_userip/ext_file_userip_acl.cc
@@ -27,7 +27,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
index 391f5eae771b050c4eba92f5160cd7501a93bccd..25189f7a7d4106723545b170e888a3a4e85e42a3 100644 (file)
--- a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
+++ b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc
@@ -36,7 +36,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/acl/external/session/ext_session_acl.cc b/src/acl/external/session/ext_session_acl.cc
index 600230d1731eab05b86c6d7d56fd04fa0f588c2f..30504f800b23e79de4b40cb99780737e55041394 100644 (file)
--- a/src/acl/external/session/ext_session_acl.cc
+++ b/src/acl/external/session/ext_session_acl.cc
@@ -29,7 +29,7 @@
 #if HAVE_CONFIG_H
 #include "squid.h"
 #endif
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstdlib>
 #include <cstring>

diff --git a/src/acl/external/time_quota/ext_time_quota_acl.cc b/src/acl/external/time_quota/ext_time_quota_acl.cc
index 63b5a1926bd9ff0b40fa933c91b822fabdb5d5fe..3b7950f652a80374137e376d7c7a3d8f8f7aad0a 100644 (file)
--- a/src/acl/external/time_quota/ext_time_quota_acl.cc
+++ b/src/acl/external/time_quota/ext_time_quota_acl.cc
@@ -27,7 +27,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstdarg>
 #include <cstdlib>

diff --git a/src/acl/external/unix_group/check_group.cc b/src/acl/external/unix_group/check_group.cc
index daf2369169bd825e22a9c6083dc3c3d90319c065..a428325f3cc55218eb87580cc8aaba3bce8293e6 100644 (file)
--- a/src/acl/external/unix_group/check_group.cc
+++ b/src/acl/external/unix_group/check_group.cc
@@ -62,7 +62,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/auth/basic/NCSA/basic_ncsa_auth.cc b/src/auth/basic/NCSA/basic_ncsa_auth.cc
index 1b5068626f5a7c022ed09cfdb8a4a1931e4e7e00..2b95e7083ac824455481ee38536f89bd09fdb6ec 100644 (file)
--- a/src/auth/basic/NCSA/basic_ncsa_auth.cc
+++ b/src/auth/basic/NCSA/basic_ncsa_auth.cc
@@ -26,7 +26,7 @@
 
 #include "squid.h"
 #include "auth/basic/NCSA/crypt_md5.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 
 #include <string>

diff --git a/src/auth/basic/PAM/basic_pam_auth.cc b/src/auth/basic/PAM/basic_pam_auth.cc
index 80e560099f27829f6d2f64c9ea21895f897db86f..ea9d517234df4480350d96590d04188350363972 100644 (file)
--- a/src/auth/basic/PAM/basic_pam_auth.cc
+++ b/src/auth/basic/PAM/basic_pam_auth.cc
@@ -71,7 +71,7 @@
  *  Initial version
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/auth/basic/RADIUS/basic_radius_auth.cc b/src/auth/basic/RADIUS/basic_radius_auth.cc
index 97037964d71993e0b82ecb6e1f9ed1d61deadf31..763c3c8512c73c2c3e7dd7f06eb4e50d59ea4fdb 100644 (file)
--- a/src/auth/basic/RADIUS/basic_radius_auth.cc
+++ b/src/auth/basic/RADIUS/basic_radius_auth.cc
@@ -56,7 +56,7 @@
 #include "squid.h"
 #include "auth/basic/RADIUS/radius-util.h"
 #include "auth/basic/RADIUS/radius.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "md5.h"
 
 #include <cctype>

diff --git a/src/auth/basic/SASL/basic_sasl_auth.cc b/src/auth/basic/SASL/basic_sasl_auth.cc
index 7bc271220ddeb4331f85d753ce0f0e639865e131..2464bde2793dd485563bcd4e20d7005e87e50295 100644 (file)
--- a/src/auth/basic/SASL/basic_sasl_auth.cc
+++ b/src/auth/basic/SASL/basic_sasl_auth.cc
@@ -33,7 +33,7 @@
  *
  */
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/auth/basic/SMB/basic_smb_auth.cc b/src/auth/basic/SMB/basic_smb_auth.cc
index 4ab10b4a67131fe0d41139114a54d78d1512d823..0145a320849e34f2cd2d4127c059d48d1ef111da 100644 (file)
--- a/src/auth/basic/SMB/basic_smb_auth.cc
+++ b/src/auth/basic/SMB/basic_smb_auth.cc
@@ -25,7 +25,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/auth/basic/SSPI/basic_sspi_auth.cc b/src/auth/basic/SSPI/basic_sspi_auth.cc
index 8c7c006d7888079072f323a0d0a3a24e958bc6d3..6781cfb1fb8feb7803774e45c56bb872a788f58b 100644 (file)
--- a/src/auth/basic/SSPI/basic_sspi_auth.cc
+++ b/src/auth/basic/SSPI/basic_sspi_auth.cc
@@ -34,7 +34,7 @@
 
 #include "squid.h"
 #include "auth/basic/SSPI/valid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/src/auth/basic/fake/fake.cc b/src/auth/basic/fake/fake.cc
index f574def848d612a1090487575ccd7032c6d6827a..901fe8ddba1c48752387b6546e5a61e7b71ce5e1 100644 (file)
--- a/src/auth/basic/fake/fake.cc
+++ b/src/auth/basic/fake/fake.cc
@@ -43,7 +43,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <iostream>
 #include <string>

diff --git a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
index 6f181143aa7da93de5ab843f48f2dd02a16afa17..6a037fee4c64b14641cd64b76a48b9ae3dac478b 100644 (file)
--- a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
+++ b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc
@@ -33,7 +33,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "rfc1738.h"
 
 #include <cstdlib>

diff --git a/src/auth/digest/LDAP/digest_pw_auth.cc b/src/auth/digest/LDAP/digest_pw_auth.cc
index 1c2397067a9efb4e2fd8acff1c415ec208b16771..ae37bda0c6fc35f8a4263f63c973a06ec75f10a9 100644 (file)
--- a/src/auth/digest/LDAP/digest_pw_auth.cc
+++ b/src/auth/digest/LDAP/digest_pw_auth.cc
@@ -39,7 +39,7 @@
 #include "squid.h"
 #include "auth/digest/LDAP/digest_common.h"
 #include "auth/digest/LDAP/ldap_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #define PROGRAM_NAME "digest_ldap_auth"
 

diff --git a/src/auth/digest/eDirectory/digest_pw_auth.cc b/src/auth/digest/eDirectory/digest_pw_auth.cc
index de44054fc846b99e6b7ddb59f8f5e8a2c8918721..85077f9374316fb010eb593d126f510841fea0b6 100644 (file)
--- a/src/auth/digest/eDirectory/digest_pw_auth.cc
+++ b/src/auth/digest/eDirectory/digest_pw_auth.cc
@@ -38,7 +38,7 @@
 #include "squid.h"
 #include "auth/digest/eDirectory/digest_common.h"
 #include "auth/digest/eDirectory/ldap_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #define PROGRAM_NAME "digest_edirectory_auth"
 

diff --git a/src/auth/digest/file/digest_file_auth.cc b/src/auth/digest/file/digest_file_auth.cc
index bb19e9da4cd4278ca41d7cbc5f936ceeeebc9766..1645cdb927f97c289f0af4abdadee9c109b00f28 100644 (file)
--- a/src/auth/digest/file/digest_file_auth.cc
+++ b/src/auth/digest/file/digest_file_auth.cc
@@ -42,7 +42,7 @@
 #include "squid.h"
 #include "auth/digest/file/digest_common.h"
 #include "auth/digest/file/text_backend.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 static void
 GetHHA1(RequestData * requestData)

diff --git a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
index 07f7e285cbc58c5349954bf61f84ae75c135eaa4..02355d062293134b1924682f9b3dd6e80d7643f1 100644 (file)
--- a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
+++ b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc
@@ -45,7 +45,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "sspwin32.h"

diff --git a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
index 369bc1853c4e9cfe42821d759a9cd63ccd14fff9..edca1d2e165d9b2ae5a434d5e01993db675a6d45 100644 (file)
--- a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
+++ b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc
@@ -24,7 +24,7 @@
 #include "squid.h"
 #include "base64.h"
 #include "compat/debug.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "rfcnb/rfcnb.h"

diff --git a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
index 1275f3b1789934de3eb7b9f85a27260ae1122d01..afacbb570b3818abde3e5880c204ec482340db94 100644 (file)
--- a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
+++ b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc
@@ -73,7 +73,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 #include "sspwin32.h"

diff --git a/src/auth/ntlm/fake/ntlm_fake_auth.cc b/src/auth/ntlm/fake/ntlm_fake_auth.cc
index d4ad42d851d288b113888feff1a34ef316e9dc83..2c3e2b80ae0d35a7ee8109955f0e97a4c3ecc833 100644 (file)
--- a/src/auth/ntlm/fake/ntlm_fake_auth.cc
+++ b/src/auth/ntlm/fake/ntlm_fake_auth.cc
@@ -35,7 +35,7 @@
 
 #include "squid.h"
 #include "base64.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ntlmauth/ntlmauth.h"
 #include "ntlmauth/support_bits.cci"
 

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index e6d169f8181566db14053fee845cfccc42a007be..6b77b2f1a22fbb8b47742d4020f7998834f6d08e 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -18,3 +18,5 @@ libhelper_la_SOURCES = \
        Reply.h \
        Request.h \
        ResultCode.h
+
+EXTRA_DIST= protocol_defines.h

diff --git a/helpers/defines.h b/src/helper/protocol_defines.h
similarity index 100%
rename from helpers/defines.h
rename to src/helper/protocol_defines.h

diff --git a/src/http/url_rewriters/fake/fake.cc b/src/http/url_rewriters/fake/fake.cc
index e76283e2eb1f5439d1490586d05b5bf0910337da..663643ca9e97df8a9221f4ed312b0b9306a7d81c 100644 (file)
--- a/src/http/url_rewriters/fake/fake.cc
+++ b/src/http/url_rewriters/fake/fake.cc
@@ -43,7 +43,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 #include <cstring>
 

diff --git a/src/log/file/log_file_daemon.cc b/src/log/file/log_file_daemon.cc
index b8057f23daeaf284d3920e2d6604668743593468..7e1b03daf469ed7a714d8975e9e2a219e0f7be3f 100644 (file)
--- a/src/log/file/log_file_daemon.cc
+++ b/src/log/file/log_file_daemon.cc
@@ -28,7 +28,7 @@
 #include <paths.h>
 #endif
 
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 
 /* parse buffer - ie, length of longest expected line */
 #define LOGFILE_BUF_LEN     65536

diff --git a/src/ssl/ssl_crtd.cc b/src/ssl/ssl_crtd.cc
index ad7dc00ecd52b25c98828750bafe09f930e9fb24..fabfe750baeb79007935752d47270922615122e3 100644 (file)
--- a/src/ssl/ssl_crtd.cc
+++ b/src/ssl/ssl_crtd.cc
@@ -7,7 +7,7 @@
  */
 
 #include "squid.h"
-#include "helpers/defines.h"
+#include "helper/protocol_defines.h"
 #include "ssl/certificate_db.h"
 #include "ssl/crtd_message.h"