You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2014/05/30 23:05:19 UTC

[47/50] [abbrv] git commit: TS-2783 Update documentation defaults, and fix RecordsConfig.cc

TS-2783 Update documentation defaults, and fix RecordsConfig.cc


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

Branch: refs/heads/5.0.x
Commit: 879bedcebeca8a354d2ee910183c8ed241c10f79
Parents: 3e81811
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri May 30 13:36:44 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri May 30 13:36:44 2014 -0600

----------------------------------------------------------------------
 CHANGES                                         |   2 +
 doc/admin/security-options.en.rst               |   1 -
 .../ja/LC_MESSAGES/admin/security-options.en.po |   4 -
 .../configuration/records.config.en.rst         | 130 +++++++++----------
 lib/perl/lib/Apache/TS/AdminClient.pm           |   1 -
 mgmt/RecordsConfig.cc                           |   8 +-
 proxy/config/records.config.default.in          |   1 +
 7 files changed, 68 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index cfca250..3b25d18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2783] Update documentation defaults, and fix RecordsConfig.cc.
+
   *) [TS-1981] Url remap method filtering is broken with invalid method.
    Author: Thach Tran <tr...@gmail.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/doc/admin/security-options.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/security-options.en.rst b/doc/admin/security-options.en.rst
index d9534ec..3806d4f 100644
--- a/doc/admin/security-options.en.rst
+++ b/doc/admin/security-options.en.rst
@@ -213,7 +213,6 @@ In order to accomplish this, we:
 1. Edit the following variables in the :ref:`records-config-ssl-termination` section of
    :file:`records.config`:
 
-   -  :ts:cv:`proxy.config.ssl.auth.enabled`
    -  :ts:cv:`proxy.config.http.server_ports`
    -  :ts:cv:`proxy.config.ssl.client.verify.server`
    -  :ts:cv:`proxy.config.ssl.client.cert.filename`

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
index 1ba236e..a099dfc 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
@@ -456,10 +456,6 @@ msgstr ""
 ":file:`records.config`: の :ref:`records-config-ssl-termination` の章にある"
 "次の変数を編集してください。"
 
-#: ../../admin/security-options.en.rst:216
-msgid ":ts:cv:`proxy.config.ssl.auth.enabled`"
-msgstr ":ts:cv:`proxy.config.ssl.auth.enabled`"
-
 #: ../../admin/security-options.en.rst:218
 msgid ":ts:cv:`proxy.config.ssl.client.verify.server`"
 msgstr ":ts:cv:`proxy.config.ssl.client.verify.server`"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 21a1407..4c6526c 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -185,13 +185,13 @@ System Variables
 
 A value of ``0`` means no signal will be sent.
 
-.. ts:cv:: CONFIG proxy.config.cop.linux_min_memfree_kb INT 10240
+.. ts:cv:: CONFIG proxy.config.cop.linux_min_memfree_kb INT 0
 
    The minimum amount of free memory space allowed before Traffic Server stops
    the :program:`traffic_server` and :program:`traffic_manager` processes to 
    prevent the system from hanging.
 
-.. ts:cv:: CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
+.. ts:cv:: CONFIG proxy.config.cop.linux_min_swapfree_kb INT 0
 
    The minimum amount of free swap space allowed before Traffic Server stops
    the :program:`traffic_server` and :program:`traffic_manager` processes to 
@@ -223,11 +223,11 @@ A value of ``0`` means no signal will be sent.
 
    *XXX* What does this do?
 
-.. ts:cv:: CONFIG proxy.config.accept_threads INT 0
+.. ts:cv:: CONFIG proxy.config.accept_threads INT 1
 
    When enabled (``1``), runs a separate thread for accept processing. If disabled (``0``), then only 1 thread can be created.
 
-.. ts:cv:: CONFIG proxy.config.thread.default.stacksize  INT 1096908
+.. ts:cv:: CONFIG proxy.config.thread.default.stacksize  INT 1048576
 
    The new default thread stack size, for all threads. The original default is set at 1 MB.
 
@@ -256,7 +256,7 @@ Value Effect
 Network
 =======
 
