------------------------------------------------------------ revno: 12287 revision-id: squidadm@squid-cache.org-20120815001313-zb86vegkx8tnr9p8 parent: squid3@treenet.co.nz-20120814233724-h35jv6z4s4czy222 committer: Automatic source maintenance branch nick: trunk timestamp: Tue 2012-08-14 18:13:13 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20120815001313-\ # zb86vegkx8tnr9p8 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 097334f66ca7aa27135e44a9d1b2cc91ea7c3e7e # timestamp: 2012-08-15 00:52:27 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20120814233724-\ # h35jv6z4s4czy222 # # Begin patch === modified file 'src/HttpRequest.cc' --- src/HttpRequest.cc 2012-08-14 11:53:07 +0000 +++ src/HttpRequest.cc 2012-08-15 00:13:13 +0000 @@ -708,7 +708,8 @@ } ConnStateData * -HttpRequest::pinnedConnection() { +HttpRequest::pinnedConnection() +{ if (clientConnectionManager.valid() && clientConnectionManager->pinning.pinned) return clientConnectionManager.get(); return NULL; === modified file 'src/globals.h' --- src/globals.h 2012-08-14 11:53:07 +0000 +++ src/globals.h 2012-08-15 00:13:13 +0000 @@ -45,109 +45,109 @@ #include "structs.h" - extern char *ConfigFile; /* NULL */ - extern char *IcpOpcodeStr[]; - extern char tmp_error_buf[ERROR_BUF_SZ]; - extern char ThisCache[RFC2181_MAXHOSTNAMELEN << 1]; - extern char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1]; - extern char config_input_line[BUFSIZ]; - extern const char *DefaultConfigFile; /* DEFAULT_CONFIG_FILE */ - extern const char *cfg_filename; /* NULL */ - extern const char *dash_str; /* "-" */ - extern const char *null_string; /* "" */ - extern const char *version_string; /* VERSION */ - extern const char *appname_string; /* PACKAGE */ - extern char const *visible_appname_string; /* NULL */ - extern const char *fdTypeStr[]; - extern const char *hier_strings[]; - extern const char *memStatusStr[]; - extern const char *pingStatusStr[]; - extern const char *storeStatusStr[]; - extern const char *swapStatusStr[]; - class fde; - extern fde *fd_table; /* NULL */ - extern int Biggest_FD; /* -1 */ - extern int Number_FD; /* 0 */ - extern int Opening_FD; /* 0 */ - extern int NDnsServersAlloc; /* 0 */ - extern int RESERVED_FD; - extern int Squid_MaxFD; /* SQUID_MAXFD */ - extern int config_lineno; /* 0 */ - extern int do_mallinfo; /* 0 */ - extern int opt_reuseaddr; /* 1 */ - extern int neighbors_do_private_keys; /* 1 */ - extern int opt_catch_signals; /* 1 */ - extern int opt_foreground_rebuild; /* 0 */ - extern char *opt_forwarded_for; /* NULL */ - extern int opt_reload_hit_only; /* 0 */ - - extern int opt_udp_hit_obj; /* 0 */ - extern int opt_create_swap_dirs; /* 0 */ - extern int opt_store_doublecheck; /* 0 */ - extern int syslog_enable; /* 0 */ - extern int DnsSocketA; /* -1 */ - extern int DnsSocketB; /* -1 */ - extern int n_disk_objects; /* 0 */ - extern iostats IOStats; - - extern struct acl_deny_info_list *DenyInfoList; /* NULL */ - - extern struct timeval squid_start; - extern int starting_up; /* 1 */ - extern int shutting_down; /* 0 */ - extern int reconfiguring; /* 0 */ - extern time_t hit_only_mode_until; /* 0 */ - extern double request_failure_ratio; /* 0.0 */ - extern int store_hash_buckets; /* 0 */ - extern hash_table *store_table; /* NULL */ - extern int hot_obj_count; /* 0 */ - extern int CacheDigestHashFuncCount; /* 4 */ - extern CacheDigest *store_digest; /* NULL */ - extern const char *StoreDigestFileName; /* "store_digest" */ - extern const char *StoreDigestMimeStr; /* "application/cache-digest" */ - - extern const char *MultipartMsgBoundaryStr; /* "Unique-Squid-Separator" */ +extern char *ConfigFile; /* NULL */ +extern char *IcpOpcodeStr[]; +extern char tmp_error_buf[ERROR_BUF_SZ]; +extern char ThisCache[RFC2181_MAXHOSTNAMELEN << 1]; +extern char ThisCache2[RFC2181_MAXHOSTNAMELEN << 1]; +extern char config_input_line[BUFSIZ]; +extern const char *DefaultConfigFile; /* DEFAULT_CONFIG_FILE */ +extern const char *cfg_filename; /* NULL */ +extern const char *dash_str; /* "-" */ +extern const char *null_string; /* "" */ +extern const char *version_string; /* VERSION */ +extern const char *appname_string; /* PACKAGE */ +extern char const *visible_appname_string; /* NULL */ +extern const char *fdTypeStr[]; +extern const char *hier_strings[]; +extern const char *memStatusStr[]; +extern const char *pingStatusStr[]; +extern const char *storeStatusStr[]; +extern const char *swapStatusStr[]; +class fde; +extern fde *fd_table; /* NULL */ +extern int Biggest_FD; /* -1 */ +extern int Number_FD; /* 0 */ +extern int Opening_FD; /* 0 */ +extern int NDnsServersAlloc; /* 0 */ +extern int RESERVED_FD; +extern int Squid_MaxFD; /* SQUID_MAXFD */ +extern int config_lineno; /* 0 */ +extern int do_mallinfo; /* 0 */ +extern int opt_reuseaddr; /* 1 */ +extern int neighbors_do_private_keys; /* 1 */ +extern int opt_catch_signals; /* 1 */ +extern int opt_foreground_rebuild; /* 0 */ +extern char *opt_forwarded_for; /* NULL */ +extern int opt_reload_hit_only; /* 0 */ + +extern int opt_udp_hit_obj; /* 0 */ +extern int opt_create_swap_dirs; /* 0 */ +extern int opt_store_doublecheck; /* 0 */ +extern int syslog_enable; /* 0 */ +extern int DnsSocketA; /* -1 */ +extern int DnsSocketB; /* -1 */ +extern int n_disk_objects; /* 0 */ +extern iostats IOStats; + +extern struct acl_deny_info_list *DenyInfoList; /* NULL */ + +extern struct timeval squid_start; +extern int starting_up; /* 1 */ +extern int shutting_down; /* 0 */ +extern int reconfiguring; /* 0 */ +extern time_t hit_only_mode_until; /* 0 */ +extern double request_failure_ratio; /* 0.0 */ +extern int store_hash_buckets; /* 0 */ +extern hash_table *store_table; /* NULL */ +extern int hot_obj_count; /* 0 */ +extern int CacheDigestHashFuncCount; /* 4 */ +extern CacheDigest *store_digest; /* NULL */ +extern const char *StoreDigestFileName; /* "store_digest" */ +extern const char *StoreDigestMimeStr; /* "application/cache-digest" */ + +extern const char *MultipartMsgBoundaryStr; /* "Unique-Squid-Separator" */ #if USE_HTTP_VIOLATIONS - extern int refresh_nocache_hack; /* 0 */ +extern int refresh_nocache_hack; /* 0 */ #endif - extern int store_open_disk_fd; /* 0 */ - extern const char *SwapDirType[]; - extern int store_swap_low; /* 0 */ - extern int store_swap_high; /* 0 */ - extern size_t store_pages_max; /* 0 */ - extern int64_t store_maxobjsize; /* -1 */ - extern hash_table *proxy_auth_username_cache; /* NULL */ - extern int incoming_sockets_accepted; +extern int store_open_disk_fd; /* 0 */ +extern const char *SwapDirType[]; +extern int store_swap_low; /* 0 */ +extern int store_swap_high; /* 0 */ +extern size_t store_pages_max; /* 0 */ +extern int64_t store_maxobjsize; /* -1 */ +extern hash_table *proxy_auth_username_cache; /* NULL */ +extern int incoming_sockets_accepted; #if _SQUID_MSWIN_ - extern unsigned int WIN32_Socks_initialized; /* 0 */ +extern unsigned int WIN32_Socks_initialized; /* 0 */ #endif #if _SQUID_WINDOWS_ - extern unsigned int WIN32_OS_version; /* 0 */ - extern char *WIN32_OS_string; /* NULL */ - extern char *WIN32_Service_name; /* NULL */ - extern char *WIN32_Command_Line; /* NULL */ - extern char *WIN32_Service_Command_Line; /* NULL */ - extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */ +extern unsigned int WIN32_OS_version; /* 0 */ +extern char *WIN32_OS_string; /* NULL */ +extern char *WIN32_Service_name; /* NULL */ +extern char *WIN32_Command_Line; /* NULL */ +extern char *WIN32_Service_Command_Line; /* NULL */ +extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */ #endif #if HAVE_SBRK - extern void *sbrk_start; /* 0 */ +extern void *sbrk_start; /* 0 */ #endif - extern int ssl_ex_index_server; /* -1 */ - extern int ssl_ctx_ex_index_dont_verify_domain; /* -1 */ - extern int ssl_ex_index_cert_error_check; /* -1 */ - extern int ssl_ex_index_ssl_error_detail; /* -1 */ - extern int ssl_ex_index_ssl_peeked_cert; /* -1 */ - extern int ssl_ex_index_ssl_errors; /* -1 */ +extern int ssl_ex_index_server; /* -1 */ +extern int ssl_ctx_ex_index_dont_verify_domain; /* -1 */ +extern int ssl_ex_index_cert_error_check; /* -1 */ +extern int ssl_ex_index_ssl_error_detail; /* -1 */ +extern int ssl_ex_index_ssl_peeked_cert; /* -1 */ +extern int ssl_ex_index_ssl_errors; /* -1 */ - extern const char *external_acl_message; /* NULL */ - extern int opt_send_signal; /* -1 */ - extern int opt_no_daemon; /* 0 */ - extern int opt_parse_cfg_only; /* 0 */ +extern const char *external_acl_message; /* NULL */ +extern int opt_send_signal; /* -1 */ +extern int opt_no_daemon; /* 0 */ +extern int opt_parse_cfg_only; /* 0 */ /// current Squid process number (e.g., 4). /// Zero for SMP-unaware code and in no-SMP mode. - extern int KidIdentifier; /* 0 */ +extern int KidIdentifier; /* 0 */ #endif /* SQUID_GLOBALS_H */ === modified file 'tools/purge/purge.cc' --- tools/purge/purge.cc 2012-08-14 11:53:07 +0000 +++ tools/purge/purge.cc 2012-08-15 00:13:13 +0000 @@ -118,7 +118,7 @@ #endif #include -#include +#include #include #include