Author: violetagg
Date: Fri Oct 28 08:40:05 2016
New Revision: 1766968
URL: http://svn.apache.org/viewvc?rev=1766968&view=rev
Log:
Use ByteBuffer instead of byte array. Use the new method for reading the data -
SocketWrapperBase.read(boolean, ByteBuffer).
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 08:40:05 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,176228
8,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,176220
2,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1766968&r1=1766967&r2=1766968&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
Fri Oct 28 08:40:05 2016
@@ -28,6 +28,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.ApplicationBufferHandler;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -35,7 +36,7 @@ import org.apache.tomcat.util.res.String
* InputBuffer for HTTP that provides request header parsing as well as
transfer
* encoding.
*/
-public class Http11InputBuffer implements InputBuffer {
+public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler {
// -------------------------------------------------------------- Constants
@@ -127,19 +128,7 @@ public class Http11InputBuffer implement
/**
* The read buffer.
*/
- private byte[] buf;
-
-
- /**
- * Last valid byte.
- */
- private int lastValid;
-
-
- /**
- * Position in the buffer.
- */
- private int pos;
+ private ByteBuffer byteBuffer;
/**
@@ -318,8 +307,7 @@ public class Http11InputBuffer implement
activeFilters[i].recycle();
}
- lastValid = 0;
- pos = 0;
+ byteBuffer.limit(0).position(0);
lastActiveFilter = -1;
parsingHeader = true;
swallowInput = true;
@@ -344,12 +332,11 @@ public class Http11InputBuffer implement
request.recycle();
// Copy leftover bytes to the beginning of the buffer
- if (lastValid - pos > 0 && pos > 0) {
- System.arraycopy(buf, pos, buf, 0, lastValid - pos);
+ if (byteBuffer.remaining() > 0 && byteBuffer.position() > 0) {
+ byteBuffer.compact();
}
// Always reset pos to zero
- lastValid = lastValid - pos;
- pos = 0;
+ byteBuffer.limit(byteBuffer.limit() -
byteBuffer.position()).position(0);
// Recycle filters
for (int i = 0; i <= lastActiveFilter; i++) {
@@ -396,7 +383,7 @@ public class Http11InputBuffer implement
do {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (keptAlive) {
// Haven't read any request data yet so use the
keep-alive
// timeout.
@@ -411,10 +398,10 @@ public class Http11InputBuffer implement
// Switch to the socket timeout.
wrapper.setReadTimeout(wrapper.getEndpoint().getSoTimeout());
}
- if (!keptAlive && pos == 0 && lastValid >=
CLIENT_PREFACE_START.length - 1) {
+ if (!keptAlive && byteBuffer.position() == 0 &&
byteBuffer.limit() >= CLIENT_PREFACE_START.length - 1) {
boolean prefaceMatch = true;
for (int i = 0; i < CLIENT_PREFACE_START.length &&
prefaceMatch; i++) {
- if (CLIENT_PREFACE_START[i] != buf[i]) {
+ if (CLIENT_PREFACE_START[i] != byteBuffer.get(i)) {
prefaceMatch = false;
}
}
@@ -429,15 +416,15 @@ public class Http11InputBuffer implement
if (request.getStartTime() < 0) {
request.setStartTime(System.currentTimeMillis());
}
- chr = buf[pos++];
+ chr = byteBuffer.get();
} while ((chr == Constants.CR) || (chr == Constants.LF));
- pos--;
+ byteBuffer.position(byteBuffer.position() - 1);
- parsingRequestLineStart = pos;
+ parsingRequestLineStart = byteBuffer.position();
parsingRequestLinePhase = 2;
if (log.isDebugEnabled()) {
log.debug("Received ["
- + new String(buf, pos, lastValid - pos,
StandardCharsets.ISO_8859_1) + "]");
+ + new String(byteBuffer.array(),
byteBuffer.position(), byteBuffer.remaining(), StandardCharsets.ISO_8859_1) +
"]");
}
}
if (parsingRequestLinePhase == 2) {
@@ -448,20 +435,22 @@ public class Http11InputBuffer implement
boolean space = false;
while (!space) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) // request line parsing
return false;
}
// Spec says method name is a token followed by a single SP but
// also be tolerant of multiple SP and/or HT.
- if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
+ int pos = byteBuffer.position();
+ byte chr = byteBuffer.get();
+ if (chr == Constants.SP || chr == Constants.HT) {
space = true;
- request.method().setBytes(buf, parsingRequestLineStart,
+ request.method().setBytes(byteBuffer.array(),
parsingRequestLineStart,
pos - parsingRequestLineStart);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HTTP_TOKEN_CHAR[chr]) {
+ byteBuffer.position(byteBuffer.position() - 1);
throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
}
- pos++;
}
parsingRequestLinePhase = 3;
}
@@ -470,17 +459,17 @@ public class Http11InputBuffer implement
boolean space = true;
while (space) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) // request line parsing
return false;
}
- if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
- pos++;
- } else {
+ byte chr = byteBuffer.get();
+ if (!(chr == Constants.SP || chr == Constants.HT)) {
space = false;
+ byteBuffer.position(byteBuffer.position() - 1);
}
}
- parsingRequestLineStart = pos;
+ parsingRequestLineStart = byteBuffer.position();
parsingRequestLinePhase = 4;
}
if (parsingRequestLinePhase == 4) {
@@ -493,30 +482,31 @@ public class Http11InputBuffer implement
boolean space = false;
while (!space) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) // request line parsing
return false;
}
- if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
+ int pos = byteBuffer.position();
+ byte chr = byteBuffer.get();
+ if (chr == Constants.SP || chr == Constants.HT) {
space = true;
end = pos;
- } else if ((buf[pos] == Constants.CR) || (buf[pos] ==
Constants.LF)) {
+ } else if (chr == Constants.CR || chr == Constants.LF) {
// HTTP/0.9 style request
parsingRequestLineEol = true;
space = true;
end = pos;
- } else if ((buf[pos] == Constants.QUESTION) &&
(parsingRequestLineQPos == -1)) {
+ } else if (chr == Constants.QUESTION && parsingRequestLineQPos
== -1) {
parsingRequestLineQPos = pos;
}
- pos++;
}
if (parsingRequestLineQPos >= 0) {
- request.queryString().setBytes(buf, parsingRequestLineQPos + 1,
+ request.queryString().setBytes(byteBuffer.array(),
parsingRequestLineQPos + 1,
end - parsingRequestLineQPos - 1);
- request.requestURI().setBytes(buf, parsingRequestLineStart,
+ request.requestURI().setBytes(byteBuffer.array(),
parsingRequestLineStart,
parsingRequestLineQPos - parsingRequestLineStart);
} else {
- request.requestURI().setBytes(buf, parsingRequestLineStart,
+ request.requestURI().setBytes(byteBuffer.array(),
parsingRequestLineStart,
end - parsingRequestLineStart);
}
parsingRequestLinePhase = 5;
@@ -526,17 +516,17 @@ public class Http11InputBuffer implement
boolean space = true;
while (space) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) // request line parsing
return false;
}
- if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
- pos++;
- } else {
+ byte chr = byteBuffer.get();
+ if (!(chr == Constants.SP || chr == Constants.HT)) {
space = false;
+ byteBuffer.position(byteBuffer.position() - 1);
}
}
- parsingRequestLineStart = pos;
+ parsingRequestLineStart = byteBuffer.position();
parsingRequestLinePhase = 6;
// Mark the current buffer position
@@ -549,23 +539,25 @@ public class Http11InputBuffer implement
//
while (!parsingRequestLineEol) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) // request line parsing
return false;
}
- if (buf[pos] == Constants.CR) {
+ int pos = byteBuffer.position();
+ byte chr = byteBuffer.get();
+ if (chr == Constants.CR) {
end = pos;
- } else if (buf[pos] == Constants.LF) {
- if (end == 0)
+ } else if (chr == Constants.LF) {
+ if (end == 0) {
end = pos;
+ }
parsingRequestLineEol = true;
}
- pos++;
}
if ((end - parsingRequestLineStart) > 0) {
- request.protocol().setBytes(buf, parsingRequestLineStart,
+ request.protocol().setBytes(byteBuffer.array(),
parsingRequestLineStart,
end - parsingRequestLineStart);
} else {
request.protocol().setString("");
@@ -601,13 +593,13 @@ public class Http11InputBuffer implement
// limitation to enforce the meaning of headerBufferSize
// From the way how buf is allocated and how blank lines are being
// read, it should be enough to check (1) only.
- if (pos > headerBufferSize || buf.length - pos <
socketReadBufferSize) {
+ if (byteBuffer.position() > headerBufferSize ||
byteBuffer.capacity() - byteBuffer.position() < socketReadBufferSize) {
throw new
IllegalArgumentException(sm.getString("iib.requestheadertoolarge.error"));
}
} while (status == HeaderParseStatus.HAVE_MORE_HEADERS);
if (status == HeaderParseStatus.DONE) {
parsingHeader = false;
- end = pos;
+ end = byteBuffer.position();
return true;
} else {
return false;
@@ -629,7 +621,7 @@ public class Http11InputBuffer implement
if (swallowInput && (lastActiveFilter != -1)) {
int extraBytes = (int) activeFilters[lastActiveFilter].end();
- pos = pos - extraBytes;
+ byteBuffer.position(byteBuffer.position() - extraBytes);
}
}
@@ -639,7 +631,7 @@ public class Http11InputBuffer implement
* correspond).
*/
int available(boolean read) {
- int available = lastValid - pos;
+ int available = byteBuffer.remaining();
if ((available == 0) && (lastActiveFilter >= 0)) {
for (int i = 0; (available == 0) && (i <= lastActiveFilter); i++) {
available = activeFilters[i].available();
@@ -651,7 +643,7 @@ public class Http11InputBuffer implement
try {
fill(false);
- available = lastValid - pos;
+ available = byteBuffer.remaining();
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("iib.available.readFail"), ioe);
@@ -671,7 +663,7 @@ public class Http11InputBuffer implement
* faking non-blocking reads with the blocking IO connector.
*/
boolean isFinished() {
- if (lastValid > pos) {
+ if (byteBuffer.limit() > byteBuffer.position()) {
// Data to read in the buffer so not finished
return false;
}
@@ -697,9 +689,9 @@ public class Http11InputBuffer implement
}
ByteBuffer getLeftover() {
- int available = lastValid - pos;
+ int available = byteBuffer.remaining();
if (available > 0) {
- return ByteBuffer.wrap(buf, pos, available);
+ return ByteBuffer.wrap(byteBuffer.array(), byteBuffer.position(),
available);
} else {
return null;
}
@@ -709,11 +701,13 @@ public class Http11InputBuffer implement
void init(SocketWrapperBase<?> socketWrapper) {
wrapper = socketWrapper;
+ wrapper.setAppReadBufHandler(this);
int bufLength = headerBufferSize +
wrapper.getSocketBufferHandler().getReadBuffer().capacity();
- if (buf == null || buf.length < bufLength) {
- buf = new byte[bufLength];
+ if (byteBuffer == null || byteBuffer.capacity() < bufLength) {
+ byteBuffer = ByteBuffer.allocate(bufLength);
+ byteBuffer.position(0).limit(0);
}
}
@@ -730,16 +724,21 @@ public class Http11InputBuffer implement
private boolean fill(boolean block) throws IOException {
if (parsingHeader) {
- if (lastValid >= headerBufferSize) {
+ if (byteBuffer.limit() >= headerBufferSize) {
throw new
IllegalArgumentException(sm.getString("iib.requestheadertoolarge.error"));
}
} else {
- lastValid = pos = end;
+ byteBuffer.limit(end).position(end);
}
- int nRead = wrapper.read(block, buf, pos, buf.length - pos);
+ int oldPosition = byteBuffer.position();
+ if (byteBuffer.position() < byteBuffer.limit()) {
+ byteBuffer.position(byteBuffer.limit());
+ }
+ byteBuffer.limit(byteBuffer.capacity());
+ int nRead = wrapper.read(block, byteBuffer);
+ byteBuffer.limit(byteBuffer.position()).position(oldPosition);
if (nRead > 0) {
- lastValid = pos + nRead;
return true;
} else if (nRead == -1) {
throw new EOFException(sm.getString("iib.eof.error"));
@@ -766,31 +765,29 @@ public class Http11InputBuffer implement
while (headerParsePos == HeaderParsePosition.HEADER_START) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) {// parse header
headerParsePos = HeaderParsePosition.HEADER_START;
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- chr = buf[pos];
+ chr = byteBuffer.get();
if (chr == Constants.CR) {
// Skip
} else if (chr == Constants.LF) {
- pos++;
return HeaderParseStatus.DONE;
} else {
+ byteBuffer.position(byteBuffer.position() - 1);
break;
}
- pos++;
-
}
if (headerParsePos == HeaderParsePosition.HEADER_START) {
// Mark the current buffer position
- headerData.start = pos;
+ headerData.start = byteBuffer.position();
headerParsePos = HeaderParsePosition.HEADER_NAME;
}
@@ -802,18 +799,19 @@ public class Http11InputBuffer implement
while (headerParsePos == HeaderParsePosition.HEADER_NAME) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) { // parse header
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- chr = buf[pos];
+ int pos = byteBuffer.position();
+ chr = byteBuffer.get();
if (chr == Constants.COLON) {
headerParsePos = HeaderParsePosition.HEADER_VALUE_START;
- headerData.headerValue = headers.addValue(buf,
headerData.start,
+ headerData.headerValue = headers.addValue(byteBuffer.array(),
headerData.start,
pos - headerData.start);
- pos++;
+ pos = byteBuffer.position();
// Mark the current buffer position
headerData.start = pos;
headerData.realPos = pos;
@@ -823,14 +821,14 @@ public class Http11InputBuffer implement
// If a non-token header is detected, skip the line and
// ignore the header
headerData.lastSignificantChar = pos;
+ byteBuffer.position(byteBuffer.position() - 1);
return skipLine();
}
// chr is next byte of header name. Convert to lowercase.
if ((chr >= Constants.A) && (chr <= Constants.Z)) {
- buf[pos] = (byte) (chr - Constants.LC_OFFSET);
+ byteBuffer.put(pos, (byte) (chr - Constants.LC_OFFSET));
}
- pos++;
}
// Skip the line and ignore the header
@@ -850,18 +848,17 @@ public class Http11InputBuffer implement
// Skipping spaces
while (true) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) {// parse header
// HEADER_VALUE_START
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- chr = buf[pos];
- if (chr == Constants.SP || chr == Constants.HT) {
- pos++;
- } else {
+ chr = byteBuffer.get();
+ if (!(chr == Constants.SP || chr == Constants.HT)) {
headerParsePos = HeaderParsePosition.HEADER_VALUE;
+ byteBuffer.position(byteBuffer.position() - 1);
break;
}
}
@@ -873,28 +870,26 @@ public class Http11InputBuffer implement
while (!eol) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) {// parse header
// HEADER_VALUE
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- chr = buf[pos];
+ chr = byteBuffer.get();
if (chr == Constants.CR) {
// Skip
} else if (chr == Constants.LF) {
eol = true;
} else if (chr == Constants.SP || chr == Constants.HT) {
- buf[headerData.realPos] = chr;
+ byteBuffer.put(headerData.realPos, chr);
headerData.realPos++;
} else {
- buf[headerData.realPos] = chr;
+ byteBuffer.put(headerData.realPos, chr);
headerData.realPos++;
headerData.lastSignificantChar = headerData.realPos;
}
-
- pos++;
}
// Ignore whitespaces at the end of the line
@@ -905,14 +900,14 @@ public class Http11InputBuffer implement
headerParsePos = HeaderParsePosition.HEADER_MULTI_LINE;
}
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) {// parse header
// HEADER_MULTI_LINE
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- chr = buf[pos];
+ chr = byteBuffer.get(byteBuffer.position());
if (headerParsePos == HeaderParsePosition.HEADER_MULTI_LINE) {
if ((chr != Constants.SP) && (chr != Constants.HT)) {
headerParsePos = HeaderParsePosition.HEADER_START;
@@ -920,14 +915,14 @@ public class Http11InputBuffer implement
} else {
// Copying one extra space in the buffer (since there must
// be at least one space inserted between the lines)
- buf[headerData.realPos] = chr;
+ byteBuffer.put(headerData.realPos, chr);
headerData.realPos++;
headerParsePos = HeaderParsePosition.HEADER_VALUE_START;
}
}
}
// Set the header value
- headerData.headerValue.setBytes(buf, headerData.start,
+ headerData.headerValue.setBytes(byteBuffer.array(), headerData.start,
headerData.lastSignificantChar - headerData.start);
headerData.recycle();
return HeaderParseStatus.HAVE_MORE_HEADERS;
@@ -942,25 +937,25 @@ public class Http11InputBuffer implement
while (!eol) {
// Read new bytes if needed
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
if (!fill(false)) {
return HeaderParseStatus.NEED_MORE_DATA;
}
}
- if (buf[pos] == Constants.CR) {
+ int pos = byteBuffer.position();
+ byte chr = byteBuffer.get();
+ if (chr == Constants.CR) {
// Skip
- } else if (buf[pos] == Constants.LF) {
+ } else if (chr == Constants.LF) {
eol = true;
} else {
headerData.lastSignificantChar = pos;
}
-
- pos++;
}
if (log.isDebugEnabled()) {
log.debug(sm.getString("iib.invalidheader",
- new String(buf, headerData.start,
+ new String(byteBuffer.array(), headerData.start,
headerData.lastSignificantChar - headerData.start
+ 1,
StandardCharsets.ISO_8859_1)));
}
@@ -1065,18 +1060,36 @@ public class Http11InputBuffer implement
@Override
public int doRead(ByteChunk chunk) throws IOException {
- if (pos >= lastValid) {
+ if (byteBuffer.position() >= byteBuffer.limit()) {
// The application is reading the HTTP request body which is
// always a blocking operation.
if (!fill(true))
return -1;
}
- int length = lastValid - pos;
- chunk.setBytes(buf, pos, length);
- pos = lastValid;
+ int length = byteBuffer.remaining();
+ chunk.setBytes(byteBuffer.array(), byteBuffer.position(), length);
+ byteBuffer.position(byteBuffer.limit());
return length;
}
}
+
+
+ @Override
+ public ByteBuffer getByteBuffer() {
+ return byteBuffer;
+ }
+
+
+ @Override
+ public void expand(int size) {
+ if (byteBuffer.capacity() >= size) {
+ byteBuffer.limit(size);
+ }
+ ByteBuffer temp = ByteBuffer.allocate(size);
+ temp.put(byteBuffer);
+ byteBuffer = temp;
+ temp = null;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