-.. ts:cv:: CONFIG proxy.config.net.connections_throttle INT 10000
+.. ts:cv:: CONFIG proxy.config.net.connections_throttle INT 30000
 
    The total number of client and origin server connections that the server
    can handle simultaneously. This is in fact the max number of file
@@ -626,7 +626,7 @@ Value Effect
    The Server: string that ATS will insert in a response header (if requested, see above). Note that the current version number is
    always appended to this string.
 
-.. ts:cv:: CONFIG proxy.config.http.enable_url_expandomatic INT 1
+.. ts:cv:: CONFIG proxy.config.http.enable_url_expandomatic INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) ``.com`` domain expansion. This configures the Traffic Server to resolve unqualified hostnames by
@@ -652,10 +652,12 @@ Value Effect
        Server can use ``keep-alive`` connections without pipelining to
        origin servers.
 
-.. ts:cv:: CONFIG proxy.config.http.share_server_sessions INT 1
+.. ts:cv:: CONFIG proxy.config.http.share_server_sessions INT 2
    :deprecated:
 
-   Enables (``1``) or disables (``0``) the reuse of server sessions.
+   Enables (``1``) or disables (``0``) the reuse of server sessions. The
+   default (``2``) is similar to enabled, except it creates a server session
+   pool per network thread. This has the best performance characteristics.
 
 .. ts:cv:: CONFIG proxy.config.http.server_session_sharing.match STRING both
 
@@ -744,11 +746,11 @@ suffice. It is possible to do this crudely with this flag by
 enabling it and then use identity URL mappings to re-disable it for
 specific domains.
 
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_enabled_in  INT 0
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_enabled_in  INT 1
 
    Enables (``1``) or disables (``0``) incoming keep-alive connections.
 
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_enabled_out  INT 0
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_enabled_out  INT 1
 
    Enables (``1``) or disables (``0``) outgoing keep-alive connections.
 
@@ -757,7 +759,7 @@ specific domains.
         requests when nearing the connection limit, that is controlled by
         :ts:cv:`proxy.config.http.server_max_connections`.
 
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_post_out  INT 0
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_post_out  INT 1
 
    Controls wether new POST requests re-use keep-alive sessions (``1``) or
    create new connections per request (``0``).
@@ -813,22 +815,22 @@ Parent Proxy Configuration
 HTTP Connection Timeouts
 ========================
 
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 10
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 115
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to clients open for a subsequent request after a transaction ends.
 
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 10
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 120
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to origin servers open for a subsequent transfer of data after a transaction ends.
 
-.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 120
+.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 30
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to clients open if a transaction stalls.
 
-.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 120
+.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 30
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to origin servers open if the transaction stalls.
@@ -854,12 +856,12 @@ The default value of ``0`` specifies that there is no timeout.
 
    The timeout interval in seconds before Traffic Server closes a connection that has no activity.
 
-.. ts:cv:: CONFIG proxy.config.http.background_fill_active_timeout INT 60
+.. ts:cv:: CONFIG proxy.config.http.background_fill_active_timeout INT 0
    :reloadable:
 
    Specifies how long Traffic Server continues a background fill before giving up and dropping the origin server connection.
 
-.. ts:cv:: CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.50000
+.. ts:cv:: CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.0
    :reloadable:
 
    The proportion of total document size already transferred when a client aborts at which the proxy continues fetching the document
@@ -873,7 +875,7 @@ Origin Server Connect Attempts
 
    The maximum number of connection retries Traffic Server can make when the origin server is not responding.
 
-.. ts:cv:: CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 2
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 3
    :reloadable:
 
    The maximum number of connection retries Traffic Server can make when the origin server is unavailable.
@@ -901,7 +903,7 @@ Origin Server Connect Attempts
    needed to set up a new connection from
    the next request at the expense of added (inactive) connections. To enable, set to one (``1``).
 
-.. ts:cv:: CONFIG proxy.config.http.connect_attempts_rr_retries INT 2
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_rr_retries INT 3
    :reloadable:
 
    The maximum number of failed connection attempts allowed before a round-robin entry is marked as 'down' if a server
