Merge branch 'master' into 3.3.x * master: (238 commits) Ignore test_xml_parser. TS-1907 - prevent "ipv6" option from breaking "ssl" option. TS-1927: Make ats_base64_decode able to handle the URL variant TS-1207: Move cacheurl plugin out of experimental TS-1857: the Lua plugin is built whether Lua is found or not Added Ts-1492. TS-1492 Prevent net-throttling from locking out the health checks from traffic_cop. Added Ts-1827. TS-1827 Further cleanup of combo_handler. Particularly, it is now controlled via remap.config. TS-1934 Update the README since the old build instructions do not work. doc: fix event handler table TS-1648: use int64_t for bucket indexes (in case there are more than 2^31). Separate the Admin and SDK guides. TS-1932: use modern-ish tar format for asf-dist TS-1929: fix sphinx documentation build TS-1891: Add double-free checking for reclaimable freelist TS-1926 Change Lua detection to look for lua_getfenv(), which is not available in Lua v5.2 and later (and our code needs it, for now). Apply the const attribute to ats_pagesize() TS-1930 Fix some confusing help text around SSL cert chains TS-1921: Fix reclaimable freelist stuck in infinite loop ...
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/693a02f2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/693a02f2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/693a02f2 Branch: refs/heads/3.3.x Commit: 693a02f200a66404d2b6c323c042f65daa51f32e Parents: d64480b 0ae84ee Author: Leif Hedstrom <[email protected]> Authored: Tue Jun 4 10:45:11 2013 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Jun 4 10:45:11 2013 -0600 ---------------------------------------------------------------------- .gitignore | 1 + CHANGES | 254 ++- CRUFT.txt | 7 + INSTALL | 22 +- README | 37 +- STATUS | 6 +- Vagrantfile | 32 +- build/ax_compare_version.m4 | 177 + build/ax_compiler_vendor.m4 | 84 + build/ax_lib_curl.m4 | 38 + build/ax_path_generic.m4 | 164 + build/ax_with_curses.m4 | 518 +++ build/common.m4 | 15 - build/crypto.m4 | 5 +- build/jemalloc.m4 | 10 +- build/lua.m4 | 18 +- build/lzma.m4 | 2 +- build/pcre.m4 | 2 +- build/plugins.mk | 37 + build/tcmalloc.m4 | 2 +- build/xml.m4 | 2 +- build/zlib.m4 | 2 +- ci/regression | 2 +- configure.ac | 604 +++-- contrib/manifests/debian.pp | 3 +- contrib/manifests/redhat.pp | 5 +- .../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 3 - .../ConfigMgmt/lib/Apache/TS/Config/Records.pm | 131 +- cop/Makefile.am | 3 +- cop/TrafficCop.cc | 49 +- doc/Doxyfile.in | 6 +- doc/Makefile.am | 70 + doc/admin/cluster-howto.en.rst | 170 + doc/admin/configuration-files.en.rst | 43 + doc/admin/configuration-files/cache.config.en.rst | 133 + .../configuration-files/congestion.config.en.rst | 197 ++ .../configuration-files/hosting.config.en.rst | 101 + doc/admin/configuration-files/icp.config.en.rst | 99 + .../configuration-files/ip_allow.config.en.rst | 89 + .../configuration-files/log_hosts.config.en.rst | 68 + .../configuration-files/logs_xml.config.en.rst | 363 +++ doc/admin/configuration-files/parent.config.en.rst | 141 + doc/admin/configuration-files/plugin.config.en.rst | 48 + .../configuration-files/records.config.en.rst | 2501 +++++++++++++++ doc/admin/configuration-files/remap.config.en.rst | 284 ++ .../configuration-files/splitdns.config.en.rst | 124 + .../ssl_multicert.config.en.rst | 78 + .../configuration-files/storage.config.en.rst | 135 + doc/admin/configuration-files/update.config.en.rst | 200 ++ doc/admin/configuration-files/volume.config.en.rst | 72 + doc/admin/configuring-cache.en.rst | 365 +++ doc/admin/configuring-traffic-server.en.rst | 88 + doc/admin/event-logging-formats.en.rst | 364 +++ doc/admin/explicit-proxy-caching.en.rst | 93 + doc/admin/faqs.en.rst | 408 +++ doc/admin/forward-proxy.en.rst | 90 + doc/admin/getting-started.en.rst | 206 ++ doc/admin/hierachical-caching.en.rst | 188 ++ doc/admin/http-proxy-caching.en.rst | 793 +++++ doc/admin/index.en.rst | 314 ++ doc/admin/monitoring-traffic.en.rst | 110 + doc/admin/plugins.en.rst | 81 + doc/admin/plugins/balancer.en.rst | 92 + doc/admin/plugins/buffer_upload.en.rst | 89 + doc/admin/plugins/cacheurl.en.rst | 58 + doc/admin/plugins/combo_handler.en.rst | 74 + doc/admin/plugins/esi.en.rst | 22 + doc/admin/plugins/geoip_acl.en.rst | 111 + doc/admin/plugins/gzip.en.rst | 98 + doc/admin/plugins/header_filter.en.rst | 143 + doc/admin/plugins/hipes.en.rst | 64 + doc/admin/plugins/mysql_remap.en.rst | 93 + doc/admin/plugins/regex_remap.en.rst | 162 + doc/admin/plugins/stale_while_revalidate.en.rst | 21 + doc/admin/plugins/stats_over_http.en.rst | 37 + doc/admin/reverse-proxy-http-redirects.en.rst | 329 ++ doc/admin/security-options.en.rst | 248 ++ doc/admin/traffic-line-commands.en.rst | 763 +++++ doc/admin/traffic-server-error-messages.en.rst | 396 +++ doc/admin/transparent-proxy.en.rst | 117 + doc/admin/transparent-proxy/bridge.en.rst | 204 ++ doc/admin/transparent-proxy/build.en.rst | 58 + doc/admin/transparent-proxy/router-inline.en.rst | 92 + .../transparent-proxy/wccp-configuration.en.rst | 155 + doc/admin/working-log-files.en.rst | 1004 ++++++ doc/admin/working-log-files/log-formats.en.rst | 360 +++ doc/conf.py | 285 ++ doc/sbuild | 27 + doc/sdk/actions-guide.en.rst | 180 ++ doc/sdk/actions-guide/hosts-lookup-api.en.rst | 28 + doc/sdk/adding-statistics.en.rst | 72 + .../adding-statistics/coupled-statistics.en.rst | 121 + .../viewing-statistics-using-traffic-line.en.rst | 33 + doc/sdk/continuations.en.rst | 135 + .../how-to-activate-continuations.en.rst | 36 + .../continuations/writing-handler-functions.en.rst | 129 + doc/sdk/getting-started.en.rst | 249 ++ doc/sdk/getting-started/a-simple-plugin.en.rst | 118 + doc/sdk/getting-started/naming-conventions.en.rst | 51 + ...plugin-registration-and-version-checking.en.rst | 86 + doc/sdk/header-based-plugin-examples.en.rst | 68 + .../basic-authorization-plugin.en.rst | 43 + ...-and-getting-a-handle-to-the-transaction.en.rst | 45 + .../setting-a-transaction-hook.en.rst | 56 + .../working-with-http-headers.en.rst | 98 + .../blacklist-plugin.en.rst | 107 + ...ccessing-the-transaction-being-processed.en.rst | 61 + .../blacklist-plugin/setting-a-global-hook.en.rst | 37 + .../setting-up-a-transaction-hook.en.rst | 81 + .../working-with-http-header-functions.en.rst | 63 + doc/sdk/how-to-create-trafficserver-plugins.en.rst | 227 ++ .../roadmap-for-creating-plugins.en.rst | 90 + doc/sdk/http-headers.en.rst | 141 + ...uide-to-trafficserver-http-header-system.en.rst | 63 + .../duplicate-mime-fields-are-not-coalesced.en.rst | 30 + ...ways-belong-to-an-associated-mime-header.en.rst | 70 + .../release-marshal-buffer-handles.en.rst | 88 + doc/sdk/http-headers/http-headers.en.rst | 172 + doc/sdk/http-headers/marshal-buffers.en.rst | 56 + doc/sdk/http-headers/mime-headers.en.rst | 437 +++ doc/sdk/http-headers/urls.en.rst | 134 + doc/sdk/http-hooks-and-transactions.en.rst | 83 + .../adding-hooks.en.rst | 149 + .../http-alternate-selection.en.rst | 192 ++ .../http-sessions.en.rst | 52 + .../http-transactions.en.rst | 205 ++ .../initiate-http-connection.en.rst | 25 + .../intercepting-http-transactions.en.rst | 30 + doc/sdk/http-transformation-plugin.en.rst | 159 + .../append-transform-plugin.en.rst | 145 + ...mple-buffered-null-transformation-plugin.en.rst | 213 ++ .../sample-null-transformation-plugin.en.rst | 231 ++ doc/sdk/index.en.rst | 71 + doc/sdk/io-guide.en.rst | 194 ++ doc/sdk/io-guide/guide-to-cache-api.en.rst | 69 + doc/sdk/io-guide/guide-to-cache-api/errors.en.rst | 31 + doc/sdk/io-guide/guide-to-cache-api/example.en.rst | 76 + .../how-to-do-a-cache-remove.en.rst | 31 + .../how-to-do-a-cache-write.en.rst | 34 + doc/sdk/io-guide/io-buffers.en.rst | 52 + doc/sdk/io-guide/net-vconnections.en.rst | 31 + doc/sdk/io-guide/transformations.en.rst | 182 ++ doc/sdk/io-guide/vios.en.rst | 59 + doc/sdk/misc-interface-guide.en.rst | 60 + .../misc-interface-guide/memory-allocation.en.rst | 46 + .../misc-interface-guide/thread-functions.en.rst | 34 + doc/sdk/misc-interface-guide/tsfopen-family.en.rst | 54 + doc/sdk/mutex-guide.en.rst | 411 +++ doc/sdk/new-protocol-plugins.en.rst | 359 +++ doc/sdk/plugin-configurations.en.rst | 116 + doc/sdk/plugin-management.en.rst | 28 + .../guide-to-the-logging-api.en.rst | 103 + ...ng-trafficserver-settings-and-statistics.en.rst | 59 + doc/sdk/preface.en.rst | 49 + doc/sdk/preface/how-to-use-this-book.en.rst | 132 + doc/sdk/preface/typographical-conventions.en.rst | 36 + doc/sdk/remap-plugin.en.rst | 75 + doc/sdk/remap-plugin/example-query-remap.en.rst | 152 + doc/sdk/sample-source-code.en.rst | 309 ++ doc/sdk/troubleshooting-tips.en.rst | 57 + .../debugging-memory-leaks.en.rst | 32 + .../unable-to-debug-tags.en.rst | 113 + .../unable-to-load-plugins.en.rst | 36 + .../troubleshooting-tips/using-a-debugger.en.rst | 40 + doc/static/images/admin/alarm.jpg | Bin 0 -> 95132 bytes doc/static/images/admin/ats-basic-traffic.png | Bin 0 -> 31464 bytes doc/static/images/admin/ats-traffic-bridge.png | Bin 0 -> 22915 bytes doc/static/images/admin/cache_hit.jpg | Bin 0 -> 79909 bytes doc/static/images/admin/cache_miss.jpg | Bin 0 -> 108282 bytes doc/static/images/admin/cachehrc.jpg | Bin 0 -> 76254 bytes doc/static/images/admin/configur.jpg | Bin 0 -> 102958 bytes doc/static/images/admin/dash.jpg | Bin 0 -> 111902 bytes doc/static/images/admin/dash3.jpg | Bin 0 -> 105424 bytes doc/static/images/admin/firewall.jpg | Bin 0 -> 54553 bytes doc/static/images/admin/httprvs.jpg | Bin 0 -> 78185 bytes doc/static/images/admin/logcolat.jpg | Bin 0 -> 112020 bytes doc/static/images/admin/monitor.jpg | Bin 0 -> 95403 bytes doc/static/images/admin/netscape_common_format.jpg | Bin 0 -> 29378 bytes .../images/admin/netscape_extended2_format.jpg | Bin 0 -> 42918 bytes .../images/admin/netscape_extended_format.jpg | Bin 0 -> 37438 bytes doc/static/images/admin/process.jpg | Bin 0 -> 136229 bytes doc/static/images/admin/records.jpg | Bin 0 -> 166227 bytes doc/static/images/admin/revproxy.jpg | Bin 0 -> 141814 bytes doc/static/images/admin/squid_format.jpg | Bin 0 -> 30949 bytes doc/static/images/admin/ssl_c.jpg | Bin 0 -> 71033 bytes doc/static/images/admin/ssl_os.jpg | Bin 0 -> 75656 bytes doc/static/images/admin/stat.jpg | Bin 0 -> 48740 bytes doc/static/images/admin/summary-mixt.log_file.jpg | Bin 0 -> 32797 bytes doc/static/images/admin/wccp-shared-outer.png | Bin 0 -> 54957 bytes doc/static/images/companies/akamai.png | Bin 0 -> 7655 bytes doc/static/images/companies/betfair.png | Bin 0 -> 4329 bytes doc/static/images/companies/brainswear.png | Bin 0 -> 6452 bytes doc/static/images/companies/comcast.png | Bin 0 -> 5504 bytes doc/static/images/companies/devaus.png | Bin 0 -> 3545 bytes doc/static/images/companies/frisch.png | Bin 0 -> 7873 bytes doc/static/images/companies/godaddy.png | Bin 0 -> 9593 bytes doc/static/images/companies/guruve.png | Bin 0 -> 3124 bytes doc/static/images/companies/internode.png | Bin 0 -> 8323 bytes doc/static/images/companies/linkedin.png | Bin 0 -> 7665 bytes doc/static/images/companies/omniti.png | Bin 0 -> 5032 bytes doc/static/images/companies/powerhttp.png | Bin 0 -> 5340 bytes doc/static/images/companies/sic.png | Bin 0 -> 9999 bytes doc/static/images/companies/suomen.png | Bin 0 -> 7851 bytes doc/static/images/companies/taobao.png | Bin 0 -> 7951 bytes doc/static/images/companies/vng.png | Bin 0 -> 4258 bytes doc/static/images/companies/yahoo.png | Bin 0 -> 5014 bytes doc/static/images/docbook/caution.png | Bin 0 -> 1250 bytes doc/static/images/docbook/important.png | Bin 0 -> 722 bytes doc/static/images/docbook/note.png | Bin 0 -> 490 bytes doc/static/images/docbook/tip.png | Bin 0 -> 449 bytes doc/static/images/docbook/ts75.png | Bin 0 -> 9520 bytes doc/static/images/download_background.png | Bin 0 -> 290 bytes doc/static/images/download_ts.png | Bin 0 -> 4560 bytes doc/static/images/grey_paper.jpg | Bin 0 -> 7290 bytes doc/static/images/press/trafficserver.svg | 164 + doc/static/images/press/ts_logo_tm_1024x196.png | Bin 0 -> 21235 bytes doc/static/images/press/ts_logo_tm_1960x375.png | Bin 0 -> 41128 bytes doc/static/images/press/ts_logo_tm_380x73.png | Bin 0 -> 7500 bytes doc/static/images/press/tsicon.png | Bin 0 -> 4328 bytes doc/static/images/press/tsicon_large.png | Bin 0 -> 8307 bytes doc/static/images/press/tsicon_small.png | Bin 0 -> 2132 bytes doc/static/images/sdk/Protocol_state_diagram.jpg | Bin 0 -> 62342 bytes doc/static/images/sdk/Uses.jpg | Bin 0 -> 96105 bytes doc/static/images/sdk/blacklist75.jpg | Bin 0 -> 93834 bytes doc/static/images/sdk/event_sys80.jpg | Bin 0 -> 70729 bytes doc/static/images/sdk/evt_plugin120.jpg | Bin 0 -> 82354 bytes doc/static/images/sdk/http_header_struct.jpg | Bin 0 -> 41668 bytes doc/static/images/sdk/http_headers.jpg | Bin 0 -> 83292 bytes doc/static/images/sdk/http_state2.jpg | Bin 0 -> 147802 bytes doc/static/images/sdk/marshall_buffers.jpg | Bin 0 -> 90358 bytes doc/static/images/sdk/plugin_process.jpg | Bin 0 -> 34531 bytes doc/static/images/sdk/protocol_evt.jpg | Bin 0 -> 61809 bytes doc/static/images/sdk/protocol_sm_big.jpg | Bin 0 -> 59301 bytes doc/static/images/sdk/transact75.jpg | Bin 0 -> 49702 bytes doc/static/images/sdk/transact_hook75.jpg | Bin 0 -> 84733 bytes doc/static/images/sdk/txn_sm.jpg | Bin 0 -> 94051 bytes doc/static/images/sdk/vconn_buf_output.jpg | Bin 0 -> 44215 bytes doc/static/images/sdk/vconn_buffer.jpg | Bin 0 -> 64914 bytes doc/static/images/sdk/vconnection.jpg | Bin 0 -> 50918 bytes doc/static/images/sdk/vconnection1.jpg | Bin 0 -> 81340 bytes doc/static/images/sdk/vconnection2.jpg | Bin 0 -> 57055 bytes doc/static/images/trans_logo_148x132.png | Bin 0 -> 2356 bytes doc/static/images/trans_logo_150x30.gif | Bin 0 -> 1514 bytes doc/static/images/trans_logo_150x30.png | Bin 0 -> 1285 bytes doc/static/images/trans_logo_150x32.png | Bin 0 -> 2080 bytes doc/static/images/trans_logo_160x35.png | Bin 0 -> 2090 bytes doc/static/images/trans_logo_250x49.gif | Bin 0 -> 2287 bytes doc/static/images/trans_logo_250x49.png | Bin 0 -> 2072 bytes doc/static/images/trans_logo_350x69.gif | Bin 0 -> 3180 bytes doc/static/images/trans_logo_350x69.png | Bin 0 -> 2910 bytes doc/static/images/trans_logo_420x95.png | Bin 0 -> 4213 bytes doc/static/images/trans_logo_603x132.png | Bin 0 -> 5665 bytes doc/static/images/trans_logo_tm_380x69.png | Bin 0 -> 4192 bytes doc/static/images/ts75.png | Bin 0 -> 7340 bytes doc/static/images/warning.png | Bin 0 -> 394 bytes example/Makefile.am | 10 +- example/add-header/add-header.c | 6 +- example/append-transform/append-transform.c | 8 +- example/basic-auth/basic-auth.c | 14 +- example/blacklist-1/blacklist-1.c | 10 +- example/bnull-transform/bnull-transform.c | 10 +- example/cache-scan/cache-scan.cc | 13 +- example/hello/hello.c | 6 +- example/null-transform/null-transform.c | 12 +- example/output-header/output-header.c | 8 +- example/protocol/Protocol.c | 3 +- example/protocol/TxnSM.c | 18 +- example/query-remap/query-remap.c | 13 +- example/remap/remap.cc | 10 +- example/replace-header/replace-header.c | 12 +- example/response-header-1/response-header-1.c | 11 +- example/server-transform/server-transform.c | 35 +- example/session-1/session-1.c | 7 +- example/thread-1/thread-1.c | 8 +- example/thread-pool/psi.c | 12 +- example/thread-pool/thread.c | 5 +- iocore/aio/AIO.cc | 28 +- iocore/aio/I_AIO.h | 111 +- iocore/aio/P_AIO.h | 6 +- iocore/aio/test_AIO.cc | 10 +- iocore/cache/Cache.cc | 190 +- iocore/cache/CacheDir.cc | 40 +- iocore/cache/CacheDisk.cc | 2 +- iocore/cache/CacheLink.cc | 2 +- iocore/cache/CachePages.cc | 2 +- iocore/cache/CacheRead.cc | 16 +- iocore/cache/CacheVol.cc | 12 +- iocore/cache/CacheWrite.cc | 103 +- iocore/cache/I_Store.h | 19 +- iocore/cache/P_CacheDir.h | 13 +- iocore/cache/P_CacheDisk.h | 4 +- iocore/cache/P_CacheInternal.h | 28 +- iocore/cache/P_CacheVol.h | 4 +- iocore/cache/Store.cc | 91 +- iocore/cluster/ClusterAPI.cc | 2 +- iocore/cluster/ClusterCache.cc | 2 +- iocore/cluster/ClusterConfig.cc | 19 +- iocore/cluster/ClusterHandler.cc | 8 +- iocore/cluster/ClusterHandlerBase.cc | 58 +- iocore/cluster/ClusterHash.cc | 2 - iocore/cluster/ClusterMachine.cc | 3 +- iocore/cluster/ClusterProcessor.cc | 2 +- iocore/cluster/ClusterVConnection.cc | 6 +- iocore/cluster/P_ClusterCache.h | 2 +- iocore/dns/DNS.cc | 12 +- iocore/dns/DNSConnection.cc | 2 - iocore/dns/SRV.h | 6 +- iocore/dns/SplitDNS.cc | 2 +- iocore/eventsystem/IOBuffer.cc | 2 - iocore/eventsystem/I_EThread.h | 6 +- iocore/eventsystem/I_IOBuffer.h | 35 +- iocore/eventsystem/I_Lock.h | 8 +- iocore/eventsystem/I_ProxyAllocator.h | 12 +- iocore/eventsystem/I_SocketManager.h | 2 +- iocore/eventsystem/I_VConnection.h | 25 +- iocore/eventsystem/P_IOBuffer.h | 29 +- iocore/eventsystem/P_UnixEThread.h | 10 +- iocore/eventsystem/P_UnixSocketManager.h | 25 - iocore/eventsystem/ProtectedQueue.cc | 2 +- iocore/eventsystem/SocketManager.cc | 69 +- iocore/eventsystem/UnixEThread.cc | 5 +- iocore/eventsystem/UnixEvent.cc | 9 +- iocore/eventsystem/UnixEventProcessor.cc | 21 +- iocore/eventsystem/test_Buffer.cc | 13 +- iocore/eventsystem/test_Event.cc | 10 +- iocore/hostdb/HostDB.cc | 127 +- iocore/hostdb/I_HostDB.h | 4 +- iocore/hostdb/I_HostDBProcessor.h | 54 +- iocore/hostdb/MultiCache.cc | 155 +- iocore/hostdb/P_HostDBProcessor.h | 76 +- iocore/net/Connection.cc | 220 +- iocore/net/I_NetProcessor.h | 76 +- iocore/net/Net.cc | 1 - iocore/net/NetTest-http-server.c | 2 +- iocore/net/NetVCTest.cc | 2 +- iocore/net/P_Connection.h | 25 - iocore/net/P_NetAccept.h | 2 +- iocore/net/P_NetVCTest.h | 2 +- iocore/net/P_SSLUtils.h | 2 +- iocore/net/P_UnixNet.h | 13 +- iocore/net/P_UnixNetProcessor.h | 6 +- iocore/net/P_UnixNetVConnection.h | 10 +- iocore/net/P_UnixUDPConnection.h | 2 +- iocore/net/SSLCertLookup.cc | 4 +- iocore/net/SSLNetVConnection.cc | 36 +- iocore/net/SSLUtils.cc | 252 +- iocore/net/Socks.cc | 18 +- iocore/net/UnixConnection.cc | 1 - iocore/net/UnixNet.cc | 25 +- iocore/net/UnixNetAccept.cc | 9 +- iocore/net/UnixNetProcessor.cc | 6 +- iocore/net/UnixNetVConnection.cc | 80 +- iocore/net/UnixUDPConnection.cc | 10 +- iocore/net/UnixUDPNet.cc | 4 +- iocore/net/test_certlookup.cc | 4 +- iocore/utils/Machine.cc | 25 +- iocore/utils/OneWayTunnel.cc | 18 +- lib/cpp11api/Makefile.am | 2 +- lib/cpp11api/cpp11api.cc | 9 +- lib/records/I_RecCore.h | 1 - lib/records/I_RecProcess.h | 2 +- lib/records/P_RecCore.cc | 21 +- lib/records/P_RecCore.h | 2 + lib/records/P_RecDefs.h | 2 - lib/records/RecCore.cc | 28 +- lib/records/RecHttp.cc | 2 - lib/records/RecLocal.cc | 2 +- lib/records/RecMessage.cc | 4 +- lib/records/RecProcess.cc | 6 +- lib/records/RecUtils.cc | 23 +- lib/records/test_RecProcess.i | 10 +- lib/ts/Allocator.h | 2 +- lib/ts/Compatability.h | 2 +- lib/ts/CompileParseRules.cc | 1 - lib/ts/Diags.cc | 42 +- lib/ts/Diags.h | 73 +- lib/ts/HostLookup.cc | 5 +- lib/ts/INK_MD5.h | 13 +- lib/ts/IpMap.h | 2 +- lib/ts/IpMapTest.cc | 6 +- lib/ts/Layout.cc | 11 +- lib/ts/List.h | 3 +- lib/ts/MMH.cc | 577 ---- lib/ts/MMH.h | 146 - lib/ts/Makefile.am | 25 +- lib/ts/MimeTable.h | 2 +- lib/ts/ParseRules.h | 5 +- lib/ts/Ptr.h | 17 +- lib/ts/RawHashTable.cc | 1 - lib/ts/Regression.cc | 3 +- lib/ts/Resource.cc | 2 +- lib/ts/SimpleTokenizer.h | 1 - lib/ts/TestHttpHeader.cc | 1 - lib/ts/TextBuffer.cc | 2 - lib/ts/Tokenizer.cc | 2 - lib/ts/Trie.h | 2 +- lib/ts/Version.cc | 2 - lib/ts/ink_aiocb.h | 2 +- lib/ts/ink_args.cc | 1 - lib/ts/ink_assert.cc | 3 +- lib/ts/ink_assert.h | 7 +- lib/ts/ink_atomic.h | 2 +- lib/ts/ink_auth_api.h | 2 +- lib/ts/ink_base64.cc | 6 +- lib/ts/ink_bool.h | 77 - lib/ts/ink_code.cc | 1 - lib/ts/ink_config.h.in | 64 +- lib/ts/ink_defs.cc | 59 +- lib/ts/ink_defs.h | 93 +- lib/ts/ink_error.h | 9 - lib/ts/ink_file.cc | 18 + lib/ts/ink_file.h | 6 + lib/ts/ink_hash_table.cc | 1 - lib/ts/ink_hrtime.cc | 11 +- lib/ts/ink_hrtime.h | 2 +- lib/ts/ink_llqueue.h | 2 - lib/ts/ink_lockfile.h | 2 +- lib/ts/ink_memory.cc | 70 +- lib/ts/ink_memory.h | 74 +- lib/ts/ink_mutex.cc | 11 +- lib/ts/ink_mutex.h | 3 +- lib/ts/ink_port.h | 91 - lib/ts/ink_queue.cc | 2 +- lib/ts/ink_queue.h | 3 +- lib/ts/ink_queue_ext.cc | 151 +- lib/ts/ink_queue_ext.h | 8 + lib/ts/ink_queue_utils.cc | 1 - lib/ts/ink_rand.h | 2 +- lib/ts/ink_res_init.cc | 10 +- lib/ts/ink_res_mkquery.cc | 11 +- lib/ts/ink_resolver.h | 12 +- lib/ts/ink_resource.cc | 14 +- lib/ts/ink_resource.h | 3 +- lib/ts/ink_sock.cc | 2 - lib/ts/ink_sock.h | 2 +- lib/ts/ink_sprintf.cc | 1 - lib/ts/ink_stack_trace.cc | 4 +- lib/ts/ink_stack_trace.h | 2 +- lib/ts/ink_string++.cc | 1 - lib/ts/ink_string.cc | 8 +- lib/ts/ink_string.h | 10 +- lib/ts/ink_syslog.cc | 4 - lib/ts/ink_thread.cc | 1 - lib/ts/ink_thread.h | 26 +- lib/ts/ink_time.cc | 3 +- lib/ts/ink_time.h | 3 +- lib/ts/ink_unused.h | 55 - lib/ts/libts.h | 5 - lib/ts/llqueue.cc | 1 - lib/ts/lockfile.cc | 2 +- lib/ts/mkdfa.c | 4 - lib/ts/test_Map.cc | 2 +- lib/ts/test_Vec.cc | 2 +- lib/ts/test_atomic.cc | 3 +- lib/ts/test_freelist.cc | 5 +- lib/tsconfig/Makefile.am | 6 +- lib/tsconfig/TsConfigGrammar.y | 3 +- lib/tsconfig/TsErrataUtil.cc | 7 +- lib/tsconfig/TsValue.cc | 3 +- lib/tsconfig/test-tsconfig.cc | 2 +- lib/wccp/Wccp.h | 2 +- lib/wccp/WccpEndPoint.cc | 10 +- lib/wccp/WccpMsg.cc | 4 +- lib/wccp/WccpStatic.cc | 5 +- mgmt/AddConfigFilesHere.cc | 2 - mgmt/Alarms.h | 3 +- mgmt/LocalManager.cc | 3 +- mgmt/Main.cc | 69 +- mgmt/Main.h | 5 - mgmt/Makefile.am | 5 +- mgmt/MgmtDefs.h | 2 +- mgmt/MultiFile.cc | 3 +- mgmt/ProcessManager.cc | 7 +- mgmt/ProxyConfig.h | 5 +- mgmt/RecordsConfig.cc | 31 +- mgmt/Rollback.h | 3 +- mgmt/api/CoreAPI.cc | 2 +- mgmt/api/GenericParser.h | 1 - mgmt/api/INKMgmtAPI.cc | 14 +- mgmt/api/NetworkUtilsLocal.h | 2 +- mgmt/api/remote/APITestCliRemote.cc | 5 +- mgmt/api/remote/CoreAPIRemote.cc | 1 + mgmt/api/remote/Makefile.am | 3 +- mgmt/api/remote/NetworkUtilsRemote.cc | 1 + mgmt/api/remote/NetworkUtilsRemote.h | 2 +- mgmt/cli/CliCreateCommands.cc | 2 +- mgmt/cli/CliMgmtUtils.cc | 2 +- mgmt/cli/CliMgmtUtils.h | 2 +- mgmt/cli/ConfigCmd.cc | 36 +- mgmt/cli/Makefile.am | 9 +- mgmt/cli/TrafficLine.cc | 2 +- mgmt/cli/UtilCmds.cc | 1 + mgmt/cli/cliAppInit.cc | 4 +- mgmt/cli/cliMain.cc | 3 +- mgmt/cli/cliParseArg.cc | 38 +- mgmt/cli/createArgument.cc | 7 +- mgmt/cli/createArgument.h | 2 +- mgmt/cli/createCommand.cc | 2 +- mgmt/cli/definitions.h | 3 - mgmt/cli/hashtable.cc | 1 + mgmt/cli/processArgument.cc | 1 + mgmt/cluster/ClusterCom.cc | 6 +- mgmt/cluster/VMap.cc | 2 - mgmt/preparse/IPRange.cc | 2 - mgmt/preparse/IPRange.h | 2 +- mgmt/preparse/SocksParser.cc | 1 - mgmt/stats/StatProcessor.cc | 5 +- mgmt/stats/StatType.cc | 32 +- mgmt/tools/ConfigAPI.cc | 6 +- mgmt/tools/ConfigAPI.h | 4 - mgmt/tools/SysAPI.cc | 24 +- mgmt/tools/SysAPI.h | 4 - mgmt/utils/EnvBlock.cc | 1 - mgmt/utils/ExpandingArray.cc | 1 - mgmt/utils/ExpandingArray.h | 2 - mgmt/utils/MgmtSchema.h | 2 - mgmt/utils/MgmtUtils.cc | 6 +- mgmt/utils/MgmtUtils.h | 1 - mgmt/utils/WebMgmtUtils.h | 1 - mgmt/utils/XmlUtils.cc | 1 + mgmt/web2/WebCompatibility.h | 2 +- mgmt/web2/WebGlobals.h | 1 - mgmt/web2/WebHttp.cc | 1 - mgmt/web2/WebHttpMessage.cc | 3 +- mgmt/web2/WebHttpMessage.h | 1 - mgmt/web2/WebOverview.cc | 11 +- mgmt/web2/WebUtils.cc | 1 - plugins/Makefile.am | 2 +- plugins/cacheurl/Makefile.am | 21 + plugins/cacheurl/README.rst | 86 + plugins/cacheurl/cacheurl.c | 501 +++ plugins/cacheurl/cacheurl.config.example | 39 + plugins/conf_remap/Makefile.am | 5 +- plugins/conf_remap/conf_remap.cc | 11 +- plugins/experimental/Makefile.am | 3 +- plugins/experimental/authproxy/Makefile.am | 8 +- plugins/experimental/authproxy/authproxy.cc | 71 +- plugins/experimental/authproxy/utils.h | 2 +- plugins/experimental/cacheurl/Makefile.am | 22 - plugins/experimental/cacheurl/README.rst | 86 - plugins/experimental/cacheurl/cacheurl.c | 492 --- .../experimental/cacheurl/cacheurl.config.example | 39 - plugins/experimental/channel_stats/Makefile.am | 5 +- .../experimental/channel_stats/channel_stats.cc | 56 +- plugins/experimental/channel_stats/debug_macros.h | 6 +- plugins/experimental/combo_handler/README | 84 - .../experimental/combo_handler/combo_handler.cc | 883 ----- plugins/experimental/custom_redirect/Makefile.am | 6 +- .../custom_redirect/custom_redirect.cc | 2 +- plugins/experimental/esi/Makefile.am | 68 +- plugins/experimental/esi/README.combo | 103 + plugins/experimental/esi/combo_handler.cc | 945 ++++++ plugins/experimental/esi/esi.cc | 1805 +++++++++++ .../esi/fetcher/HttpDataFetcherImpl.cc | 66 +- .../experimental/esi/fetcher/HttpDataFetcherImpl.h | 10 +- plugins/experimental/esi/lib/DocNode.cc | 8 +- plugins/experimental/esi/lib/DocNode.h | 4 +- plugins/experimental/esi/lib/Expression.h | 3 +- plugins/experimental/esi/lib/FailureInfo.h | 2 +- .../experimental/esi/lib/SpecialIncludeHandler.h | 1 + plugins/experimental/esi/lib/Variables.cc | 2 +- plugins/experimental/esi/plugin.cc | 1806 ----------- plugins/experimental/esi/serverIntercept.cc | 4 +- plugins/experimental/esi/test/HandlerManager.cc | 42 - .../experimental/esi/test/TestHandlerManager.cc | 2 +- plugins/experimental/geoip_acl/README | 9 +- plugins/experimental/gzip/Makefile.am | 5 +- plugins/experimental/gzip/gzip.cc | 17 +- plugins/experimental/gzip/misc.cc | 14 +- plugins/experimental/gzip/misc.h | 2 - plugins/experimental/header_rewrite/Makefile.am | 24 +- plugins/experimental/header_rewrite/condition.cc | 4 - plugins/experimental/header_rewrite/condition.h | 3 - plugins/experimental/header_rewrite/conditions.cc | 18 +- plugins/experimental/header_rewrite/conditions.h | 11 +- plugins/experimental/header_rewrite/factory.cc | 3 - plugins/experimental/header_rewrite/factory.h | 3 - .../experimental/header_rewrite/header_rewrite.cc | 8 +- plugins/experimental/header_rewrite/lulu.h | 4 +- plugins/experimental/header_rewrite/matcher.cc | 4 - plugins/experimental/header_rewrite/matcher.h | 53 +- plugins/experimental/header_rewrite/operator.cc | 4 - plugins/experimental/header_rewrite/operator.h | 3 - plugins/experimental/header_rewrite/operators.cc | 6 +- plugins/experimental/header_rewrite/operators.h | 5 +- plugins/experimental/header_rewrite/parser.cc | 3 - plugins/experimental/header_rewrite/parser.h | 4 - plugins/experimental/header_rewrite/resources.cc | 4 - plugins/experimental/header_rewrite/resources.h | 4 - plugins/experimental/header_rewrite/ruleset.cc | 3 - plugins/experimental/header_rewrite/ruleset.h | 4 - plugins/experimental/header_rewrite/statement.cc | 3 - plugins/experimental/header_rewrite/statement.h | 5 +- plugins/experimental/header_rewrite/value.h | 3 - plugins/experimental/hipes/hipes.cc | 6 +- plugins/experimental/lua/Makefile.am | 11 +- plugins/experimental/lua/hook.cc | 12 +- plugins/experimental/lua/lapi.cc | 6 +- plugins/experimental/lua/lconfig.cc | 6 +- plugins/experimental/lua/lutil.cc | 8 +- plugins/experimental/lua/lutil.h | 9 +- plugins/experimental/lua/remap.cc | 13 +- plugins/experimental/lua/state.cc | 10 +- plugins/experimental/metalink/Makefile.am | 5 +- plugins/experimental/metalink/README | 80 + plugins/experimental/metalink/metalink.cc | 25 +- plugins/experimental/rfc5861/Makefile.am | 5 +- plugins/experimental/rfc5861/rfc5861.c | 9 +- plugins/experimental/spdy/Makefile.am | 21 +- plugins/experimental/spdy/http.cc | 4 +- plugins/experimental/spdy/lib/base/logging.h | 7 - plugins/experimental/spdy/lib/spdy/message.cc | 32 +- plugins/experimental/spdy/spdy.cc | 12 +- plugins/experimental/spdy/stream.cc | 4 +- plugins/experimental/tcp_info/Makefile.am | 7 +- plugins/experimental/tcp_info/tcp_info.cc | 4 +- plugins/header_filter/Makefile.am | 6 +- plugins/header_filter/header_filter.cc | 4 +- plugins/header_filter/lulu.h | 1 - plugins/regex_remap/Makefile.am | 6 +- plugins/regex_remap/regex_remap.cc | 11 +- plugins/stats_over_http/Makefile.am | 5 +- plugins/stats_over_http/stats_over_http.c | 8 +- proxy/AbstractBuffer.cc | 1 - proxy/CacheControl.cc | 5 +- proxy/ControlBase.cc | 11 +- proxy/ControlMatcher.cc | 1 - proxy/ControlMatcher.h | 2 +- proxy/CoreUtils.cc | 1 - proxy/DiagsConfig.cc | 2 +- proxy/Error.cc | 6 +- proxy/ICP.cc | 3 - proxy/ICPProcessor.cc | 2 - proxy/ICPStats.cc | 2 - proxy/InkAPI.cc | 54 +- proxy/InkAPITest.cc | 136 +- proxy/InkXml.cc | 19 +- proxy/InkXml.h | 32 +- proxy/Main.cc | 96 +- proxy/Main.h | 2 - proxy/Makefile.am | 62 +- proxy/MuxVC.cc | 184 +- proxy/ParentSelection.cc | 6 +- proxy/PluginVC.cc | 20 +- proxy/Prefetch.cc | 10 +- proxy/ReverseProxy.cc | 3 +- proxy/ReverseProxy.h | 2 +- proxy/SocksProxy.cc | 5 +- proxy/StatSystem.cc | 4 +- proxy/TestClock.cc | 1 - proxy/TestClusterHash.cc | 2 - proxy/TestDNS.cc | 1 - proxy/TestHook.cc | 513 --- proxy/TestPreProc.cc | 2 - proxy/TestProxy.cc | 19 - proxy/TestRegex.cc | 1 - proxy/TestSimpleProxy.cc | 1 - proxy/Update.cc | 2 +- proxy/api/ts/experimental.h | 4 + proxy/api/ts/ts.h.in | 4 +- .../body_factory/default/response#bad_version | 2 +- proxy/config/records.config.default.in | 7 +- proxy/congest/Congestion.cc | 38 +- proxy/congest/CongestionDB.cc | 2 - proxy/congest/CongestionTest.cc | 4 +- proxy/hdrs/HTTP.cc | 147 +- proxy/hdrs/HTTP.h | 97 +- proxy/hdrs/HdrHeap.h | 5 +- proxy/hdrs/HdrTSOnly.cc | 8 +- proxy/hdrs/HdrToken.cc | 6 +- proxy/hdrs/HdrToken.h | 31 +- proxy/hdrs/HdrUtils.cc | 2 +- proxy/hdrs/HttpCompat.h | 1 - proxy/hdrs/MIME.cc | 79 +- proxy/hdrs/MIME.h | 3 +- proxy/hdrs/Makefile.am | 2 +- proxy/hdrs/URL.cc | 106 +- proxy/hdrs/URL.h | 78 +- proxy/http/HttpBodyFactory.cc | 8 +- proxy/http/HttpBodyFactory.h | 21 +- proxy/http/HttpClientSession.cc | 2 +- proxy/http/HttpConfig.cc | 3 - proxy/http/HttpConfig.h | 3 - proxy/http/HttpDebugNames.cc | 1 - proxy/http/HttpProxyServerMain.cc | 91 +- proxy/http/HttpProxyServerMain.h | 2 +- proxy/http/HttpSM.cc | 49 +- proxy/http/HttpServerSession.cc | 15 +- proxy/http/HttpServerSession.h | 6 +- proxy/http/HttpSessionManager.cc | 29 +- proxy/http/HttpTransact.cc | 238 +- proxy/http/HttpTransact.h | 4 +- proxy/http/HttpTransactCache.cc | 70 +- proxy/http/HttpTransactHeaders.cc | 28 +- proxy/http/HttpTransactHeaders.h | 2 +- proxy/http/HttpTunnel.cc | 4 +- proxy/http/HttpUpdateTester.cc | 4 +- proxy/http/TestHttpTransact.cc | 1 - proxy/http/TestUrl.cc | 1 - proxy/http/remap/RemapPlugins.cc | 212 +- proxy/http/remap/RemapProcessor.cc | 4 +- proxy/http/remap/UrlMapping.cc | 2 +- proxy/http/remap/UrlMapping.h | 11 +- proxy/http/remap/UrlMappingPathIndex.h | 9 + proxy/http/remap/UrlRewrite.cc | 15 +- proxy/http/remap/UrlRewrite.h | 3 +- proxy/http/test_socket_close.cc | 1 - proxy/http/testheaders.cc | 1 - proxy/logcat.cc | 17 +- proxy/logging/Log.cc | 16 +- proxy/logging/LogAccess.cc | 53 +- proxy/logging/LogAccess.h | 2 - proxy/logging/LogAccessHttp.cc | 2 - proxy/logging/LogAccessTest.cc | 1 - proxy/logging/LogBuffer.cc | 7 +- proxy/logging/LogBuffer.h | 6 +- proxy/logging/LogCollationClientSM.cc | 2 +- proxy/logging/LogConfig.cc | 96 +- proxy/logging/LogConfig.h | 30 +- proxy/logging/LogField.cc | 2 +- proxy/logging/LogFieldAliasMap.h | 2 +- proxy/logging/LogFile.cc | 17 +- proxy/logging/LogFilter.cc | 2 +- proxy/logging/LogFormat.cc | 2 - proxy/logging/LogObject.cc | 18 +- proxy/logging/LogSock.cc | 2 - proxy/logging/LogStandalone.cc | 19 +- proxy/logging/LogUtils.cc | 7 +- proxy/logstats.cc | 57 +- proxy/sac.cc | 7 +- proxy/signals.cc | 6 +- proxy/test_xml_parser.cc | 31 +- proxy/tests/logstats.blog | Bin 0 -> 14976 bytes proxy/tests/logstats.json | 243 ++ proxy/tests/logstats.summary | 164 + proxy/tests/test_logstats_json | 28 + proxy/tests/test_logstats_summary | 29 + tools/Makefile.am | 24 + tools/http_load/http_load.c | 14 +- tools/http_load/port.h | 27 + tools/http_load/timers.c | 6 +- tools/jtest/Makefile | 7 - tools/jtest/jtest.cc | 1560 +--------- tools/tstop/Makefile | 5 - tools/tstop/stats.h | 13 +- tools/tstop/tstop.cc | 67 +- tools/tsxs.in | 5 +- 747 files changed, 30729 insertions(+), 11043 deletions(-) ----------------------------------------------------------------------
