Merge branch 'master' into 5.0.x

* master: (69 commits)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2dc04540
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2dc04540
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2dc04540

Branch: refs/heads/5.0.x
Commit: 2dc04540cc8038229d9450b971ae6bdbdfad2e1d
Parents: f32e013 4db27ec
Author: Leif Hedstrom <[email protected]>
Authored: Tue Jan 21 00:07:11 2014 +0100
Committer: Leif Hedstrom <[email protected]>
Committed: Tue Jan 21 00:07:11 2014 +0100

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 CHANGES                                         |  82 +++
 README                                          |  11 +-
 build/ax_lib_readline.m4                        |   2 +-
 ci/jenkins/jobs.yaml                            |   8 +-
 ci/regression                                   |   1 +
 ci/tsqa/functions                               |  70 +-
 ci/tsqa/test-ssl-certificates                   | 135 ++++
 configure.ac                                    |  16 +
 doc/admin/configuring-cache.en.rst              |   2 +-
 doc/admin/forward-proxy.en.rst                  |   2 +-
 doc/admin/hierachical-caching.en.rst            |   2 +-
 doc/admin/http-proxy-caching.en.rst             |  26 +-
 doc/admin/security-options.en.rst               |   2 +-
 doc/admin/transparent-proxy.en.rst              |   7 +-
 doc/admin/transparent-proxy/bridge.en.rst       |   8 +-
 .../transparent-proxy/router-inline.en.rst      |   5 +-
 .../transparent-proxy/wccp-configuration.en.rst |   6 +-
 .../api/TSHttpOverridableConfig.en.rst          |  84 +++
 .../configuration/records.config.en.rst         |  41 +-
 doc/reference/plugins/authproxy.en.rst          |  91 +++
 doc/reference/plugins/conf_remap.en.rst         |  84 +--
 doc/reference/plugins/index.en.rst              |   1 +
 doc/sdk/continuations.en.rst                    |  12 +-
 doc/sdk/getting-started.en.rst                  |  41 +-
 doc/sdk/getting-started/a-simple-plugin.en.rst  |   2 +
 ...gin-registration-and-version-checking.en.rst |   4 +-
 .../blacklist-plugin.en.rst                     |  11 +-
 .../how-to-create-trafficserver-plugins.en.rst  |  45 +-
 .../roadmap-for-creating-plugins.en.rst         |  13 +-
 doc/sdk/http-headers/http-headers.en.rst        |   3 +
 doc/sdk/http-headers/marshal-buffers.en.rst     |   6 +-
 doc/sdk/new-protocol-plugins.en.rst             |   6 +-
 doc/sdk/preface.en.rst                          |   2 +-
 doc/sdk/preface/how-to-use-this-book.en.rst     |  54 +-
 doc/sdk/remap-plugin.en.rst                     |   6 +-
 doc/sdk/sample-source-code.en.rst               |   2 +-
 .../unable-to-load-plugins.en.rst               |   4 +-
 example/Makefile.am                             |   8 +-
 example/prefetch/prefetch-plugin-eg1.c          |  50 +-
 example/prefetch/test-hns-plugin.c              |  29 +-
 iocore/aio/AIO.cc                               |  13 +-
 iocore/aio/I_AIO.h                              |  32 +-
 iocore/aio/P_AIO.h                              |   2 +-
 iocore/aio/test_AIO.cc                          |  12 +-
 iocore/cache/Cache.cc                           |  16 +-
 iocore/cache/CacheDir.cc                        |   2 +-
 iocore/net/SSLConfig.cc                         |   2 +-
 iocore/net/SSLUtils.cc                          |   1 +
 lib/atscppapi/src/Headers.cc                    |   8 +-
 lib/atscppapi/src/HttpMethod.cc                 |   3 +-
 lib/atscppapi/src/Logger.cc                     |   2 +-
 lib/atscppapi/src/Transaction.cc                |  22 +
 .../src/include/atscppapi/HttpMethod.h          |   3 +-
 .../src/include/atscppapi/Transaction.h         |  34 +
 lib/atscppapi/src/include/atscppapi/utils.h     |   1 +
 lib/perl/lib/Apache/TS/AdminClient.pm           | 725 ------------------
 lib/perl/lib/Apache/TS/AdminClient.pm.in        | 728 +++++++++++++++++++
 lib/records/P_RecCore.cc                        |  81 ++-
 lib/records/P_RecCore.h                         |   1 +
 lib/records/P_RecFile.h                         |   3 +-
 lib/records/RecFile.cc                          |  13 +-
 lib/records/RecLocal.cc                         |  12 +-
 lib/records/RecMessage.cc                       |   1 +
 lib/records/RecProcess.cc                       |   6 +-
 mgmt/RecordsConfig.cc                           |  15 +-
 mgmt/Rollback.cc                                |  43 +-
 mgmt/Rollback.h                                 |   2 +-
 plugins/experimental/Makefile.am                |   1 +
 plugins/experimental/authproxy/README           |  56 --
 plugins/experimental/escalate/Makefile.am       |  22 +
 plugins/experimental/escalate/escalate.cc       | 166 +++++
 plugins/experimental/esi/Makefile.am            |   2 +-
 plugins/experimental/esi/README                 |   7 +-
 plugins/experimental/esi/lib/EsiParser.cc       |  52 +-
 plugins/experimental/esi/lib/EsiProcessor.cc    |  19 +-
 plugins/experimental/esi/lib/EsiProcessor.h     |   1 +
 plugins/experimental/esi/test/parser_test.cc    |   4 +-
 plugins/header_rewrite/operators.cc             |   4 +-
 proxy/InkAPI.cc                                 |  49 +-
 proxy/InkAPITest.cc                             |   6 +-
 proxy/Main.cc                                   |   2 +-
 proxy/Prefetch.cc                               |  45 +-
 proxy/Prefetch.h                                |  21 +-
 proxy/api/ts/InkAPIHughes.h                     | 138 ----
 proxy/api/ts/Makefile.am                        |   1 -
 proxy/api/ts/experimental.h                     | 136 +++-
 proxy/api/ts/ts.h.in                            |   8 +
 proxy/hdrs/HdrToken.cc                          |   3 +
 proxy/hdrs/MIME.cc                              |   6 +
 proxy/hdrs/MIME.h                               |   3 +
 proxy/hdrs/URL.cc                               |  23 +-
 proxy/http/HttpConfig.cc                        |   4 +
 proxy/http/HttpConfig.h                         |   5 +-
 proxy/http/HttpSM.cc                            |  17 +-
 proxy/http/HttpSM.h                             |  14 +-
 proxy/http/HttpTransact.cc                      |   8 +-
 proxy/http/HttpTransactHeaders.cc               |  19 +
 proxy/http/HttpTransactHeaders.h                |   1 +
 proxy/http/HttpTunnel.h                         |  10 +-
 proxy/logging/LogHost.cc                        |  26 +-
 proxy/logging/LogHost.h                         |  11 +-
 tools/jtest/README.zh.md                        | 409 +++++++++++
 103 files changed, 2643 insertions(+), 1426 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2dc04540/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index a5d6c3f,dbec535..4fe8ff6