@@ -918,7 +920,7 @@ Origin Server Connect Attempts
    The timeout value (in seconds) for an origin server connection when the client request is a ``POST`` or ``PUT``
    request.
 
-.. ts:cv:: CONFIG proxy.config.http.down_server.cache_time INT 900
+.. ts:cv:: CONFIG proxy.config.http.down_server.cache_time INT 300
    :reloadable:
 
    Specifies how long (in seconds) Traffic Server remembers that an origin server was unreachable.
@@ -946,13 +948,13 @@ Congestion Control
 
    Transaction buffering / flow control is enabled if this is set to a non-zero value. Otherwise no flow control is done.
 
-.. ts:cv:: CONFIG proxy.config.http.flow_control.high_water INT 65536
+.. ts:cv:: CONFIG proxy.config.http.flow_control.high_water INT 0
    :metric: bytes
 
    The high water mark for transaction buffer control. External source I/O is halted when the total buffer space in use
    by the transaction exceeds this value.
 
-.. ts:cv:: CONFIG proxy.config.http.flow_control.low_water INT 65536
+.. ts:cv:: CONFIG proxy.config.http.flow_control.low_water INT 0
    :metric: bytes
 
    The low water mark for transaction buffer control. External source I/O is resumed when the total buffer space in use
@@ -1028,21 +1030,17 @@ Proxy User Variables
 
    When enabled (``1``), Traffic Server inserts ``Client-IP`` headers to retain the client IP address.
 
-.. ts:cv:: CONFIG proxy.config.http.append_xforwards_header INT 0
-
-   When enabled (``1``), Traffic Server appends ``X-Forwards`` headers to outgoing requests.
-
 .. ts:cv:: CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
    :reloadable:
 
    Comma separated list of headers Traffic Server should remove from outgoing requests.
 
-.. ts:cv:: CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 0
+.. ts:cv:: CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server adds the client IP address to the ``X-Forwarded-For`` header.
 
-.. ts:cv:: CONFIG proxy.config.http.normalize_ae_gzip INT 0
+.. ts:cv:: CONFIG proxy.config.http.normalize_ae_gzip INT 1
    :reloadable:
 
    Enable (``1``) to normalize all ``Accept-Encoding:`` headers to one of the following:
@@ -1072,13 +1070,13 @@ Security
 Cache Control
 =============
 
-.. ts:cv:: CONFIG proxy.config.cache.enable_read_while_writer INT 0
+.. ts:cv:: CONFIG proxy.config.cache.enable_read_while_writer INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) ability to a read cached object while the another connection is completing the write to cache for
    the same object. Several other configuration values need to be set for this to become active. See :ref:`reducing-origin-server-requests-avoiding-the-thundering-herd`
 
-.. ts:cv:: CONFIG proxy.config.cache.force_sector_size INT 512
+.. ts:cv:: CONFIG proxy.config.cache.force_sector_size INT 0
    :reloadable:
 
    Forces the use of a specific hardware sector size (512 - 8192 bytes).
@@ -1096,12 +1094,12 @@ Cache Control
    with a ``Location`` header but no document body. This only works if the
    origin response also has a ``Content-Length`` header.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_no_cache INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_no_cache INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores client requests to bypass the cache.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server issues a conditional request to the origin server if an incoming request has a ``No-Cache`` header.
@@ -1111,7 +1109,7 @@ Cache Control
 
    When enabled (``1``), Traffic Server ignores origin server requests to bypass the cache.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 3
+.. ts:cv:: CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 1
    :reloadable:
 
    Specifies how cookies are cached:
@@ -1154,10 +1152,7 @@ Cache Control
    Traffic Server always revalidates the cached content and uses the
    client's ``If-Modified-Since`` header for the proxy request.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.when_to_add_no_cache_to_msie_requests INT 0
-   :deprecated:
-
-.. ts:cv:: CONFIG proxy.config.http.cache.required_headers INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.required_headers INT 2
    :reloadable:
 
    The type of headers required in a request for the request to be cacheable.
