Author: zwoop
Date: Mon Aug 23 15:08:50 2010
New Revision: 988143
URL: http://svn.apache.org/viewvc?rev=988143&view=rev
Log:
TS-344: Backport of TS-322 to 2.0.x branch
Author: Marcus Ruckert
Review: leif
Modified:
trafficserver/traffic/branches/2.0.x/CHANGES
trafficserver/traffic/branches/2.0.x/STATUS
trafficserver/traffic/branches/2.0.x/libinktomi++/ParseRules.h
trafficserver/traffic/branches/2.0.x/libinktomi++/ink_base64.cc
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/web2/WebUtils.cc
Modified: trafficserver/traffic/branches/2.0.x/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/CHANGES?rev=988143&r1=988142&r2=988143&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/2.0.x/CHANGES Mon Aug 23 15:08:50 2010
@@ -2,7 +2,8 @@
Changes with Apache Traffic Server 2.0.1
- *) Improvements to build system (TS-336) and portability (TS-334).
+ *) Backport part of TS-322 that deals with indexing arrays with char
+ (author: Marcus Ruckert) [TS-334].
Changes with Apache Traffic Server 2.0.0
Modified: trafficserver/traffic/branches/2.0.x/STATUS
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/STATUS?rev=988143&r1=988142&r2=988143&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/STATUS (original)
+++ trafficserver/traffic/branches/2.0.x/STATUS Mon Aug 23 15:08:50 2010
@@ -98,6 +98,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
Jira: http://issues.apache.org/jira/browse/TS-319
+1: bcall, zwoop, sjiang
+ * cleanup: Backport part of TS-322 that deals with indexing arrays with char.
+ Patch: Attached to ticket TS-334
+ Jira: https://issues.apache.org/jira/browse/TS-334
+ +1: bcall, zwoop, georgep
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -111,11 +116,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-162
+1: bcall, zwoop
- * cleanup: Backport part of TS-322 that deals with indexing arrays with char.
- Patch: Attached to ticket TS-334
- Jira: https://issues.apache.org/jira/browse/TS-334
- +1: bcall, zwoop, georgep
-
* build: Problems with make install DESTDIR=...
Trunk patch: http://svn.apache.org/viewvc?rev=941910&view=rev
Trunk Patch: http://svn.apache.org/viewvc?rev=942639&view=rev
Modified: trafficserver/traffic/branches/2.0.x/libinktomi++/ParseRules.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/libinktomi%2B%2B/ParseRules.h?rev=988143&r1=988142&r2=988143&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/libinktomi++/ParseRules.h (original)
+++ trafficserver/traffic/branches/2.0.x/libinktomi++/ParseRules.h Mon Aug 23
15:08:50 2010
@@ -490,7 +490,7 @@ ParseRules::is_pchar(const char *seq)
{
#ifndef COMPILE_PARSE_RULES
if (*seq != '%')
- return (parseRulesCType[*seq] & is_pchar_BIT);
+ return (parseRulesCType[(inku8)*seq] & is_pchar_BIT);
else
return is_hex(seq[1]) && is_hex(seq[2]);
#else
Modified: trafficserver/traffic/branches/2.0.x/libinktomi++/ink_base64.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/libinktomi%2B%2B/ink_base64.cc?rev=988143&r1=988142&r2=988143&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/libinktomi++/ink_base64.cc (original)
+++ trafficserver/traffic/branches/2.0.x/libinktomi++/ink_base64.cc Mon Aug 23
15:08:50 2010
@@ -223,7 +223,7 @@ ink_base64_decode(const char *inBuffer,
int inputBytesDecoded = 0;
// Figure out much encoded string is really there
- while (printableToSixBit[inBuffer[inBytes]] <= MAX_PRINT_VAL) {
+ while (printableToSixBit[(inku8)inBuffer[inBytes]] <= MAX_PRINT_VAL) {
inBytes++;
}
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/web2/WebUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/web2/WebUtils.cc?rev=988143&r1=988142&r2=988143&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/web2/WebUtils.cc (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/web2/WebUtils.cc Mon Aug
23 15:08:50 2010
@@ -83,7 +83,7 @@ UU_decode(const char *inBuffer, int outB
int inputBytesDecoded = 0;
// Figure out much encoded string is really there
- while (printableToSixBit[inBuffer[inBytes]] <= MAX_PRINT_VAL) {
+ while (printableToSixBit[(inku8)inBuffer[inBytes]] <= MAX_PRINT_VAL) {
inBytes++;
}
