Merge lp://staging/~james-page/ubuntu/oneiric/tomcat6/CVE-2011-3190 into lp://staging/ubuntu/oneiric/tomcat6
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merge reported by: | Dave Walker |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~james-page/ubuntu/oneiric/tomcat6/CVE-2011-3190 |
| Merge into: | lp://staging/ubuntu/oneiric/tomcat6 |
| Diff against target: |
2811 lines (+2710/-9) 9 files modified
.pc/0013-CVE-2011-3190.patch/java/org/apache/coyote/ajp/AjpAprProcessor.java (+1337/-0) .pc/0013-CVE-2011-3190.patch/java/org/apache/coyote/ajp/AjpProcessor.java (+1269/-0) .pc/applied-patches (+1/-0) debian/changelog (+6/-0) debian/control (+2/-1) debian/patches/0013-CVE-2011-3190.patch (+72/-0) debian/patches/series (+1/-0) java/org/apache/coyote/ajp/AjpAprProcessor.java (+11/-4) java/org/apache/coyote/ajp/AjpProcessor.java (+11/-4) |
| To merge this branch: | bzr merge lp://staging/~james-page/ubuntu/oneiric/tomcat6/CVE-2011-3190 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dave Walker (community) | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
I've also committed this to the Debian tomcat6 SVN repository and will resync pre-release if it lands soon enough.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Uploaded!
Thanks.