@@ -1250,7 +1245,7 @@ Cache Control
       you can also enable this configuration with a ``1``.
 
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores any ``Cache-Control:
@@ -1261,7 +1256,7 @@ Cache Control
 
    Specifies the maximum object size that will be cached. ``0`` is unlimited.
 
-.. ts:cv:: CONFIG proxy.config.cache.permit.pinning INT 0
+.. ts:cv:: CONFIG proxy.config.cache.permit.pinning INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server will keep certain HTTP objects in the cache for a certain time as specified in cache.config.
@@ -1357,7 +1352,7 @@ Heuristic Expiration
    The maximum amount of time an HTTP object without an expiration date can remain fresh in the cache before is
    considered to be stale.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10000
+.. ts:cv:: CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10
    :reloadable:
 
    The aging factor for freshness computations. Traffic Server stores an object for this percentage of the time that
@@ -1369,7 +1364,7 @@ Heuristic Expiration
    How often Traffic Server checks for an early refresh, during the period before the document stale time. The interval
    specified must be in seconds. See :ref:`fuzzy-revalidation`
 
-.. ts:cv:: CONFIG proxy.config.http.cache.fuzz.probability FLOAT 0.00500
+.. ts:cv:: CONFIG proxy.config.http.cache.fuzz.probability FLOAT 0.005
    :reloadable:
 
    The probability that a refresh is made on a document during the specified fuzz time.
@@ -1411,7 +1406,7 @@ Customizable User Response Pages
    -  ``1`` = enable customizable user response pages in the default directory only
    -  ``2`` = enable language-targeted user response pages
 
-.. ts:cv:: CONFIG proxy.config.body_factory.enable_logging INT 1
+.. ts:cv:: CONFIG proxy.config.body_factory.enable_logging INT 0
 
    Enables (``1``) or disables (``0``) logging for customizable response pages. When enabled, Traffic Server records a message in
    the error log each time a customized response page is used or modified.
@@ -1437,7 +1432,7 @@ Customizable User Response Pages
 DNS
 ===
 
-.. ts:cv:: CONFIG proxy.config.dns.search_default_domains INT 1
+.. ts:cv:: CONFIG proxy.config.dns.search_default_domains INT 0
    :Reloadable:
 
    Enables (``1``) or disables (``0``) local domain expansion.
@@ -1472,7 +1467,7 @@ hostname to ``host_x.y.com``.
    standard ``resolv.conf`` file, this option allows an administrator to manage the set of resolvers in an external configuration file,
    without affecting how the rest of the operating system uses DNS.
 
-.. ts:cv:: CONFIG proxy.config.dns.round_robin_nameservers INT 0
+.. ts:cv:: CONFIG proxy.config.dns.round_robin_nameservers INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) DNS server round-robin.
@@ -1520,7 +1515,7 @@ HostDB
    The value of this variable must be increased if you increase the size of the
    `proxy.config.hostdb.size`_ variable.
 
-.. ts:cv:: CONFIG proxy.config.hostdb.size INT 200000
+.. ts:cv:: CONFIG proxy.config.hostdb.size INT 120000
 
    The maximum number of entries that can be stored in the database.
 
@@ -1572,7 +1567,7 @@ uses the same origin server for the same client, for as long as the origin serve
 set to :arg:`N` the IP address is rotated if more than :arg:`N` seconds have past since the first time the
 current address was used.
 
-.. ts:cv:: CONFIG proxy.config.hostdb.ip_resolve STRING ipv4;ipv6
+.. ts:cv:: CONFIG proxy.config.hostdb.ip_resolve STRING NULL
 
    Set the host resolution style.
 
@@ -1649,7 +1644,7 @@ Logging Configuration
 
    The maximum amount of time before data in the buffer is flushed to disk.
 
-.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_logs INT 2500
+.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_logs INT 25000
    :metric: megabytes
    :reloadable:
 
@@ -1675,7 +1670,7 @@ Logging Configuration
    in the logging directory contribute to the space used, even if they are not log files. you may need to consider this
    when you enable full remote logging, and bump to the same size as proxy.config.log.max_space_mb_for_logs.
 
