View File | Revision Log | Show Annotations | Download File | View Changeset
/hippo/hippo-cms6/hippo-cocoon/trunk/patches/org.mortbay.jetty-5.1.15-h1.patch
Revision: 32318
Committed: Wed Jan 4 13:43:47 2012 UTC (8 years, 2 months ago) by jjoachimsthal
File size: 1900 byte(s)
Log Message:
HIPCO-86 check in Jetty 5.1.15 POST parameter encoding patch

File Contents

# Content
1 Index: src/org/mortbay/util/StringUtil.java
2 ===================================================================
3 RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/util/StringUtil.java,v
4 retrieving revision 1.17
5 diff -u -r1.17 StringUtil.java
6 --- src/org/mortbay/util/StringUtil.java 3 Jul 2008 23:07:21 -0000 1.17
7 +++ src/org/mortbay/util/StringUtil.java 3 Jan 2012 13:30:10 -0000
8 @@ -304,7 +304,7 @@
9 case '\r':
10 {
11 buf=new StringBuffer(s.length());
12 - buf.append(s,0,i);
13 + buf.append(s.toCharArray(),0,i);
14 buf.append('.');
15 break loop;
16 }
17 Index: src/org/mortbay/http/HttpRequest.java
18 ===================================================================
19 RCS file: /cvsroot/jetty/Jetty/src/org/mortbay/http/HttpRequest.java,v
20 retrieving revision 1.91
21 diff -u -r1.91 HttpRequest.java
22 --- src/org/mortbay/http/HttpRequest.java 23 Nov 2006 08:56:52 -0000 1.91
23 +++ src/org/mortbay/http/HttpRequest.java 3 Jan 2012 13:30:10 -0000
24 @@ -840,6 +840,8 @@
25 String encoding = getCharacterEncoding();
26 if (encoding == null)
27 {
28 + // No encoding, so use the existing characters.
29 + encoding = StringUtil.__UTF_8;
30 _uri.putParametersTo(_parameters);
31 }
32 else
33 Index: ant.properties
34 ===================================================================
35 RCS file: /cvsroot/jetty/Jetty/ant.properties,v
36 retrieving revision 3.63
37 diff -u -r3.63 ant.properties
38 --- ant.properties 18 May 2009 03:47:54 -0000 3.63
39 +++ ant.properties 3 Jan 2012 13:30:10 -0000
40 @@ -1,7 +1,7 @@
41
42 VERSION.MAJOR=5
43 VERSION.MINOR=1
44 -VERSION.BUILD=15
45 +VERSION.BUILD=15-h1
46 RELEASE.MAJOR=${VERSION.MAJOR}.${VERSION.MINOR}
47 RELEASE.MAJOR.MINOR=${VERSION.MAJOR}.${VERSION.MINOR}.${VERSION.BUILD}