trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: TS-2568 Better template messages
Date Tue, 11 Feb 2014 22:21:04 GMT
Updated Branches:
  refs/heads/3.2.x a09323cea -> 3c6232753


TS-2568 Better template messages

Conflicts:
	CHANGES
	proxy/config/body_factory/default/response#bad_version


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

Branch: refs/heads/3.2.x
Commit: 3c6232753b9683edb9051b7408d3930483fa723b
Parents: a09323c
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue Feb 11 14:33:45 2014 -0700
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue Feb 11 15:20:52 2014 -0700

----------------------------------------------------------------------
 CHANGES                                                     | 4 ++++
 proxy/config/body_factory/default/access#redirect_url       | 2 +-
 proxy/config/body_factory/default/connect#dns_failed        | 2 +-
 proxy/config/body_factory/default/connect#failed_connect    | 2 +-
 proxy/config/body_factory/default/connect#hangup            | 2 +-
 proxy/config/body_factory/default/default                   | 2 +-
 proxy/config/body_factory/default/request#no_content_length | 2 +-
 proxy/config/body_factory/default/request#syntax_error      | 2 +-
 proxy/config/body_factory/default/response#bad_response     | 2 +-
 proxy/config/body_factory/default/response#bad_version      | 2 +-
 proxy/config/body_factory/default/urlrouting#no_mapping     | 2 +-
 11 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 16408ed..09bcb77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.2.6
 
+  *) [TS-2568] Better template messages.
 
   *) [TS-2297] fix out of tree build for TSConfig
 
+
 Changes with Apache Traffic Server 3.2.5
 
   *) [TS-1923] Fix memory issue caused by resolve_logfield_string()
@@ -29,6 +31,7 @@ Changes with Apache Traffic Server 3.2.5
   *) [TS-1470] Fix cache sizes > 16TB (part 2 - Don't reset the cache after restart)
    Author: Jan Van Doorn <Jan_VanDoorn@cable.comcast.com>
 
+
 Changes with Apache Traffic Server 3.2.4
 
   *) [TS-1657] Traffic Cop doesn't wait() for its children
@@ -75,6 +78,7 @@ Changes with Apache Traffic Server 3.2.4
   *) [TS-1470] Fix cache sizes > 16TB
    Author: Jan Van Doorn <Jan_VanDoorn@cable.comcast.com>
 
+
 Changes with Apache Traffic Server 3.2.1
 
   *) [TS-1358] Don't link libreadline with all binaries and plugins.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/access#redirect_url
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/access#redirect_url b/proxy/config/body_factory/default/access#redirect_url
index 429fe93..d06b4bd 100644
--- a/proxy/config/body_factory/default/access#redirect_url
+++ b/proxy/config/body_factory/default/access#redirect_url
@@ -8,7 +8,7 @@
   <H1>Authentication Failed.</H1> 
   <HR> 
   <FONT FACE="Helvetica,Arial"> 
-  <B>Please wait while u r redirected to another page.</B> 
+  <B>Please wait while you are redirected to another page.</B> 
   If your browser fails to redirect, click on this <a href="%<{@redirect_url}cqh>">link</a>.
   </FONT> 
  </BODY>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/connect#dns_failed
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/connect#dns_failed b/proxy/config/body_factory/default/connect#dns_failed
index c2f3256..70d40bd 100644
--- a/proxy/config/body_factory/default/connect#dns_failed
+++ b/proxy/config/body_factory/default/connect#dns_failed
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Unable to locate the server named "<EM>%<shn></EM>" ---
+Description: Unable to locate the server requested ---
 the server does not have a DNS entry.  Perhaps there is a misspelling
 in the server name, or the server no longer exists.  Double-check the
 name and try again.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/connect#failed_connect
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/connect#failed_connect b/proxy/config/body_factory/default/connect#failed_connect
index e7cd3a9..aff210e 100644
--- a/proxy/config/body_factory/default/connect#failed_connect
+++ b/proxy/config/body_factory/default/connect#failed_connect
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Could not connect to the server "<EM>%<shn></EM>".
+Description: Could not connect to the requested server host.
 </B></FONT>
 <HR>
 </BODY>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/connect#hangup
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/connect#hangup b/proxy/config/body_factory/default/connect#hangup
index 06dde2a..d957853 100644
--- a/proxy/config/body_factory/default/connect#hangup
+++ b/proxy/config/body_factory/default/connect#hangup
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: The server "<EM>%<shn></EM>" closed the connection before
+Description: The server requested closed the connection before
 the transaction was completed.
 </B></FONT>
 <HR>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/default
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/default b/proxy/config/body_factory/default/default
index 0b5cd01..5dfce19 100644
--- a/proxy/config/body_factory/default/default
+++ b/proxy/config/body_factory/default/default
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Could not process this "%<cqhm>" request.
+Description: Could not process this request.
 </B></FONT>
 <HR>
 </BODY>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/request#no_content_length
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/request#no_content_length b/proxy/config/body_factory/default/request#no_content_length
index b4ae0af..4c2f47f 100644
--- a/proxy/config/body_factory/default/request#no_content_length
+++ b/proxy/config/body_factory/default/request#no_content_length
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Could not process this "%<cqhm>" request because
+Description: Could not process this request because
 there was no Content-Length specified.
 </B></FONT>
 <HR>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/request#syntax_error
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/request#syntax_error b/proxy/config/body_factory/default/request#syntax_error
index 4297fa9..bb3fbb2 100644
--- a/proxy/config/body_factory/default/request#syntax_error
+++ b/proxy/config/body_factory/default/request#syntax_error
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Could not process this "%<cqhm>" request. 
+Description: Could not process this request. 
 </B></FONT>
 <HR>
 </BODY>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/response#bad_response
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/response#bad_response b/proxy/config/body_factory/default/response#bad_response
index de8dbee..2c18543 100644
--- a/proxy/config/body_factory/default/response#bad_response
+++ b/proxy/config/body_factory/default/response#bad_response
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: The host "<EM>%<shn></EM>" did not return the document correctly.
+Description: The host requested  did not return the document correctly.
 </B></FONT>
 <HR>
 </BODY>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/response#bad_version
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/response#bad_version b/proxy/config/body_factory/default/response#bad_version
index 64c7e68..c21cb7c 100644
--- a/proxy/config/body_factory/default/response#bad_version
+++ b/proxy/config/body_factory/default/response#bad_version
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: The web server "<EM>%<shm></EM>" is using an unsupported
+Description: The web server requested is using an unsupported
 version of the HTTP protocol.
 </B></FONT>
 <HR>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c623275/proxy/config/body_factory/default/urlrouting#no_mapping
----------------------------------------------------------------------
diff --git a/proxy/config/body_factory/default/urlrouting#no_mapping b/proxy/config/body_factory/default/urlrouting#no_mapping
index 1405fe7..8f06990 100644
--- a/proxy/config/body_factory/default/urlrouting#no_mapping
+++ b/proxy/config/body_factory/default/urlrouting#no_mapping
@@ -8,7 +8,7 @@
 <HR>
 
 <FONT FACE="Helvetica,Arial"><B>
-Description: Your request on host "<EM>%<shn><EM>" was not found.
+Description: Your request on the specified host was not found.
 Check the location and try again.
 </B></FONT>
 <HR>


Mime
View raw message