-.. ts:cv:: CONFIG proxy.config.log.max_space_mb_headroom INT 10
+.. ts:cv:: CONFIG proxy.config.log.max_space_mb_headroom INT 1000
    :metric: megabytes
    :reloadable:
 
@@ -1708,7 +1703,7 @@ Logging Configuration
    write permission for others, even if specified in the configuration file. Permissions for existing log files are not changed when the
    configuration is changed.
 
-.. ts:cv:: CONFIG proxy.config.log.custom_logs_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.log.custom_logs_enabled INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) custom logging.
@@ -1716,9 +1711,10 @@ Logging Configuration
 .. ts:cv:: CONFIG proxy.config.log.squid_log_enabled INT 1
    :reloadable:
 
-   Enables (``1``) or disables (``0``) the `squid log file format <../working-log-files/log-formats#SquidFormat>`_.
+   Enables (``1``) or disables (``0``) the `squid log file format
+   <../working-log-files/log-formats#SquidFormat>`_. 
 
-.. ts:cv:: CONFIG proxy.config.log.squid_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.config.log.squid_log_is_ascii INT 0
    :reloadable:
 
    The squid log file type:
@@ -1761,9 +1757,10 @@ Logging Configuration
 .. ts:cv:: CONFIG proxy.config.log.extended_log_enabled INT 0
    :reloadable:
 
-   Enables (``1``) or disables (``0``) the `Netscape extended log file format <../working-log-files/log-formats#NetscapeFormats>`_.
+   Enables (``1``) or disables (``0``) the `Netscape extended log file format
+   <../working-log-files/log-formats#NetscapeFormats>`_. 
 
-.. ts:cv:: CONFIG proxy.confg.log.extended_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.config.log.extended_log_is_ascii INT 1
 
    The `Netscape extended log <../working-log-files/log-formats#NetscapeFormats>`_ file type:
 
@@ -1779,14 +1776,11 @@ Logging Configuration
 
    The `Netscape extended log <../working-log-files/log-formats#NetscapeFormats>`_ file header text.
 
-.. ts:cv:: CONFIG proxy.config.log.extended_log_is_ascii INT 0
-
-   Set whether the extend log is written as ASCII (text) or binary.
-
 .. ts:cv:: CONFIG proxy.config.log.extended2_log_enabled INT 0
    :reloadable:
 
-   Enables (``1``) or disables (``0``) the `Netscape Extended-2 log file format <../working-log-files/log-formats#NetscapeFormats>`_.
+   Enables (``1``) or disables (``0``) the `Netscape Extended-2 log file
+   format <../working-log-files/log-formats#NetscapeFormats>`_. 
 
 .. ts:cv:: CONFIG proxy.config.log.extended2_log_is_ascii INT 1
    :reloadable:
@@ -1946,7 +1940,7 @@ Diagnostic Logging Configuration
 
         CONFIG proxy.config.diags.output.debug STRING SL
 
-.. ts:cv:: CONFIG proxy.config.diags.show_location INT 0
+.. ts:cv:: CONFIG proxy.config.diags.show_location INT 1
 
    Annotates diagnostic messages with the source code location.
 
@@ -1954,7 +1948,7 @@ Diagnostic Logging Configuration
 
    Enables logging for diagnostic messages whose log level is `diag` or `debug`.
 
-.. ts:cv:: CONFIG proxy.config.diags.debug.tags STRING NULL
+.. ts:cv:: CONFIG proxy.config.diags.debug.tags STRING http.*|dns.*
 
    Each Traffic Server `diag` and `debug` level message is annotated
    with a subsytem tag. This configuration contains a regular
@@ -1997,8 +1991,10 @@ URL Remap Rules
 .. ts:cv:: CONFIG proxy.config.url_remap.default_to_server_pac INT 0
    :reloadable:
 
