------------------------------------------------------------ revno: 13175 revision-id: squidadm@squid-cache.org-20141008153132-jkq1rvu9q9qiflro parent: squid3@treenet.co.nz-20140915081559-mnjg5ilht0h0ke00 committer: squidadm@squid-cache.org branch nick: 3.4 timestamp: Wed 2014-10-08 15:31:32 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20141008153132-\ # jkq1rvu9q9qiflro # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: adfc56f3c744f445ae4ebad1e368ec0452ae0e74 # timestamp: 2014-10-08 15:50:50 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20140915081559-\ # mnjg5ilht0h0ke00 # # Begin patch === modified file 'doc/debug-sections.txt' --- doc/debug-sections.txt 2012-09-14 00:13:20 +0000 +++ doc/debug-sections.txt 2014-10-08 15:31:32 +0000 @@ -1,14 +1,9 @@ section -section -- CGI Cache Manager -section -- External DISKD process implementation. -section -- Refcount allocator -section -- Unlink Daemon -section -- WWW Client section 00 Announcement Server section 00 Client Database +section 00 Debug Routines section 00 DNS Resolver Daemon -section 00 Debug Routines section 00 Hash Tables section 00 UFS Store Dump Tool section 01 Main Loop @@ -56,14 +51,14 @@ section 22 Refresh Calculation section 23 URL Parsing section 23 URL Scheme parsing +section 25 MiME Header Parsing section 25 MIME Parsing and Internal Icons -section 25 MiME Header Parsing section 26 Secure Sockets Layer Proxy section 27 Cache Announcer section 28 Access Control section 29 Authenticator +section 29 Negotiate Authenticator section 29 NTLM Authenticator -section 29 Negotiate Authenticator section 30 Ident (RFC 931) section 31 Hypertext Caching Protocol section 32 Asynchronous Disk I/O @@ -85,8 +80,8 @@ section 46 Access Log - Apache combined format section 46 Access Log - Apache common format section 46 Access Log - Squid Custom format +section 46 Access Log - Squid format section 46 Access Log - Squid ICAP Logging -section 46 Access Log - Squid format section 46 Access Log - Squid referer format section 46 Access Log - Squid useragent format section 47 Store COSS Directory Routines @@ -126,15 +121,15 @@ section 78 DNS lookups section 78 DNS lookups; interacts with lib/rfc1035.c section 79 Disk IO Routines +section 79 Disk IO Routines section 79 Squid-side DISKD I/O functions. section 79 Squid-side Disk I/O functions. section 79 Storage Manager COSS Interface section 79 Storage Manager UFS Interface -section 79 Disk IO Routines section 80 WCCP Support +section 81 aio_xxx() POSIX emulation on Windows section 81 CPU Profiling Routines section 81 Store HEAP Removal Policies -section 81 aio_xxx() POSIX emulation on Windows section 82 External ACL section 83 SSL accelerator support section 84 Helper process maintenance @@ -150,5 +145,10 @@ section 90 Storage Manager Client-Side Interface section 92 Storage File System section 93 Adaptation +section 93 eCAP Interface section 93 ICAP (RFC 3507) Client -section 93 eCAP Interface +section -- CGI Cache Manager +section -- External DISKD process implementation. +section -- Refcount allocator +section -- Unlink Daemon +section -- WWW Client === modified file 'doc/manuals/language.list' --- doc/manuals/language.list 2011-06-02 10:39:53 +0000 +++ doc/manuals/language.list 2014-10-08 15:31:32 +0000 @@ -2,8 +2,8 @@ ar.lang \ cs.lang \ de.lang \ + en_AU.lang \ en.lang \ - en_AU.lang \ es.lang \ fr.lang \ it.lang \ === modified file 'icons/list' --- icons/list 2011-02-07 04:00:55 +0000 +++ icons/list 2014-10-08 15:31:32 +0000 @@ -14,8 +14,8 @@ silk/database.png \ silk/database_table.png \ silk/drive_disk.png \ + silk/film_key.png \ silk/film.png \ - silk/film_key.png \ silk/folder.png \ silk/folder_table.png \ silk/image.png \ @@ -24,18 +24,18 @@ silk/layout.png \ silk/link.png \ silk/music.png \ + silk/package_go.png \ silk/package.png \ - silk/package_go.png \ silk/page_code.png \ silk/page_excel.png \ silk/page_green.png \ - silk/page_white.png \ silk/page_white_acrobat.png \ + silk/page_white_cplusplus.png \ silk/page_white_c.png \ - silk/page_white_cplusplus.png \ silk/page_white_flash.png \ silk/page_white_magnify.png \ silk/page_white_picture.png \ + silk/page_white.png \ silk/page_white_powerpoint.png \ silk/page_white_stack.png \ silk/page_white_text.png \ @@ -44,8 +44,8 @@ silk/page_world.png \ silk/photo.png \ silk/picture.png \ + silk/plugin_add.png \ silk/plugin.png \ - silk/plugin_add.png \ - silk/script.png \ silk/script_gear.png \ - silk/script_palette.png + silk/script_palette.png \ + silk/script.png === modified file 'lib/profiler/xprof_type.h' --- lib/profiler/xprof_type.h 2013-05-29 00:13:21 +0000 +++ lib/profiler/xprof_type.h 2014-10-08 15:31:32 +0000 @@ -3,80 +3,79 @@ /* AUTO-GENERATED FILE */ #if USE_XPROF_STATS typedef enum { - XPROF_PROF_UNACCOUNTED, - XPROF_ACL_matches, - XPROF_HttpHeaderClean, - XPROF_HttpHeaderParse, - XPROF_HttpHeader_getCc, - XPROF_HttpMsg_httpMsgParseStep, - XPROF_HttpParserParseReqLine, - XPROF_HttpStateData_processReplyBody, - XPROF_HttpStateData_processReplyHeader, - XPROF_HttpStateData_readReply, - XPROF_InvokeHandlers, - XPROF_MemBuf_append, - XPROF_MemBuf_consume, - XPROF_MemBuf_consumeWhitespace, - XPROF_MemBuf_grow, - XPROF_MemObject_write, - XPROF_PROF_OVERHEAD, - XPROF_SignalEngine_checkEvents, - XPROF_StoreEntry_write, - XPROF_StringAllocAndFill, - XPROF_StringAppend, - XPROF_StringClean, - XPROF_StringInitBuf, - XPROF_StringReset, - XPROF_aclCheckFast, - XPROF_calloc, - XPROF_clientSocketRecipient, - XPROF_commHandleWrite, - XPROF_comm_accept, - XPROF_comm_check_incoming, - XPROF_comm_close, - XPROF_comm_connect_addr, - XPROF_comm_handle_ready_fd, - XPROF_comm_open, - XPROF_comm_poll_normal, - XPROF_comm_poll_prep_pfds, - XPROF_comm_read_handler, - XPROF_comm_udp_sendto, - XPROF_comm_write_handler, - XPROF_diskHandleRead, - XPROF_diskHandleWrite, - XPROF_esiExpressionEval, - XPROF_esiParsing, - XPROF_esiProcessing, - XPROF_eventRun, - XPROF_file_close, - XPROF_file_open, - XPROF_file_read, - XPROF_file_write, - XPROF_free, - XPROF_free_const, - XPROF_hash_lookup, - XPROF_headersEnd, - XPROF_httpRequestFree, - XPROF_httpStart, - XPROF_malloc, - XPROF_mem_hdr_write, - XPROF_parseHttpRequest, - XPROF_read, - XPROF_realloc, - XPROF_recv, - XPROF_send, - XPROF_storeClient_kickReads, - XPROF_storeDirCallback, - XPROF_storeGet, - XPROF_storeGetMemSpace, - XPROF_storeMaintainSwapSpace, - XPROF_storeRelease, - XPROF_storeWriteComplete, - XPROF_write, - XPROF_xcalloc, - XPROF_xmalloc, - XPROF_xrealloc, - XPROF_LAST -} xprof_type; +XPROF_PROF_UNACCOUNTED, +XPROF_aclCheckFast, +XPROF_ACL_matches, +XPROF_calloc, +XPROF_clientSocketRecipient, +XPROF_comm_accept, +XPROF_comm_check_incoming, +XPROF_comm_close, +XPROF_comm_connect_addr, +XPROF_comm_handle_ready_fd, +XPROF_commHandleWrite, +XPROF_comm_open, +XPROF_comm_poll_normal, +XPROF_comm_poll_prep_pfds, +XPROF_comm_read_handler, +XPROF_comm_udp_sendto, +XPROF_comm_write_handler, +XPROF_diskHandleRead, +XPROF_diskHandleWrite, +XPROF_esiExpressionEval, +XPROF_esiParsing, +XPROF_esiProcessing, +XPROF_eventRun, +XPROF_file_close, +XPROF_file_open, +XPROF_file_read, +XPROF_file_write, +XPROF_free, +XPROF_free_const, +XPROF_hash_lookup, +XPROF_headersEnd, +XPROF_HttpHeaderClean, +XPROF_HttpHeader_getCc, +XPROF_HttpHeaderParse, +XPROF_HttpMsg_httpMsgParseStep, +XPROF_HttpParserParseReqLine, +XPROF_httpRequestFree, +XPROF_httpStart, +XPROF_HttpStateData_processReplyBody, +XPROF_HttpStateData_processReplyHeader, +XPROF_HttpStateData_readReply, +XPROF_InvokeHandlers, +XPROF_malloc, +XPROF_MemBuf_append, +XPROF_MemBuf_consume, +XPROF_MemBuf_consumeWhitespace, +XPROF_MemBuf_grow, +XPROF_mem_hdr_write, +XPROF_MemObject_write, +XPROF_parseHttpRequest, +XPROF_PROF_OVERHEAD, +XPROF_read, +XPROF_realloc, +XPROF_recv, +XPROF_send, +XPROF_SignalEngine_checkEvents, +XPROF_storeClient_kickReads, +XPROF_storeDirCallback, +XPROF_StoreEntry_write, +XPROF_storeGet, +XPROF_storeGetMemSpace, +XPROF_storeMaintainSwapSpace, +XPROF_storeRelease, +XPROF_storeWriteComplete, +XPROF_StringAllocAndFill, +XPROF_StringAppend, +XPROF_StringClean, +XPROF_StringInitBuf, +XPROF_StringReset, +XPROF_write, +XPROF_xcalloc, +XPROF_xmalloc, +XPROF_xrealloc, + XPROF_LAST } xprof_type; #endif #endif === modified file 'src/tests/Stub.list' --- src/tests/Stub.list 2013-05-09 00:13:23 +0000 +++ src/tests/Stub.list 2014-10-08 15:31:32 +0000 @@ -1,16 +1,4 @@ STUB_SOURCE= tests/STUB.h \ - tests/stub_CommIO.cc \ - tests/stub_DelayId.cc \ - tests/stub_DiskIOModule.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_HttpReply.cc \ - tests/stub_HttpRequest.cc \ - tests/stub_MemBuf.cc \ - tests/stub_MemObject.cc \ - tests/stub_MemStore.cc \ - tests/stub_Port.cc \ - tests/stub_StatHist.cc \ - tests/stub_UdsOp.cc \ tests/stub_access_log.cc \ tests/stub_acl.cc \ tests/stub_cache_cf.cc \ @@ -20,19 +8,25 @@ tests/stub_client_side.cc \ tests/stub_client_side_request.cc \ tests/stub_comm.cc \ + tests/stub_CommIO.cc \ tests/stub_debug.cc \ + tests/stub_DelayId.cc \ + tests/stub_DiskIOModule.cc \ tests/stub_errorpage.cc \ tests/stub_event.cc \ tests/stub_fatal.cc \ tests/stub_fd.cc \ tests/stub_helper.cc \ + tests/stub_HelperChildConfig.cc \ tests/stub_http.cc \ + tests/stub_HttpReply.cc \ + tests/stub_HttpRequest.cc \ tests/stub_icp.cc \ tests/stub_internal.cc \ + tests/stub_ipcache.cc \ tests/stub_ipc.cc \ tests/stub_ipc_Forwarder.cc \ tests/stub_ipc_TypedMsgHdr.cc \ - tests/stub_ipcache.cc \ tests/stub_libcomm.cc \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ @@ -40,11 +34,16 @@ tests/stub_libmgr.cc \ tests/stub_libsslsquid.cc \ tests/stub_main_cc.cc \ + tests/stub_MemBuf.cc \ tests/stub_mem.cc \ tests/stub_mem_node.cc \ + tests/stub_MemObject.cc \ + tests/stub_MemStore.cc \ tests/stub_mime.cc \ tests/stub_pconn.cc \ + tests/stub_Port.cc \ tests/stub_stat.cc \ + tests/stub_StatHist.cc \ tests/stub_stmem.cc \ tests/stub_store.cc \ tests/stub_store_client.cc \ @@ -52,4 +51,5 @@ tests/stub_store_stats.cc \ tests/stub_store_swapout.cc \ tests/stub_tools.cc \ + tests/stub_UdsOp.cc \ tests/stub_wordlist.cc