← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/coyote/http11/Http11AprProcessor.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/coyote/http11/Http11AprProcessor.java
107
107
        initializeFilters();
108
108
 
109
109
        // Cause loading of HexUtils
110
 
        int foo = HexUtils.DEC[0];
 
110
        HexUtils.getDec('0');
111
111
    }
112
112
 
113
113
 
837
837
                if (!disableUploadTimeout) {
838
838
                    Socket.timeoutSet(socket, timeout * 1000);
839
839
                }
 
840
                // Set this every time in case limit has been changed via JMX
 
841
                request.getMimeHeaders().setLimit(endpoint.getMaxHeaderCount());
840
842
                inputBuffer.parseHeaders();
841
843
            } catch (IOException e) {
842
844
                error = true;
1533
1535
            int port = 0;
1534
1536
            int mult = 1;
1535
1537
            for (int i = valueL - 1; i > colonPos; i--) {
1536
 
                int charValue = HexUtils.DEC[(int) valueB[i + valueS]];
 
1538
                int charValue = HexUtils.getDec(valueB[i + valueS]);
1537
1539
                if (charValue == -1) {
1538
1540
                    // Invalid character
1539
1541
                    error = true;