-   Enables (``1``) or disables (``0``) requests for a PAC file on the proxy service port (8080 by default) to be redirected to the PAC
-   port. For this type of redirection to work, the variable `proxy.config.reverse_proxy.enabled`_ must be set to ``1``.
+   Enables (``1``) or disables (``0``) requests for a PAC file on the proxy
+   service port (8080 by default) to be redirected to the PAC 
+   port. For this type of redirection to work, the variable
+   `proxy.config.reverse_proxy.enabled`_ must be set to ``1``. 
 
 .. ts:cv:: CONFIG proxy.config.url_remap.default_to_server_pac_port INT -1
    :reloadable:
@@ -2023,7 +2019,7 @@ URL Remap Rules
    :file:`remap.config` file. If a request does not match, then the browser
    will receive an error.
 
-.. ts:cv:: CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
+.. ts:cv:: CONFIG proxy.config.url_remap.pristine_host_hdr INT 0
    :reloadable:
 
    Set this variable to ``1`` if you want to retain the client host
@@ -2120,10 +2116,6 @@ SSL Termination
    The filename of the certificate authority that client certificates
    will be verified against.
 
-.. ts:cv:: CONFIG proxy.config.ssl.auth.enabled INT 0
-
-   TBD
-
 .. ts:cv:: CONFIG proxy.config.ssl.max_record_size INT 0
 
   This configuration specifies the maximum number of bytes to write
@@ -2332,7 +2324,7 @@ Sockets
 
    Sets the receive buffer size for connections from the client to Traffic Server.
 
-.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_in INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_in INT 0x0
 
    Turns different options "on" for the socket handling client connections:::
 
@@ -2354,7 +2346,7 @@ Sockets
    Sets the receive buffer size for connections from Traffic Server to
    the origin server.
 
-.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_out INT 1
+.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_out INT 0x1
 
    Turns different options "on" for the origin server socket:::
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index 4c72786..84cd954 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -470,7 +470,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
  proxy.config.http.cache.vary_default_images
  proxy.config.http.cache.vary_default_other
  proxy.config.http.cache.vary_default_text
- proxy.config.http.cache.when_to_add_no_cache_to_msie_requests
  proxy.config.http.cache.when_to_revalidate
  proxy.config.http.chunking_enabled
  proxy.config.http.congestion_control.default.client_wait_interval

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 8f80480..32d5062 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -178,7 +178,7 @@ RecordElement RecordsConfig[] = {
   //##############################################################################
   {RECT_CONFIG, "proxy.config.diags.debug.enabled", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.diags.debug.tags", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+  {RECT_CONFIG, "proxy.config.diags.debug.tags", RECD_STRING, "http.*|dns.*", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.diags.action.enabled", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
@@ -368,7 +368,7 @@ RecordElement RecordsConfig[] = {
   //       #
   {RECT_CONFIG, "proxy.config.http.enabled", RECD_INT, "1", RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.server_ports", RECD_STRING, NULL, RECU_RESTART_TM, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.server_ports", RECD_STRING, "8080", RECU_RESTART_TM, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.http.server_port", RECD_INT, "-1", RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-65535]", RECA_NULL}
   ,
@@ -780,7 +780,7 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.net.sock_recv_buffer_size_in", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.net.sock_send_buffer_size_in", RECD_INT, "0x0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+  {RECT_CONFIG, "proxy.config.net.sock_send_buffer_size_in", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.net.sock_option_flag_in", RECD_INT, "0x0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
@@ -1087,7 +1087,7 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.log.max_secs_per_buffer", RECD_INT, "5", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.log.max_space_mb_for_logs", RECD_INT, "2500", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.log.max_space_mb_for_logs", RECD_INT, "25000", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.log.max_space_mb_for_orphan_logs", RECD_INT, "25", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
   ,

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/879bedce/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index 9120089..8299b86 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -158,6 +158,7 @@ CONFIG proxy.config.url_remap.pristine_host_hdr INT 0
 ##############################################################################
 CONFIG proxy.config.ssl.client.verify.server INT 0
 CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
+CONFIG proxy.config.ssl.server.cipher_suite STRING ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RC4-SHA:RC4-MD5:AES128-SHA:AES256-SHA:DES-CBC3-SHA!SRP:!DSS:!PSK:!aNULL:!eNULL:!SSLv2
 
 ##############################################################################
 # ICP Configuration. Docs: