From 70902bd279dabd91a792c79987c8c90384eea1d5 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 17 Nov 2016 14:56:52 +0000
Subject: [PATCH] Tomcat 6.0.48

---
 LICENSE.txt                                   |   2 +-
 .../apache-tomcat-deployer/README-i2p.txt     |   2 +-
 .../apache-tomcat-deployer/lib/el-api.jar     | Bin 34646 -> 34646 bytes
 .../apache-tomcat-deployer/lib/jasper-el.jar  | Bin 112603 -> 112603 bytes
 .../apache-tomcat-deployer/lib/jasper.jar     | Bin 527674 -> 527674 bytes
 .../lib/tomcat-juli.jar                       | Bin 32405 -> 32405 bytes
 apps/jetty/apache-tomcat/README-i2p.txt       |   2 +-
 .../apache-tomcat/lib/tomcat-coyote-util.jar  | Bin 12427 -> 12576 bytes
 apps/jetty/build.xml                          |   2 +-
 9 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 766691a55e..d177d7983c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -283,7 +283,7 @@ Applications:
       Bundles systray4j-2.4.1:
       See licenses/LICENSE-LGPLv2.1.txt
 
-   Tomcat 6.0.47:
+   Tomcat 6.0.48:
    Copyright 1999-2016 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
index c354fb71af..6b8c0edf31 100644
--- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt
+++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt
@@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
 
 Retrieved from the file
-	apache-tomcat-6.0.44-deployer.tar.gz
+	apache-tomcat-6.0.48-deployer.tar.gz
 
 minus the following files and directores:
 
diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar
index 4b5aa36d302381d8b05d04d91ed45141030ab908..2598a4a8fa66bcaec88ccede7710159f6d9fead8 100644
GIT binary patch
delta 586
zcmccC$8@cai8sKTnT3mifrEiz_lER|yc*2AHl%N~5MyNCxFLOVAfqCPKe?1qg?Yn<
z^v!b^xj8`+n^$oeF@YKPc{JI<3~mv37BC}JVhS^u@kaUv514UW!wf97NtclgYz&LB
z2Ska#SpmeNL*_TZGV?4JFoGG5R+Cx4jO%s@U?rQa9KJ!MjGas%B3aI*oXop6q;G!Y
za{%I+rT()Zu5k*V3Q=<_LK`B*5xp6reP7HD2%|D?4@8Yc!frOOL%*e+Wdd7zEb|jY
z&F*YRM&{ic(kK7VSqY*yug+b;4`NIXtF-{xJ$YiSJxK55%e97JK6{-B$cV{yb)I1H
zt~xI;eZ4LmOdHmRg6Yos2r&Jm-UCeQH^hSJ{sv#L{`(EiV7_W2M82TW8!W!B(G^Uy
zHMxLk-zFEZx+zT%`A1C<^}5X-VE0rsdxPbVHM@gpffk5+Vp|~kmb3(d&H2$145s~B
j!@%m6w+4afKdp9PaoaXeFx}ba0rvluHY+eK*zO7dgAe^A

delta 586
zcmccC$8@cai8sKTnT3mifrEkJWrpuWUJd3K8NM4W#2A_HX82AHWK;z4Czmp+FyG1W
z-8_epn-k1f#bv|<QnC3yk0v{q!7bv>0%n9tOkoBy-bmlz0W*$kn1Q7>=`yl`b+Z_I
zK$Q5K6+kRHWPTGYGtXiHBbec6HJJs>xNesKR<ha3;TuHC*vSMUlI2{=33A@%M?ME2
zu373o3*s85@Tm|rw<5G5QXJ8nA=>xF?0_&T<Mu$*SS0Lb13UCv+F2&BrN=TqLDcNd
zc4P!uG5LSaN)Wwyb?yp&=9d}1lf!B)KmwB|*4l&gPQF}g2<EfbnShL#Y**(Arn~CA
z!1CAY!ojp*eJGgjtd9WGPwG9uw0=V@nC@@z1?#)t;0)%gHbUeJ8oj~d`x;%rG+UDk
znD%XQ0jrzR1d)H#1W~Ws>;ZO9MYA_p{#dg+m=<V(xF@y+qHjq{AlRHAEx};guQd#;
fZh31EnEumh2Nt(&gZQVj4Px$<HY>3Cg6*yV;$80E

diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar
index 51ec6f3080e949072f84ae6fbeb3383d846ca02a..b7205e347de032147194f587b4a5adaaae554fbe 100644
GIT binary patch
delta 1944
zcmccpp6&K~Hr@blW)?061`Y;>JsZ*|@@jDG-jMF8*rQ=F(N@3y)$fg=t^qHvDCG%V
zj^;J-^b9&upZ_|*Nig<&xyAjbYB8so<}6R&;3u_LO<62a<h4Slww|2BtTm0=+YV%8
zH&&l``RwYqbe&y&$G?dAo={k8>bYdYvAuKHpPq2!HanuR*5QN`*Sp!CvpnOS%;!j6
zee&0D`TXtdUuT}{eajXU{KH9oyTi9-*M2T<y670Hs&V1p^iAPhb8~k6IrP6;za%?E
z)qBCpm1`NQ?##7|=L$UbR<@?Wpo$scqm3KVC+jlGGw<AxKG~m9jd}Nm^vM;Bn#|ib
zq)+BxlAo@yn2{AJ06@Z584aM)dLVkUCDQ|DkiN|_Y|mN13^wl9EMTcG{CnBJj4fgo
ztYF4_>B;P1Myv8}h={XhDl=GQwT?N2@l^jUgmKmQJQG-Ix!DqkE<ZatA+Sh(fFnfB
z=3rNdn%|-SxxrF@6W2jR)}>TJY}d-phqz}>{uPK+agjen`_a-Rj9^_k<u(wh)s>ea
zB8}AxAtI`EZy^lP#taCfp;-pPnBO`B!m#Q{W8&MsA>C7;G}QDU69WSS>*R<1a?@j1
zFmi9c-gO!xDY-Q({R1NdLm4wja`U-fR*3Fv{Tm^6c1_#|5%Hd~3*vT;*|89jjJf#`
z#;y4r9AK;FEm_By&BVZPnq_)p6QjuF1=U=e`BpSB@q*lO;E$=YC=&z2*2(|(%THgs
znvrAkkyWY?6W*-Jf-oZ2`$2+X)h0!V$hj?&5XP%*au5dh&Rj^~Rqri_h<x2|3t^ZZ
zS`Bgb<HME^5&2`#fU!F<7h>|g)9WB=`p-r~7;n#oa)E=~_2wK#ut$O>J9jN)U|_h(
z0QSgqg^i2?)9-FzWS=Z`do@_;iQ7dG&9-+BL-Yj9bJ96y!oZN&GWlV@^z?>}j2xQ{
z@82^K1bKePz2M|OtPBi~xEUC9CJWwI*zO?0C<+eH?GaLpK`J0ax39HhJOTFF_6ldl
z9B^vf{@jC+7wnbk-@O<ggO%O&X6yo|zU^7TjK6rnV(E#DZX96NhD^p)U=7=2a~L@w
zR%8@0dV+nweM>2$3^Uk|`OnTZ#c?t)v<Oe%U&<)C{d)yt4JX)yvL;4nhzWaI827S)
za?tdeZpM`$#&(S!#ufa`dp4v`zdW1K0$%b=7oNjt#k_Gt`t*P~jQXJ5JH2TRqZvrc
z^xbn9EkOoPub#^&JzZ!nqcWIhF_+N+%&4BrXa{EOnadag)*(EP(Fe>(n#br5mfA9p
zF&NC?n$H*pW+cyN3<5KD%x4S*GXxeeCW9GeFvgt)jPYO*yM>IgV8*<Ki~(TA$Ayf(
zV20x&sP>tQ7{kFLpJ5{2iy0%qBFh&;&EZ@EwLNJGRB9hgM0_b@2v~96Qbr#zWA9R^
zVzFgVUt}y}i~&m>U&a^>W~eTQDlS<L_0GxVj8R}IwH1thU`9ENaRSDWTnRO~XeDDH
zSk1AOP}^l!K^<1P3L0YPS3$k3v>K|oY&BH-`PERnbk;!as$Bzh&zUvQ@R3;y)m5+-
zDzzUbBD@Z&CV3sBH`o~)VIqv{p<WJN4^^{xJv5wuuZP;@vjJ-If(=j?e%=6en9oLN
zfUnyKRs4S=G<G64LEXG<6EqA(HbZsgZf5iXJ7d>osL6a=puv*51*&G>7N}i<TcK`_
n-wF+=tuO}nHfUTVz!+P%L3MF#XY>Q7%*gGGR$#`o?ToGf_%S!$

delta 1944
zcmccpp6&K~Hr@blW)?061`Y;>ml?hjc{Mm*WcYd>DljpeXschJRl9IDe~Z@Ks3X2f
zRjV7-G(Ee%+`nC>v9x2|bL%<pi;~x+@}0Y^9iiTPZ;~Xp!L65$o3wXUFlKII%ex`9
zxS92x;^N=C-s(pd@H_wFc$P9LWY&?Oh{sva9W8}24=$5XRpprJeX!QpGx#O<i}v8f
zvuf_V{JQ$v0>jHQH~w`<DsuY&OzgzT5UbZ(60WOs92&pvpR)MUg_B~h_5bYu?#Ayn
zbrZv^8K<}wJb%3O_a%X)ckB-G3%JQ6d~`R%cd{;{JoEDm-^u=rYRoS(d?!~hYBE2~
z@SV)TBtKnYF(WHd0Dy$AG8#ao^+5DyOQr|RAbp!<*q*b18Eo9IS-?_X`1i7b8C%3G
zSiy|<(v#W2j8^5{5D{n1RA#WqY8`V3<Ej2z2;-{pc_y&ba<e56U4C|QLST{n07r<L
z&B3k^HNQjubAzS+Ca!~stV^kc*shhG4{^_&{3{Tt;v#>D_M@ds7{R)7%55N0t1B-<
zL>j9XLPS*S-a;6njTsO|L$eHoF~4;NgkjZ@#>DqD!`D-wG}QDU69WSS>*R<1a?@j1
zFmi9c-gO!xDY-Q({R1NdLm4wja`U-fR*3Fv{Tm^6c1_#|5%Hd~3*vT;*|89jjJf#`
z#;y4r9AK;FEm_By&BVZPnq_)p6QjuF1=U=e`BpSB@q*lO;E$=YC=&z2*2(|(%THgs
znvrAkkyWY?6W*-Jf-oZ2`$2+X)h0!V$hj?&5XP%*au5dh&Rj^~Rqri_h<x2|3t^ZZ
zS`Bgb<HME^5&2`#fU!F<7h>|g)9WB=`p-r~7;n#oa)E=~_2wK#ut$O>J9jN)U|_h(
z0QSgqg^i2?)9-FzWS=Z`do@_;iQ7dG&9-+BL-Yj9bJ96y!oZN&GWlV@^z?>}j2xQ{
z@82^K1bKePz2M|OtPBi~xEUC9CJWwI*zO?0C<+eH?GaLpK`J0ax39HhJOTFF_6ldl
z9B^vf{@jC+7wnbk-@O<ggO%O&X6yo|zU^7TjK6rnV(E#DZX96NhD^p)U=7=2a~L@w
zR%8@0dV+nweM>2$3^Uk|`OnTZ#c?t)v<Oe%U&<)C{d)yt4JX)yvL;4nhzWaI827S)
za?tdeZpM`$#&(S!#ufa`FEf0nU!Kiq0WW!`3(sM+V!oT<J3U|yqdqA2PH&pSXa>?U
zefJzjOOV0StLHLGPZyfYs0`*=%w=={Gpgq@+JPB+<}!wWbqLR6^Z_%H<}vz%rMApt
z3<fi}<}-$Y8Oie*gTRa(^BF_I41ooV$zVnqjB#fHV?0>IZXshVm@#i5V*r@(aUr8G
znBlkxs(t1n#&EF6XPAihV#Y|Y$nwQdb2yhkZBJSPmD&dr5nsv}0#=;2l+g#w*t-;}
zSZo>87a7YKW580!moY|z8LG>nic6M5y>oIoV-#3QZ3Uwrm{AU6oPaSTS3*rLTFDp)
zR&#76)OOibP={5nf`-`nRZuT0t%fQtTMgBIel^rCoi$LqYS%#Bb7l=Rd}P)_brr0I
zO6`Y<2(N>xNnXe34R*#xm<Z!~sF#D+L)9!^4-Mzv>!Eh}Y=D})U<1^JpEp1q=CctR
z;OjO*760D|jh)C%P&aSe1Pw!x%}`yrn;E^p&e*jXYBJvzXt1PifvVZJ1!|YzR;Zif
nw?YGID~!Rt4H_2-FviwxP+c6`8U4U1Gjcnl6__z?JEJQAkE9qq

diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar
index 7242ce7d1bd874900ca2ed17ff3ce825acb69a46..ca2d7269d81e81c090fbb58fd48c239a017b7466 100644
GIT binary patch
delta 6405
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

delta 6405
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
TJWyBc;Nh?W1=sYiJRGh7hZnJW

diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar
index 37d316ecacc7d4746890c6a17f8c933de73adf7c..c5e0f8f7791109d3a488042772351e1a47f16c21 100644
GIT binary patch
delta 666
zcmbRGmvQP}M&1B#W)?061`Y;>-5b&;@@jDG+K}$4*rQ=F(N@3y)$fg=t^qHvDCG%V
zj^;J-^b9&upZ_|*Nig<&xyAjbYB8so<}6R&;3u_LO<62a<h4Slww|2BtTm0=+YV%8
zH&&l``RwYqbe&y&$G?dAo={k8>bYdYvAuKHpPq2!HanuR*5QN`*Sp!CvpnOS%;!j6
zee&0D`TXtdUuT}{eajXU{KH9oyTi9-*M2T<y670Hs&V1p^iAPhb8~k6IrP6;za%?E
z)qBCpm1`NQ?##7|=L$UbR<@?Wpo$scqm3KVC+jlGGw<AxKG~m94NO-sYJ=%zjK&~(
z^Bu+(CNLwJB^ScD%q9h4eBdaCFw(e%AdG5W16Hu&bwV>3!3<9kUI`Fma-`045WU%1
zSDX#Zh&A?L0W(&Z-{Au@+TDyGy7zc<L(Dtn8xB#d5|Yl&ym3SN=DuiWh{0E4d?0F+
z<7?QMcW+3ayeM@gh~Dg%wt^qTnEbQU0v=nFEz7Jx223t1(+62Lc}1BSn0{Dh4W{MG
zoxyZ!c?6g~0HviXApEk5OtAQ)ia0RsTnV9<R3?J?993apI<YDUOmBno`KtrK{G@6h
uFuk!l7)-O*K<L<-Krnw}O(@uXoV5^j5w%HR@x8UdV9yBGS%K+*I#&RW{U6By

delta 666
zcmbRGmvQP}M&1B#W)?061`Y;>ml?hjc{Mm*WcYd>DljpeXschJRl9IDe~Z@Ks3X2f
zRjV7-G(Ee%+`nC>v9x2|bL%<pi;~x+@}0Y^9iiTPZ;~Xp!L65$o3wXUFlKII%ex`9
zxS92x;^N=C-s(pd@H_wFc$P9LWY&?Oh{sva9W8}24=$5XRpprJeX!QpGx#O<i}v8f
zvuf_V{JQ$v0>jHQH~w`<DsuY&OzgzT5UbZ(60WOs92&pvpR)MUg_B~h_5bYu?#Ayn
zbrZv^8K<}wJb%3O_a%X)ckB-G3%JQ6d~`R%cd{;{JoEDm-^u=rYGAs8Q5#GzV>AZQ
zo9{5TFo7A#EV&TIWi}}Y;{!)AgptNA1YuP38nA*DuM?WV2xfSS@JfIflOuJWgXqo9
zy5ekLMy#<13z)IO{0<+O(e7ph(Y?o;8)Dum-*AXxm5_9H=DQiboBN`jAqHQG@qwsO
zj;~>3ev#ojc~R<05WU$iZ3RE`%M9PiKT9p(u{GJU%nD?{<gzk-kY$rsl$n9)hh^4a
zTE5&FOsAGdfawEJTDk(lFRRD|i$AJ}1Jllx5PC^vBACxn6$YjgtAfDvHYlIJIsnX1
ys`dfX8>@rCG<yw%j;#p<^EcLng5Aei3sDzQn*<i$TN@1W)nws1D=-~U=L!Jk3>YQ=

diff --git a/apps/jetty/apache-tomcat/README-i2p.txt b/apps/jetty/apache-tomcat/README-i2p.txt
index f62c55e862..015ff4736a 100644
--- a/apps/jetty/apache-tomcat/README-i2p.txt
+++ b/apps/jetty/apache-tomcat/README-i2p.txt
@@ -1,7 +1,7 @@
 This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
 
 Retrieved from the file
-	apache-tomcat-6.0.44.tar.gz
+	apache-tomcat-6.0.48.tar.gz
 
 containing only a small subset of lib/tomcat-coyote.jar.
 
diff --git a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar
index 9403f2ece5024641e010d97365c52eeb0b6ad1cb..a45499414ec8c2d28372de113225872cb40113f9 100644
GIT binary patch
delta 3572
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

delta 3443
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
F0st^a2^9bU

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 7e19fa1dbe..1f5c810284 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -22,7 +22,7 @@
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.7" />
     <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
-    <property name="tomcat.ver" value="6.0.47" />
+    <property name="tomcat.ver" value="6.0.48" />
     <property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
     <property name="tomcat2.lib.small" value="apache-tomcat/lib" />
 
-- 
GitLab