--- a/CHANGES
+++ b/CHANGES
@@@ -1,10 -1,88 +1,92 @@@
                                                           -*- coding: utf-8 -*-
 +Changes with Apache Traffic Server 5.0.0
 +
 +  *) [TS-2088] Change TSRecordType enum values to powers of two
 +
  Changes with Apache Traffic Server 4.2.0
  
+   *) [TS-799] Have AdminClient.pm created from .in file.
+ 
+   *) [TS-2509] Add the const qualifier to pure HttpTunnel member functions.
+ 
+   *) [TS-2508] Add a *highly* experimental escalation plugin.
+ 
+   *) [TS-2507] Fix the state transition logging in 
HttpSM::handle_server_setup_error.
+ 
+   *) [TS-1648] Segmentation fault in dir_clear_range()
+ 
+   *) [TS-2500] Fix handling of cache stripe assignment when a disk is
+    taken offline.
+ 
+   *) [TS-2499] Fix the header_rewrite plugin expansions of the new %<>
+    strings. Author: Alexey Ivanov <[email protected]>.
+ 
+   *) [TS-2498] Add a build option to install the example plugins.
+ 
+   *) [TS-2484] Add API support for the two missing overridable APIs:
+          proxy.config.http.cache.max_open_read_retries
+          proxy.config.http.cache.open_read_retry_time
+ 
+   *) [TS-2497] Failed post results in tunnel buffers being returned to
+    freelist prematurely.
+    Reporter: Thomas Jackson <[email protected]>
+ 
+   *) [TS-1668] Added HSTS configuration options to ATS
+ 
+   *) [TS-2495] Reduce the size of HttpVCTableEntry.
+ 
+   *) [TS-2491] stop other esi plugin unit test programs after error.
+    Author: Yu Qing <[email protected]>
+  
+   *) [TS-1821] make the AIO test pass when build with native aio.
+ 
+   *) [TS-2412] fix the bug of restarting ATS causes complete cache data
+   loss when use linux-native-aio.
+ 
+   *) [TS-2488] enhance esi plugin to allow any of the space characters to
+    follow esi starting tags.
+    Author: Yu Qing <[email protected]>
+ 
+   *) [TS-2489] Fix esi plugin problem with contents in comments output 
+    twice when the node list is cached.
+    Author: Yu Qing <[email protected]>
+ 
+   *) [TS-2336] First attempt at moving the Prefetch APIs into some usable
+    state. There's still work to be done here, but separate bugs for that.
+ 
+   *) [TS-2487] Export PUSH HTTP method constants to the TS API.
+ 
+   *) [TS-2486] Eliminate SIMPLE_MEMCPY_INIT define.
+ 
+   *) [TS-2476] Fix size_t format string.
+    Author: Radim Kolar <[email protected]>
+ 
+   *) [TS-2471] Writing records.config can fail when the disk is full.
+    Author: Yu Qing <[email protected]>
+ 
+   *) [TS-2479] Don't output orphan log after failover sucessfully.
+ 
+   *) [TS-2370] SSL proxy.config.ssl.server.honor_cipher_order is backwards.
+   Changed the default setting and changed the meaning of it in the code.
+ 
+   *) [TS-2466] NOT increase the version of records.config when changing
+    the local parameter
+    Author: Yu Qing
+ 
+   *) [TS-2469] remove libreadline which is gpl licensed.
+    Author: Ben Aitchison <[email protected]>
+ 
+   *) [TS-2235] url_print should NOT output "?" for empty query string,
+    fix two remains.
+    Author: Yu Qing
+ 
+   *) [TS-2475] Adding new transaction methods in C++ API
+ 
+   *) [TS-2474] Change proxy.config.net.poll_timeout to 10ms consistently.
+ 
+   *) [TS-2473] Fix C++ API includes for FreeBSD.
+    Author: Radim Kolar <[email protected]>
+ 
    *) [TS-2467] traffic_shell doesn't work with tcl 8.6.
     Author: Ben Aitchison <[email protected]>
  

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2dc04540/proxy/api/ts/ts.h.in
----------------------------------------------------------------------

Reply via email to