Attachment #251391 for bug #272566

Lines 78-84 Link Here

(-)connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java (-1 / +9 lines)
78	protected static StringManager sm =	78	protected static StringManager sm =
79	StringManager.getManager(Constants.Package);	79	StringManager.getManager(Constants.Package);
80		80
		81	/*
		82	* Tracks how many internal filters are in the filter library so they
		83	* are skipped when looking for pluggable filters.
		84	*/
		85	private int pluggableFilterIndex = Integer.MAX_VALUE;
81		86
		87
82	// ----------------------------------------------------------- Constructors	88	// ----------------------------------------------------------- Constructors
83		89
84		90
Lines 1657-1662 Link Here
1657	//inputBuffer.addFilter(new GzipInputFilter());	1663	//inputBuffer.addFilter(new GzipInputFilter());
1658	outputBuffer.addFilter(new GzipOutputFilter());	1664	outputBuffer.addFilter(new GzipOutputFilter());
1659		1665
		1666	pluggableFilterIndex = inputBuffer.filterLibrary.length;
		1667
1660	}	1668	}
1661		1669
1662		1670
Lines 1675-1681 Link Here
1675	(inputFilters[Constants.CHUNKED_FILTER]);	1683	(inputFilters[Constants.CHUNKED_FILTER]);
1676	contentDelimitation = true;	1684	contentDelimitation = true;
1677	} else {	1685	} else {
1678	for (int i = 2; i < inputFilters.length; i++) {	1686	for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
1679	if (inputFilters[i].getEncodingName()	1687	if (inputFilters[i].getEncodingName()
1680	.toString().equals(encodingName)) {	1688	.toString().equals(encodingName)) {
1681	inputBuffer.addActiveFilter(inputFilters[i]);	1689	inputBuffer.addActiveFilter(inputFilters[i]);

Lines 77-83 Link Here

(-)connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java (-1 / +9 lines)
77	protected static StringManager sm =	77	protected static StringManager sm =
78	StringManager.getManager(Constants.Package);	78	StringManager.getManager(Constants.Package);
79		79
		80	/*
		81	* Tracks how many internal filters are in the filter library so they
		82	* are skipped when looking for pluggable filters.
		83	*/
		84	private int pluggableFilterIndex = Integer.MAX_VALUE;
80		85
		86
81	// ----------------------------------------------------------- Constructors	87	// ----------------------------------------------------------- Constructors
82		88
83		89
Lines 1699-1704 Link Here
1699	//inputBuffer.addFilter(new GzipInputFilter());	1705	//inputBuffer.addFilter(new GzipInputFilter());
1700	outputBuffer.addFilter(new GzipOutputFilter());	1706	outputBuffer.addFilter(new GzipOutputFilter());
1701		1707
		1708	pluggableFilterIndex = inputBuffer.filterLibrary.length;
		1709
1702	}	1710	}
1703		1711
1704		1712
Lines 1717-1723 Link Here
1717	(inputFilters[Constants.CHUNKED_FILTER]);	1725	(inputFilters[Constants.CHUNKED_FILTER]);
1718	contentDelimitation = true;	1726	contentDelimitation = true;
1719	} else {	1727	} else {
1720	for (int i = 2; i < inputFilters.length; i++) {	1728	for (int i = pluggableFilterIndex; i < inputFilters.length; i++) {
1721	if (inputFilters[i].getEncodingName()	1729	if (inputFilters[i].getEncodingName()
1722	.toString().equals(encodingName)) {	1730	.toString().equals(encodingName)) {
1723	inputBuffer.addActiveFilter(inputFilters[i]);	1731	inputBuffer.addActiveFilter(inputFilters[i]);

Lines 102-111 Link Here

(-)connectors/http11/src/java/org/apache/coyote/http11/filters/BufferedInputFilter.java (-4 / +6 lines)
102	}	102	}
103		103
104	public void recycle() {	104	public void recycle() {
105	if (buffered.getBuffer().length > 65536) {	105	if (buffered != null) {
106	buffered = null;	106	if (buffered.getBuffer().length > 65536) {
107	} else {	107	buffered = null;
108	buffered.recycle();	108	} else {
		109	buffered.recycle();
		110	}
109	}	111	}
110	tempRead.recycle();	112	tempRead.recycle();
111	hasRead = false;	113	hasRead = false;

Return to bug 272566