You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/04/20 21:21:05 UTC
[48/50] [abbrv] git commit: Merge remote-tracking branch
'origin/master' into lua_config
Merge remote-tracking branch 'origin/master' into lua_config
* origin/master: (363 commits)
TS-2564 Revert field token ordering.
[TS-2664] atscppapi: Removing initializable value code
[TS-2664] Removing initializable value code
[TS-2664] Removing initializable value files
TS-2660: rename StateMachineAction_t values with a consistent prefix
[TS-2662] Re-enable KEEP_ALIVE_POST_OUT by default.
[TS-2662] Re-enable KEEP_ALIVE_POST_OUT by default. This closes #66
Fix harmless Ethread::schedule_in parameter mismatch
TS-2661: Remove unused HttpSM::decide_cached_url method.
Remaporder
TS-2658: additional SSL certificate logging
Cleanup the configure.ac in some sort of order... Minor.
Update CHANGES with TS-2431
TS-2431: Migrate Taobao SPDY plugin to ATS core
TS-2431: Preparation of SPDY protocol
TS-2431: Add autoconf options for SPDY
[TS-2651] atscppapi: race conditions in destruction of async providers. This closes #64
[TS-2651] atscppapi: race conditions in destruction of async providers
[TS-2651] atscppapi: race conditions in destruction of async providers
[TS-2651] atscppapi: race conditions in destruction of async providers
...
Conflicts:
iocore/net/SSLUtils.cc
proxy/Makefile.am
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c5c92b94
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c5c92b94
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c5c92b94
Branch: refs/heads/lua_config
Commit: c5c92b9491f3172e5f600502df65b1a99a2e535e
Parents: 5f436df 8d7d25d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Mar 25 21:19:28 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Mar 25 21:19:28 2014 -0600
----------------------------------------------------------------------
.gitignore | 6 +-
CHANGES | 261 +-
INSTALL | 4 +-
Makefile.am | 2 +-
NOTICE | 8 +-
REVIEWERS | 11 +-
STATUS | 4 +-
build/ax_check_openssl.m4 | 128 +
build/crypto.m4 | 145 +-
ci/jenkins/jobs.yaml | 8 +-
ci/regression | 2 +
ci/tsqa/functions | 73 +-
ci/tsqa/test-log-configuration | 15 +-
ci/tsqa/test-multicert-loading | 81 +
ci/tsqa/test-ssl-certificates | 135 +
ci/tsqa/test-trafficline-metrics | 56 +
cmd/traffic_cop/Makefile.am | 2 +-
cmd/traffic_cop/traffic_cop.cc | 141 +-
cmd/traffic_line/Makefile.am | 2 +-
cmd/traffic_line/traffic_line.cc | 160 +-
cmd/traffic_shell/CliMgmtUtils.cc | 1 -
cmd/traffic_shell/Makefile.am | 2 +-
cmd/traffic_shell/ShowCmd.cc | 2 +-
cmd/traffic_top/traffic_top.cc | 2 +-
configure.ac | 214 +-
contrib/make-ssl-multicert | 2 +-
contrib/python/compare_RecordsConfigcc.py | 80 +-
doc/admin/cluster-howto.en.rst | 60 +-
doc/admin/configuring-cache.en.rst | 4 +-
doc/admin/configuring-traffic-server.en.rst | 26 +-
doc/admin/event-logging-formats.en.rst | 4 +
doc/admin/faqs.en.rst | 6 +-
doc/admin/http-proxy-caching.en.rst | 2 +-
doc/admin/monitoring-traffic.en.rst | 2 +-
doc/admin/traffic-server-error-messages.en.rst | 12 +-
.../transparent-proxy/wccp-configuration.en.rst | 2 +-
doc/admin/working-log-files.en.rst | 276 +-
doc/admin/working-log-files/log-formats.en.rst | 369 --
doc/arch/cache/cache-arch.en.rst | 18 +-
doc/arch/cache/cache.en.rst | 1 +
doc/arch/hacking/index.en.rst | 32 +
doc/arch/index.en.rst | 9 +-
.../ja/LC_MESSAGES/admin/cluster-howto.en.po | 293 ++
.../LC_MESSAGES/admin/configuring-cache.en.po | 578 +++
.../admin/configuring-traffic-server.en.po | 110 +
.../admin/event-logging-formats.en.po | 1007 +++++
.../admin/explicit-proxy-caching.en.po | 108 +
doc/locale/ja/LC_MESSAGES/admin/faqs.en.po | 745 ++++
.../ja/LC_MESSAGES/admin/forward-proxy.en.po | 139 +
.../ja/LC_MESSAGES/admin/getting-started.en.po | 333 ++
.../LC_MESSAGES/admin/hierachical-caching.en.po | 169 +
.../LC_MESSAGES/admin/http-proxy-caching.en.po | 1870 ++++++++++
doc/locale/ja/LC_MESSAGES/admin/index.en.po | 628 ++++
.../LC_MESSAGES/admin/monitoring-traffic.en.po | 142 +
.../LC_MESSAGES/admin/performance-tuning.en.po | 57 +
.../admin/reverse-proxy-http-redirects.en.po | 611 +++
.../ja/LC_MESSAGES/admin/security-options.en.po | 482 +++
.../admin/traffic-server-error-messages.en.po | 857 +++++
.../LC_MESSAGES/admin/transparent-proxy.en.po | 203 +
.../admin/transparent-proxy/bridge.en.po | 283 ++
.../admin/transparent-proxy/build.en.po | 96 +
.../admin/transparent-proxy/router-inline.en.po | 147 +
.../transparent-proxy/wccp-configuration.en.po | 285 ++
.../LC_MESSAGES/admin/working-log-files.en.po | 1442 ++++++++
.../admin/working-log-files/log-formats.en.po | 530 +++
.../ja/LC_MESSAGES/arch/cache/cache-api.en.po | 48 +
.../LC_MESSAGES/arch/cache/cache-appendix.en.po | 238 ++
.../ja/LC_MESSAGES/arch/cache/cache-arch.en.po | 2091 +++++++++++
.../arch/cache/cache-data-structures.en.po | 273 ++
.../ja/LC_MESSAGES/arch/cache/cache.en.po | 20 +
.../ja/LC_MESSAGES/arch/cache/ram-cache.en.po | 256 ++
.../LC_MESSAGES/arch/cache/tier-storage.en.po | 209 ++
.../ja/LC_MESSAGES/arch/hacking/index.en.po | 27 +
doc/locale/ja/LC_MESSAGES/arch/index.en.po | 47 +
.../ja/LC_MESSAGES/arch/proposals/hostdb.en.po | 357 ++
doc/locale/ja/LC_MESSAGES/glossary.en.po | 269 ++
doc/locale/ja/LC_MESSAGES/index.po | 58 +
.../ja/LC_MESSAGES/reference/api/TSAPI.en.po | 305 ++
.../ja/LC_MESSAGES/reference/api/TSDebug.en.po | 102 +
.../reference/api/TSHttpHookAdd.en.po | 117 +
.../reference/api/TSHttpOverridableConfig.en.po | 93 +
.../reference/api/TSHttpParserCreate.en.po | 107 +
.../reference/api/TSHttpTxnMilestoneGet.en.po | 244 ++
.../reference/api/TSIOBufferCreate.en.po | 108 +
.../reference/api/TSInstallDirGet.en.po | 69 +
.../reference/api/TSLifecycleHookAdd.en.po | 177 +
.../reference/api/TSMBufferCreate.en.po | 104 +
.../api/TSMimeHdrFieldValueStringGet.en.po | 117 +
.../reference/api/TSPluginInit.en.po | 77 +
.../ja/LC_MESSAGES/reference/api/TSRemap.en.po | 130 +
.../api/TSTrafficServerVersionGet.en.po | 53 +
.../ja/LC_MESSAGES/reference/api/TSTypes.en.po | 106 +
.../LC_MESSAGES/reference/api/TSUrlCreate.en.po | 98 +
.../reference/api/TSUrlHostGet.en.po | 85 +
.../reference/api/TSUrlHostSet.en.po | 77 +
.../reference/api/TSUrlPercentEncode.en.po | 76 +
.../reference/api/TSUrlStringGet.en.po | 73 +
.../ja/LC_MESSAGES/reference/api/TSmalloc.en.po | 122 +
.../ja/LC_MESSAGES/reference/api/index.en.po | 16 +
.../LC_MESSAGES/reference/commands/index.en.po | 16 +
.../reference/commands/traffic_cop.en.po | 69 +
.../reference/commands/traffic_line.en.po | 202 +
.../reference/commands/traffic_logcat.en.po | 116 +
.../reference/commands/traffic_logstats.en.po | 28 +
.../reference/commands/traffic_manager.en.po | 24 +
.../reference/commands/traffic_server.en.po | 32 +
.../reference/commands/traffic_shell.en.po | 24 +
.../reference/commands/traffic_top.en.po | 20 +
.../LC_MESSAGES/reference/commands/tspush.en.po | 24 +
.../LC_MESSAGES/reference/commands/tstop.en.po | 20 +
.../LC_MESSAGES/reference/commands/tsxs.en.po | 24 +
.../reference/configuration/cache.config.en.po | 294 ++
.../configuration/congestion.config.en.po | 366 ++
.../configuration/hosting.config.en.po | 110 +
.../reference/configuration/icp.config.en.po | 163 +
.../reference/configuration/index.en.po | 16 +
.../configuration/ip_allow.config.en.po | 79 +
.../configuration/log_hosts.config.en.po | 68 +
.../configuration/logs_xml.config.en.po | 512 +++
.../reference/configuration/parent.config.en.po | 259 ++
.../reference/configuration/plugin.config.en.po | 73 +
.../configuration/records.config.en.po | 3473 ++++++++++++++++++
.../reference/configuration/remap.config.en.po | 717 ++++
.../configuration/splitdns.config.en.po | 181 +
.../configuration/ssl_multicert.config.en.po | 276 ++
.../configuration/storage.config.en.po | 240 ++
.../reference/configuration/update.config.en.po | 423 +++
.../reference/configuration/volume.config.en.po | 97 +
.../reference/plugins/authproxy.en.po | 109 +
.../reference/plugins/balancer.en.po | 102 +
.../reference/plugins/buffer_upload.en.po | 117 +
.../reference/plugins/cacheurl.en.po | 120 +
.../reference/plugins/combo_handler.en.po | 93 +
.../reference/plugins/conf_remap.en.po | 68 +
.../ja/LC_MESSAGES/reference/plugins/esi.en.po | 20 +
.../reference/plugins/geoip_acl.en.po | 101 +
.../ja/LC_MESSAGES/reference/plugins/gzip.en.po | 141 +
.../reference/plugins/header_filter.en.po | 136 +
.../reference/plugins/header_rewrite.en.po | 161 +
.../LC_MESSAGES/reference/plugins/hipes.en.po | 197 +
.../LC_MESSAGES/reference/plugins/index.en.po | 71 +
.../reference/plugins/metalink.en.po | 148 +
.../reference/plugins/mysql_remap.en.po | 107 +
.../reference/plugins/regex_remap.en.po | 138 +
.../plugins/stale_while_revalidate.en.po | 20 +
.../reference/plugins/stats_over_http.en.po | 51 +
.../LC_MESSAGES/reference/plugins/ts_lua.en.po | 455 +++
.../LC_MESSAGES/reference/plugins/xdebug.en.po | 64 +
.../ja/LC_MESSAGES/sdk/actions-guide.en.po | 104 +
.../sdk/actions-guide/hosts-lookup-api.en.po | 38 +
.../ja/LC_MESSAGES/sdk/adding-statistics.en.po | 72 +
.../adding-statistics/coupled-statistics.en.po | 115 +
.../viewing-statistics-using-traffic-line.en.po | 35 +
.../ja/LC_MESSAGES/sdk/continuations.en.po | 161 +
.../how-to-activate-continuations.en.po | 41 +
.../writing-handler-functions.en.po | 388 ++
.../ja/LC_MESSAGES/sdk/getting-started.en.po | 320 ++
.../sdk/getting-started/a-simple-plugin.en.po | 135 +
.../getting-started/naming-conventions.en.po | 68 +
...ugin-registration-and-version-checking.en.po | 44 +
.../sdk/header-based-plugin-examples.en.po | 93 +
.../basic-authorization-plugin.en.po | 41 +
...nd-getting-a-handle-to-the-transaction.en.po | 22 +
.../setting-a-transaction-hook.en.po | 60 +
.../working-with-http-headers.en.po | 33 +
.../blacklist-plugin.en.po | 82 +
...essing-the-transaction-being-processed.en.po | 53 +
.../setting-a-global-hook.en.po | 38 +
.../setting-up-a-transaction-hook.en.po | 73 +
.../working-with-http-header-functions.en.po | 33 +
.../how-to-create-trafficserver-plugins.en.po | 292 ++
.../roadmap-for-creating-plugins.en.po | 130 +
.../ja/LC_MESSAGES/sdk/http-headers.en.po | 159 +
...de-to-trafficserver-http-header-system.en.po | 47 +
...uplicate-mime-fields-are-not-coalesced.en.po | 34 +
...ys-belong-to-an-associated-mime-header.en.po | 56 +
.../release-marshal-buffer-handles.en.po | 76 +
.../sdk/http-headers/http-headers.en.po | 468 +++
.../sdk/http-headers/marshal-buffers.en.po | 100 +
.../sdk/http-headers/mime-headers.en.po | 933 +++++
.../ja/LC_MESSAGES/sdk/http-headers/urls.en.po | 214 ++
.../sdk/http-hooks-and-transactions.en.po | 89 +
.../adding-hooks.en.po | 265 ++
.../http-alternate-selection.en.po | 137 +
.../http-sessions.en.po | 75 +
.../http-transactions.en.po | 170 +
.../initiate-http-connection.en.po | 28 +
.../intercepting-http-transactions.en.po | 32 +
.../sdk/http-transformation-plugin.en.po | 184 +
.../append-transform-plugin.en.po | 208 ++
...le-buffered-null-transformation-plugin.en.po | 191 +
.../sample-null-transformation-plugin.en.po | 175 +
doc/locale/ja/LC_MESSAGES/sdk/index.en.po | 55 +
doc/locale/ja/LC_MESSAGES/sdk/io-guide.en.po | 284 ++
.../sdk/io-guide/guide-to-cache-api.en.po | 63 +
.../io-guide/guide-to-cache-api/errors.en.po | 36 +
.../io-guide/guide-to-cache-api/example.en.po | 70 +
.../how-to-do-a-cache-remove.en.po | 35 +
.../how-to-do-a-cache-write.en.po | 38 +
.../LC_MESSAGES/sdk/io-guide/io-buffers.en.po | 61 +
.../sdk/io-guide/net-vconnections.en.po | 37 +
.../sdk/io-guide/transformations.en.po | 207 ++
.../ja/LC_MESSAGES/sdk/io-guide/vios.en.po | 105 +
.../LC_MESSAGES/sdk/misc-interface-guide.en.po | 72 +
.../memory-allocation.en.po | 68 +
.../misc-interface-guide/thread-functions.en.po | 54 +
.../misc-interface-guide/tsfopen-family.en.po | 79 +
doc/locale/ja/LC_MESSAGES/sdk/mutex-guide.en.po | 306 ++
.../LC_MESSAGES/sdk/new-protocol-plugins.en.po | 525 +++
.../LC_MESSAGES/sdk/plugin-configurations.en.po | 91 +
.../ja/LC_MESSAGES/sdk/plugin-management.en.po | 20 +
.../guide-to-the-logging-api.en.po | 142 +
...-trafficserver-settings-and-statistics.en.po | 79 +
doc/locale/ja/LC_MESSAGES/sdk/preface.en.po | 43 +
.../sdk/preface/how-to-use-this-book.en.po | 203 +
.../sdk/preface/typographical-conventions.en.po | 54 +
.../ja/LC_MESSAGES/sdk/remap-plugin.en.po | 96 +
.../sdk/remap-plugin/example-query-remap.en.po | 92 +
.../ja/LC_MESSAGES/sdk/sample-source-code.en.po | 60 +
.../LC_MESSAGES/sdk/troubleshooting-tips.en.po | 47 +
.../debugging-memory-leaks.en.po | 30 +
.../unable-to-debug-tags.en.po | 144 +
.../unable-to-load-plugins.en.po | 50 +
.../troubleshooting-tips/using-a-debugger.en.po | 40 +
doc/reference/api/TSDebug.en.rst | 14 +-
doc/reference/api/TSRemap.en.rst | 2 +-
doc/reference/api/TSmalloc.en.rst | 2 +-
doc/reference/commands/traffic_cop.en.rst | 19 +-
doc/reference/commands/traffic_line.en.rst | 793 +---
doc/reference/configuration/cache.config.en.rst | 17 +-
.../configuration/congestion.config.en.rst | 3 +-
.../configuration/hosting.config.en.rst | 7 +-
.../configuration/logs_xml.config.en.rst | 14 +-
.../configuration/plugin.config.en.rst | 2 +-
.../configuration/records.config.en.rst | 181 +-
doc/reference/configuration/remap.config.en.rst | 37 +-
.../configuration/ssl_multicert.config.en.rst | 32 +-
.../configuration/storage.config.en.rst | 3 +-
doc/reference/plugins/authproxy.en.rst | 2 +-
doc/reference/plugins/buffer_upload.en.rst | 2 +
doc/reference/plugins/cacheurl.en.rst | 2 +
doc/reference/plugins/combo_handler.en.rst | 2 +
doc/reference/plugins/conf_remap.en.rst | 22 +-
doc/reference/plugins/esi.en.rst | 2 +
doc/reference/plugins/geoip_acl.en.rst | 2 +
doc/reference/plugins/gzip.en.rst | 2 +
doc/reference/plugins/header_filter.en.rst | 132 -
doc/reference/plugins/header_rewrite.en.rst | 72 +-
doc/reference/plugins/hipes.en.rst | 2 +
doc/reference/plugins/index.en.rst | 5 +-
doc/reference/plugins/metafilter.en.rst | 111 -
doc/reference/plugins/metalink.en.rst | 125 +
doc/reference/plugins/mysql_remap.en.rst | 2 +
doc/reference/plugins/regex_remap.en.rst | 8 +
doc/reference/plugins/s3_auth.en.rst | 84 +
.../plugins/stale_while_revalidate.en.rst | 2 +
doc/reference/plugins/stats_over_http.en.rst | 2 +
doc/reference/plugins/ts_lua.en.rst | 2 +
doc/reference/plugins/xdebug.en.rst | 2 +
doc/sdk/continuations.en.rst | 16 +-
doc/sdk/http-headers.en.rst | 13 +-
doc/sdk/index.en.rst | 8 +-
example/Makefile.am | 10 +-
example/secure-link/readme.txt | 19 +
example/secure-link/secure-link.c | 201 +
iocore/aio/AIO.cc | 10 +-
iocore/aio/Makefile.am | 6 +-
iocore/cache/Cache.cc | 169 +-
iocore/cache/CacheDir.cc | 2 +-
iocore/cache/CacheRead.cc | 25 +-
iocore/cache/CacheTest.cc | 72 +
iocore/cache/I_Cache.h | 22 +
iocore/cache/I_CacheDefs.h | 2 +-
iocore/cache/Makefile.am | 3 +-
iocore/cache/P_CacheDisk.h | 2 +-
iocore/cluster/Makefile.am | 3 +-
iocore/dns/DNS.cc | 85 +-
iocore/dns/P_DNSProcessor.h | 6 +-
iocore/eventsystem/I_IOBuffer.h | 1 +
iocore/eventsystem/Makefile.am | 5 +-
iocore/eventsystem/P_IOBuffer.h | 14 +-
iocore/eventsystem/ProtectedQueue.cc | 2 +-
iocore/eventsystem/UnixEventProcessor.cc | 140 +-
iocore/hostdb/HostDB.cc | 12 +-
iocore/net/AcceptCont.cc | 41 +
iocore/net/I_AcceptCont.h | 48 +
iocore/net/I_Net.h | 1 +
iocore/net/I_NetProcessor.h | 1 +
iocore/net/I_NetVConnection.h | 4 +
iocore/net/Makefile.am | 10 +-
iocore/net/Net.cc | 28 +-
iocore/net/P_Net.h | 1 +
iocore/net/P_NetAccept.h | 2 +
iocore/net/P_ProtocolAcceptCont.h | 50 +
iocore/net/P_ProtocolNetAccept.h | 62 +
iocore/net/P_SSLCertLookup.h | 3 +
iocore/net/P_SSLConfig.h | 5 +
iocore/net/P_SSLNetAccept.h | 1 +
iocore/net/P_SSLNetVConnection.h | 16 +-
iocore/net/P_SSLNextProtocolAccept.h | 2 +-
iocore/net/P_SSLNextProtocolSet.h | 4 +-
iocore/net/P_SSLUtils.h | 73 +-
iocore/net/P_UnixNetVConnection.h | 9 +
iocore/net/ProtocolAcceptCont.cc | 73 +
iocore/net/ProtocolNetAccept.cc | 68 +
iocore/net/SSLCertLookup.cc | 44 +-
iocore/net/SSLConfig.cc | 20 +-
iocore/net/SSLNetAccept.cc | 16 +-
iocore/net/SSLNetProcessor.cc | 3 +
iocore/net/SSLNetVConnection.cc | 204 +-
iocore/net/SSLNextProtocolAccept.cc | 2 +-
iocore/net/SSLNextProtocolSet.cc | 20 +-
iocore/net/SSLUtils.cc | 741 +++-
iocore/net/UnixConnection.cc | 2 +
iocore/net/UnixNetAccept.cc | 71 +-
iocore/net/UnixNetProcessor.cc | 20 +-
iocore/net/UnixNetVConnection.cc | 95 +-
iocore/net/test_certlookup.cc | 13 +-
iocore/utils/Machine.cc | 20 +-
lib/atscppapi/Makefile.am | 3 +-
lib/atscppapi/examples/Makefile.am | 4 +-
.../examples/async_http_fetch/AsyncHttpFetch.cc | 16 +-
.../examples/clientredirect/ClientRedirect.cc | 2 +-
.../examples/clientrequest/ClientRequest.cc | 3 +-
.../examples/customresponse/CustomResponse.cc | 2 +-
lib/atscppapi/examples/data_caching/Makefile.am | 34 -
.../examples/data_caching/data_caching.cc | 98 -
.../examples/globalhook/GlobalHookPlugin.cc | 2 +-
.../GzipTransformationPlugin.cc | 2 +-
.../examples/helloworld/HelloWorldPlugin.cc | 2 +-
lib/atscppapi/examples/intercept/Makefile.am | 29 +
lib/atscppapi/examples/intercept/intercept.cc | 55 +
.../InternalTransactionHandling.cc | 4 +-
.../examples/logger_example/LoggerExample.cc | 2 +-
.../MultipleTransactionHookPlugins.cc | 2 +-
.../NullTransformationPlugin.cc | 3 +-
.../examples/post_buffer/PostBuffer.cc | 4 +-
.../examples/remap_plugin/RemapPlugin.cc | 2 +-
.../examples/serverresponse/ServerResponse.cc | 2 +-
.../examples/stat_example/StatExample.cc | 4 +-
.../timeout_example/TimeoutExamplePlugin.cc | 4 +-
.../transactionhook/TransactionHookPlugin.cc | 2 +-
lib/atscppapi/src/AsyncHttpFetch.cc | 43 +-
lib/atscppapi/src/AsyncTimer.cc | 4 +-
lib/atscppapi/src/ClientRequest.cc | 1 -
lib/atscppapi/src/GzipDeflateTransformation.cc | 10 +-
lib/atscppapi/src/GzipInflateTransformation.cc | 3 +-
lib/atscppapi/src/Headers.cc | 208 +-
lib/atscppapi/src/InitializableValue.cc | 29 -
lib/atscppapi/src/InterceptPlugin.cc | 330 ++
lib/atscppapi/src/Makefile.am | 8 +-
lib/atscppapi/src/Request.cc | 24 +-
lib/atscppapi/src/Response.cc | 44 +-
lib/atscppapi/src/Transaction.cc | 1 -
lib/atscppapi/src/TransformationPlugin.cc | 13 +-
lib/atscppapi/src/Url.cc | 103 +-
lib/atscppapi/src/include/InitializableValue.h | 90 -
.../src/include/atscppapi/AsyncHttpFetch.h | 7 +-
lib/atscppapi/src/include/atscppapi/Headers.h | 168 +-
.../src/include/atscppapi/InterceptPlugin.h | 98 +
lib/atscppapi/src/include/atscppapi/Response.h | 2 +-
lib/atscppapi/src/include/atscppapi/Url.h | 10 +-
.../src/include/atscppapi/shared_ptr.h | 14 +-
lib/atscppapi/src/include/atscppapi/utils.h | 10 +-
lib/atscppapi/src/include/utils_internal.h | 10 +
lib/atscppapi/src/utils.cc | 2 -
lib/atscppapi/src/utils_internal.cc | 7 -
lib/perl/Makefile.am | 2 +-
lib/perl/lib/Apache/TS.pm | 73 -
lib/perl/lib/Apache/TS.pm.in | 90 +
lib/perl/lib/Apache/TS/AdminClient.pm | 163 +-
lib/records/I_RecCore.h | 20 +-
lib/records/I_RecDefs.h | 39 +-
lib/records/I_RecEvents.h | 3 +
lib/records/I_RecMutex.h | 1 +
lib/records/I_RecProcess.h | 4 +-
lib/records/P_RecCore.cc | 64 +-
lib/records/P_RecCore.h | 4 -
lib/records/P_RecUtils.h | 9 +-
lib/records/RecCore.cc | 71 +-
lib/records/RecHttp.cc | 10 +-
lib/records/RecMutex.cc | 11 +-
lib/records/RecProcess.cc | 2 +-
lib/records/RecUtils.cc | 20 +-
lib/records/test_RecProcess.i | 12 +-
lib/records/test_RecordsConfig.cc | 10 +-
lib/ts/Compatability.h | 1 -
lib/ts/EventNotify.cc | 5 +-
lib/ts/List.h | 1 -
lib/ts/Makefile.am | 5 +-
lib/ts/SimpleTokenizer.h | 1 -
lib/ts/Tokenizer.cc | 2 +-
lib/ts/apidefs.h.in | 1174 ++++++
lib/ts/ink_args.cc | 9 +-
lib/ts/ink_args.h | 2 +-
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_base64.cc | 1 -
lib/ts/ink_cap.cc | 5 +
lib/ts/ink_cap.h | 9 +-
lib/ts/ink_config.h.in | 4 +-
lib/ts/ink_defs.cc | 18 +-
lib/ts/ink_file.cc | 11 +-
lib/ts/ink_hash_table.cc | 1 -
lib/ts/ink_hrtime.cc | 4 +-
lib/ts/ink_hrtime.h | 49 +-
lib/ts/ink_lockfile.h | 1 -
lib/ts/ink_memory.cc | 20 +
lib/ts/ink_memory.h | 112 +-
lib/ts/ink_mutex.cc | 42 +-
lib/ts/ink_mutex.h | 14 +-
lib/ts/ink_queue.cc | 1 -
lib/ts/ink_queue_ext.cc | 1 -
lib/ts/ink_queue_ext.h | 2 +-
lib/ts/ink_resource.cc | 23 +-
lib/ts/ink_resource.h | 114 +-
lib/ts/libts.h | 1 -
lib/wccp/Makefile.am | 1 -
mgmt/BaseManager.h | 9 +-
mgmt/LocalManager.cc | 39 +-
mgmt/Makefile.am | 7 +-
mgmt/MultiFile.cc | 1 -
mgmt/ProcessManager.cc | 5 +-
mgmt/RecordsConfig.cc | 31 +-
mgmt/api/CoreAPI.cc | 23 +
mgmt/api/CoreAPI.h | 2 +
mgmt/api/CoreAPIRemote.cc | 125 +-
mgmt/api/EventCallback.cc | 1 -
mgmt/api/GenericParser.h | 1 -
mgmt/api/INKMgmtAPI.cc | 15 +
mgmt/api/Makefile.am | 3 +-
mgmt/api/NetworkUtilsDefs.h | 2 +
mgmt/api/NetworkUtilsLocal.cc | 30 +-
mgmt/api/NetworkUtilsLocal.h | 2 +-
mgmt/api/NetworkUtilsRemote.cc | 650 ++--
mgmt/api/NetworkUtilsRemote.h | 6 +-
mgmt/api/TSControlMain.cc | 241 +-
mgmt/api/TSControlMain.h | 4 +-
mgmt/api/include/mgmtapi.h | 14 +-
mgmt/utils/ExpandingArray.cc | 2 +-
mgmt/web2/WebHttpMessage.cc | 1 -
mgmt/web2/WebHttpSession.cc | 1 -
plugins/Makefile.am | 1 -
plugins/cacheurl/Makefile.am | 2 +-
plugins/cacheurl/cacheurl.c | 436 ---
plugins/cacheurl/cacheurl.cc | 445 +++
plugins/conf_remap/conf_remap.cc | 109 +-
plugins/experimental/Makefile.am | 2 +
plugins/experimental/escalate/Makefile.am | 22 +
plugins/experimental/escalate/escalate.cc | 166 +
.../experimental/healthchecks/healthchecks.c | 6 +-
plugins/experimental/metalink/README | 50 +-
plugins/experimental/metalink/metalink.cc | 405 +-
.../experimental/metalink/test/chunkedEncoding | 97 +
.../metalink/test/chunkedEncodingDisconnect | 97 +
.../experimental/metalink/test/clientDisconnect | 94 +
.../experimental/metalink/test/contentLength | 99 +
.../metalink/test/contentLengthDisconnect | 92 +
.../test/finalChunkedEncodingDisconnect | 110 +
plugins/experimental/metalink/test/http09 | 84 +
plugins/experimental/metalink/test/longer | 92 +
plugins/experimental/metalink/test/notModified | 77 +
.../test/shortChunkedEncodingDisconnect | 96 +
.../metalink/test/shortClientDisconnect | 90 +
.../metalink/test/shortContentLengthDisconnect | 93 +
plugins/experimental/metalink/test/zero | 90 +
plugins/experimental/remap_stats/remap_stats.c | 108 +-
plugins/experimental/s3_auth/Makefile.am | 21 +
plugins/experimental/s3_auth/s3_auth.cc | 528 +++
plugins/header_filter/Makefile.am | 21 -
plugins/header_filter/README | 95 -
plugins/header_filter/example.conf | 38 -
plugins/header_filter/header_filter.cc | 215 --
plugins/header_filter/lulu.h | 76 -
plugins/header_filter/rules.cc | 335 --
plugins/header_filter/rules.h | 176 -
plugins/header_rewrite/Makefile.am | 3 +-
plugins/header_rewrite/README | 230 +-
plugins/header_rewrite/condition.h | 4 +-
plugins/header_rewrite/expander.cc | 138 +
plugins/header_rewrite/expander.h | 49 +
plugins/header_rewrite/factory.cc | 2 +
plugins/header_rewrite/header_rewrite.cc | 217 +-
plugins/header_rewrite/lulu.h | 4 +-
plugins/header_rewrite/operator.h | 138 -
plugins/header_rewrite/operators.cc | 78 +-
plugins/header_rewrite/operators.h | 19 +
plugins/header_rewrite/parser.cc | 2 +-
plugins/header_rewrite/resources.cc | 7 +-
plugins/header_rewrite/resources.h | 1 -
plugins/header_rewrite/ruleset.cc | 4 +-
plugins/header_rewrite/value.h | 13 +-
plugins/regex_remap/regex_remap.cc | 796 ++--
plugins/stats_over_http/stats_over_http.c | 2 +-
proxy/FetchSM.cc | 559 ++-
proxy/FetchSM.h | 92 +-
proxy/ICPStats.cc | 52 +-
proxy/InkAPI.cc | 507 ++-
proxy/InkAPIInternal.h | 6 +-
proxy/InkAPITest.cc | 80 +-
proxy/Main.cc | 106 +-
proxy/Main.h | 10 -
proxy/Makefile.am | 23 +-
proxy/Plugin.cc | 34 +-
proxy/PluginVC.h | 8 +-
proxy/Prefetch.cc | 22 +-
proxy/Prefetch.h | 8 -
proxy/SocksProxy.cc | 10 +-
proxy/api/ts/InkAPIPrivateIOCore.h | 4 +
proxy/api/ts/experimental.h | 123 +-
proxy/api/ts/ts.h | 2304 ++++++++++++
proxy/api/ts/ts.h.in | 3301 -----------------
proxy/config/body_factory/default/Makefile.am | 1 +
.../body_factory/default/access#redirect_url | 2 +-
.../body_factory/default/connect#dns_failed | 2 +-
.../body_factory/default/connect#failed_connect | 2 +-
.../config/body_factory/default/connect#hangup | 2 +-
proxy/config/body_factory/default/default | 2 +-
.../default/request#invalid_content_length | 15 +
.../default/request#no_content_length | 2 +-
.../body_factory/default/request#syntax_error | 2 +-
.../body_factory/default/response#bad_response | 2 +-
.../body_factory/default/response#bad_version | 2 +-
.../body_factory/default/urlrouting#no_mapping | 2 +-
proxy/config/records.config.default.in | 9 +-
proxy/config/remap.config.default | 8 +
proxy/config/ssl_multicert.config.default | 11 +-
proxy/hdrs/HTTP.cc | 51 +-
proxy/hdrs/HdrToken.cc | 25 +-
proxy/hdrs/HdrToken.h | 9 +-
proxy/hdrs/MIME.cc | 26 +-
proxy/hdrs/MIME.h | 11 +
proxy/hdrs/URL.cc | 14 +
proxy/hdrs/URL.h | 6 +
proxy/http/HttpAccept.cc | 98 -
proxy/http/HttpAccept.h | 198 -
proxy/http/HttpAcceptCont.cc | 98 +
proxy/http/HttpAcceptCont.h | 198 +
proxy/http/HttpClientSession.cc | 11 +-
proxy/http/HttpClientSession.h | 1 -
proxy/http/HttpConfig.cc | 595 +--
proxy/http/HttpConfig.h | 15 +-
proxy/http/HttpDebugNames.cc | 178 +-
proxy/http/HttpProxyAPIEnums.h | 47 +
proxy/http/HttpProxyServerMain.cc | 55 +-
proxy/http/HttpSM.cc | 336 +-
proxy/http/HttpSM.h | 16 +-
proxy/http/HttpServerSession.cc | 4 +-
proxy/http/HttpServerSession.h | 11 +-
proxy/http/HttpSessionManager.cc | 56 +-
proxy/http/HttpSessionManager.h | 17 +
proxy/http/HttpTransact.cc | 618 +++-
proxy/http/HttpTransact.h | 179 +-
proxy/http/HttpTransactHeaders.cc | 26 +-
proxy/http/HttpTransactHeaders.h | 1 +
proxy/http/HttpTunnel.cc | 53 +-
proxy/http/HttpTunnel.h | 25 +-
proxy/http/HttpUpdateSM.cc | 24 +-
proxy/http/Makefile.am | 13 +-
proxy/http/RegressionHttpTransact.cc | 103 +
proxy/http/remap/Makefile.am | 3 +-
proxy/http/remap/RemapConfig.cc | 102 +-
proxy/http/remap/RemapProcessor.cc | 16 +-
proxy/http/remap/UrlMapping.cc | 7 +-
proxy/logging/Log.cc | 112 +-
proxy/logging/Log.h | 4 +-
proxy/logging/LogAccess.cc | 50 +-
proxy/logging/LogAccess.h | 3 +-
proxy/logging/LogAccessHttp.cc | 43 +-
proxy/logging/LogAccessHttp.h | 2 +-
proxy/logging/LogConfig.cc | 4 +-
proxy/logging/LogFile.cc | 27 -
proxy/logging/LogFormat.cc | 108 +-
proxy/logging/LogFormat.h | 1 +
proxy/logging/LogPredefined.cc | 2 +-
proxy/logging/LogStandalone.cc | 19 +-
proxy/logging/Makefile.am | 3 +-
proxy/shared/Makefile.am | 4 +-
proxy/spdy/Makefile.am | 48 +
proxy/spdy/P_SpdyAcceptCont.h | 46 +
proxy/spdy/P_SpdyCallbacks.h | 248 ++
proxy/spdy/P_SpdyCommon.h | 75 +
proxy/spdy/P_SpdySM.h | 129 +
proxy/spdy/SpdyAcceptCont.cc | 47 +
proxy/spdy/SpdyCallbacks.cc | 513 +++
proxy/spdy/SpdyCommon.cc | 136 +
proxy/spdy/SpdySM.cc | 415 +++
proxy/tests/test_logstats_json | 2 +-
proxy/tests/test_logstats_summary | 2 +-
rc/trafficserver.in | 6 +-
tools/Makefile.am | 11 +-
tools/jtest/jtest.cc | 16 +-
tools/traffic_shell.pl | 900 +++++
592 files changed, 56966 insertions(+), 11652 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c5c92b94/configure.ac
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c5c92b94/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --cc iocore/net/SSLUtils.cc
index b1d8cdc,b96823e..f0219d5
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@@ -23,9 -23,9 +23,11 @@@
#include "libts.h"
#include "I_Layout.h"
#include "P_Net.h"
+#include "luaConfig.h"
+#include "lua.hpp"
+ #include "ink_cap.h"
+ #include <string>
#include <openssl/err.h>
#include <openssl/bio.h>
#include <openssl/pem.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c5c92b94/proxy/Main.cc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c5c92b94/proxy/Makefile.am
----------------------------------------------------------------------
diff --cc proxy/Makefile.am
index 38d0c8a,6dfc816..1056784
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@@ -45,9 -45,8 +45,7 @@@ AM_CPPFLAGS =
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_builddir)/proxy/api/ts \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/proxy/api/ts \
- -I$(top_srcdir)/lib
+ $(LUA_CFLAGS)
noinst_HEADERS = \
ConfigParse.h \
@@@ -121,9 -117,10 +118,10 @@@ if BUILD_TEST
RegressionSM.cc
endif
-traffic_server_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
+traffic_server_LDFLAGS = @LUA_LUAJIT_LDFLAGS@ @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_server_LDADD = \
http/libhttp.a \
+ spdy/libspdy.a \
http/remap/libhttp_remap.a \
congest/libCongestionControl.a \
logging/liblogging.a \
@@@ -150,9 -147,8 +148,9 @@@
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(which_libts) \
@hwloc_LIBS@ \
+ @LUA_LIBS@ \
@LIBPCRE@ \
- @LIBSSL@ \
+ @OPENSSL_LIBS@ \
@LIBTCL@ \
@LIBEXPAT@ \
@LIBDEMANGLE@ \
@@@ -222,12 -219,12 +221,13 @@@ traffic_sac_SOURCES =
Plugin.cc \
InkAPI.cc \
FetchSM.cc \
- InkIOCoreAPI.cc
+ InkIOCoreAPI.cc \
+ luaConfig.cc
-traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
+traffic_sac_LDFLAGS = @LUA_LUAJIT_LDFLAGS@ @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_sac_LDADD = \
http/libhttp.a \
+ spdy/libspdy.a \
shared/libdiagsconfig.a \
http/remap/libhttp_remap.a \
congest/libCongestionControl.a \
@@@ -251,9 -248,8 +251,14 @@@
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/lib/records/librecprocess.a \
$(top_builddir)/lib/ts/libtsutil.la \
++<<<<<<< HEAD
+ @LUA_LIBS@ \
+ @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ -lm
++=======
+ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm
++>>>>>>> origin/master
if BUILD_TESTS
traffic_sac_SOURCES += RegressionSM.cc