You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Paul Smedley <pa...@smedleydot.info> on 2006/08/09 11:59:50 UTC
Re: modphp problems with file >=64k - apr-1.2.7.patch [1/1]
Hi Justin,
On Mon, 7 Aug 2006 17:51:05 UTC, "Justin Erenkrantz"
<ju...@erenkrantz.com> wrote:
> On 8/5/06, Paul Smedley <pa...@smedleydot.info> wrote:
> > I read the website on how to submit patches - submitted in bug report
> > 40193
>
> (Not aimed at you, but at whomever edited the contributing page on the
> APR site.)
>
> I think only submitting patches to Bugzilla is huge mistake. Patches
> should *always* be posted on-list. If folks want to *also* post them
> to Bugzilla, they can waste their time and do so. Bugzilla is not a
> place to store discussions around patches as it purposely moves
> development discussion off-list.
>
> If people are posting patches only to Bugzilla, I know that it's very
> unlikely that I'll ever see them or ever apply them. -- justin
I'll also attach the patch here. I just didn't want to post patches
here if they were supposed to go to Bugzilla. Other groups can be
rather anal about patches ONLY going to something like Bugzilla :)
--
Cheers,
Paul.
begin 666 apr-1.2.7.patch
M3VYL>2!I;B!A<'(M,2XR+C<Z("YL:6)S#0I/;FQY(&EN(&%P<BTQ+C(N-SH@
M+FUA:V4N9&ER<PT*3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BTQ+6-O;F9I9PT*
M3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BUC;VYF:6<N;W5T#0I/;FQY(&EN(&%P
M<BTQ+C(N-SH@87!R+F5X<`T*3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BYP8PT*
M3VYL>2!I;B!A<'(M,2XR+C<O871O;6EC+W5N:7@Z(&%P<E]A=&]M:6,N;&\-
M"D]N;'D@:6X@87!R+3$N,BXW+V%T;VUI8R]U;FEX.B!A<')?871O;6EC+F\-
M"F1I9F8@+75R(&%P<BTQ+C(N-RUD:7-T+V)U:6QD+V%P;&EB=&]O;"YC(&%P
M<BTQ+C(N-R]B=6EL9"]A<&QI8G1O;VPN8PT*+2TM(&%P<BTQ+C(N-RUD:7-T
M+V)U:6QD+V%P;&EB=&]O;"YC"49R:2!&96(@(#0@,3,Z-#0Z,#(@,C`P-0T*
M*RLK(&%P<BTQ+C(N-R]B=6EL9"]A<&QI8G1O;VPN8PE3=6X@075G("`V(#$Y
M.C(R.C0V(#(P,#8-"D!`("TS-BPW("LS-BPW($!`#0H@(R`@9&5F:6YE($-#
M("`@("`@("`@(F=C8R(-"B`C("!D969I;F4@1T5.7T584$]25%,@(F5M>&5X
M<"(-"B`C("!D969I;F4@1$5&,DE-4$Q)0E]#340@(F5M>&EM<"(-"BTC("!D
M969I;F4@4TA!4D5?4U<@("`B+5ID;&P@+5IM=&0B#0HK(R`@9&5F:6YE(%-(
M05)%7U-7("`@(BU:9&QL("U:;6%P("U:;71D(@T*(",@(&1E9FEN92!54T5?
M3TU&('1R=64-"B`C("!D969I;F4@5%)53D-!5$5?1$Q,7TY!344-"B`C("!D
M969I;F4@1%E.04U)0U],24)?15A4(")D;&PB#0I`0"`M-#4L-R`K-#4L-R!`
M0`T*(",@(&EF(%5315]/348-"B`@("`@("\J($]-1B!I<R!T:&4@;F%T:79E
M(&9O<FUA="!U;F1E<B!/4R\R("HO#0H@(R`@("!D969I;F4@4U1!5$E#7TQ)
M0E]%6%0@(FQI8B(-"BTC("`@(&1E9FEN92!/0DI%0U1?15A4("`@("`B;V)J
M(@T**R,@("`@9&5F:6YE($]"2D5#5%]%6%0@("`@(")O(@T*(",@("`@9&5F
M:6YE($Q)0E)!4DE!3B`@("`@(")E;7AO;69A<B(-"B`C("!E;'-E#0H@("`@
M("`O*B!B=70@=&AE(&%L=&5R;F%T:79E+"!A+F]U="P@8V%N(&9O<FLH*2!W
M:&EC:"!I<R!S;VUE=&EM97,@;F5C97-S87)Y("HO#0I/;FQY(&EN(&%P<BTQ
M+C(N-R]B=6EL9#H@87!L:6)T;V]L+F,C#0I/;FQY(&EN(&%P<BTQ+C(N-R]B
M=6EL9#H@87!L:6)T;V]L+F5X90T*3VYL>2!I;B!A<'(M,2XR+C<O8G5I;&0Z
M(&%P<E]R=6QE<RYM:PT*3VYL>2!I;B!A<'(M,2XR+C<O8G5I;&0Z(&%P<E]R
M=6QE<RYO=70-"D]N;'D@:6X@87!R+3$N,BXW+V)U:6QD+W!K9SH@<&MG:6YF
M;PT*3VYL>2!I;B!A<'(M,2XR+C<Z(&-O;F8N8VUD#0I/;FQY(&EN(&%P<BTQ
M+C(N-SH@8V]N9FEG+FQO9PT*3VYL>2!I;B!A<'(M,2XR+C<Z(&-O;F9I9RYN
M:6-E#0I/;FQY(&EN(&%P<BTQ+C(N-SH@8V]N9FEG+G-T871U<PT*3VYL>2!I
M;B!A<'(M,2XR+C<Z(&-O;F9I9W5R92YL:6YE;F\-"D]N;'D@:6X@87!R+3$N
M,BXW.B!C;VYF:6=U<F4N;&]G#0ID:69F("UU<B!A<'(M,2XR+C<M9&ES="]D
M<V\O;W,R+V1S;RYC(&%P<BTQ+C(N-R]D<V\O;W,R+V1S;RYC#0HM+2T@87!R
M+3$N,BXW+61I<W0O9'-O+V]S,B]D<V\N8PE&<FD@1F5B("`T(#$S.C0T.C`R
M(#(P,#4-"BLK*R!A<'(M,2XR+C<O9'-O+V]S,B]D<V\N8PE3=6X@075G("`V
M(#$Y.C0V.C4T(#(P,#8-"D!`("TU,"PQ,R`K-3`L,C,@0$`-"B`@("`@*"IR
M97-?:&%N9&QE*2T^;&]A9%]E<G)O<B`]($%04E]354-#15-3.PT*("`@("`H
M*G)E<U]H86YD;&4I+3YF86EL961?;6]D=6QE(#T@3E5,3#L-"B`-"BT@("`@
M:68@*"AR8R`]($1O<TQO861-;V1U;&4H9F%I;&5D7VUO9'5L92P@<VEZ96]F
M*&9A:6QE9%]M;V1U;&4I+"!P871H+"`F:&%N9&QE*2D@(3T@,"D@>PT**R`@
M("!R8R`]($1O<TQO861-;V1U;&4H9F%I;&5D7VUO9'5L92P@<VEZ96]F*&9A
M:6QE9%]M;V1U;&4I+"!P871H+"`F:&%N9&QE*3L-"BL-"BL@("!I9B`H*')C
M("$](#`I)B8H<F,A/3@W*2D@>PT*("`@("`@("`@*"IR97-?:&%N9&QE*2T^
M;&]A9%]E<G)O<B`]($%04E]&4D]-7T]37T524D]2*')C*3L-"B`@("`@("`@
M("@J<F5S7VAA;F1L92DM/F9A:6QE9%]M;V1U;&4@/2!A<')?<'-T<F1U<"AC
M='@L(&9A:6QE9%]M;V1U;&4I.PT*("`@("`@("`@<F5T=7)N($%04E]&4D]-
M7T]37T524D]2*')C*3L-"B`@("`@?0T*(`T**R`@(&EF("AR8ST].#<I>PT*
M*R`@("`@("`@:6YT(')C,CL-"BL@("`@("`@($A-3T153$4@:&%N9&QE,CL-
M"BL@("`@("`@(')C,CU$;W-1=65R>4UO9'5L94AA;F1L92AP871H+"9H86YD
M;&4R*3L-"BL@("`@("`@("@J<F5S7VAA;F1L92DM/FAA;F1L92`@/2!H86YD
M;&4R.PT**R`@("`@("`@?0T**R`@(&EF("AR8ST],"D@#0H@("`@("@J<F5S
M7VAA;F1L92DM/FAA;F1L92`@/2!H86YD;&4[#0HK#0H@("`@(&%P<E]P;V]L
M7V-L96%N=7!?<F5G:7-T97(H8W1X+"`J<F5S7VAA;F1L92P@9'-O7V-L96%N
M=7`L(&%P<E]P;V]L7V-L96%N=7!?;G5L;"D[#0H@("`@(')E='5R;B!!4%)?
M4U5#0T534SL-"B!]#0I`0"`M.#`L-R`K.3`L,38@0$`-"B`@("`@:68@*'-Y
M;6YA;64@/3T@3E5,3"!\?"!R97-S>6T@/3T@3E5,3"D-"B`@("`@("`@(')E
M='5R;B!!4%)?15-934Y/5$9/54Y$.PT*(`T*+2`@("!I9B`H*')C(#T@1&]S
M475E<GE0<F]C061D<BAH86YD;&4M/FAA;F1L92P@,"P@<WEM;F%M92P@)F9U
M;F,I*2`A/2`P*2![#0HK(VEF(&1E9FEN960H7U])3DY/5$5+7TQ)0D-?7RD-
M"BL@("`@=F]I9"`J<F5T=F%L.PT**R`@("!C:&%R("IS>6UB;VP@/2`H8VAA
M<BHI;6%L;&]C*'-I>F5O9BAC:&%R*2HH<W1R;&5N*'-Y;6YA;64I*S(I*3L-
M"BL@("`@<W!R:6YT9BAS>6UB;VPL(")?)7,B+"!S>6UN86UE*3L-"BL@("`@
M<F,@/2!$;W-1=65R>5!R;V-!9&1R*&AA;F1L92T^:&%N9&QE+"`P+"!S>6UB
M;VPL("9F=6YC*3L-"BL@("`@9G)E92AS>6UB;VPI.PT**R-E;'-E#0HK("`@
M(')C(#T@1&]S475E<GE0<F]C061D<BAH86YD;&4M/FAA;F1L92P@,"P@<WEM
M;F%M92P@)F9U;F,I.PT**R-E;F1I9@T**R`@("!I9B`H<F,@(3T@,"D@>PT*
M("`@("`@("`@:&%N9&QE+3YL;V%D7V5R<F]R(#T@05!27T923TU?3U-?15)2
M3U(H<F,I.PT*("`@("`@("`@<F5T=7)N(&AA;F1L92T^;&]A9%]E<G)O<CL-
M"B`@("`@?0T*3VYL>2!I;B!A<'(M,2XR+C<O9'-O+V]S,CH@9'-O+FQO#0I/
M;FQY(&EN(&%P<BTQ+C(N-R]D<V\O;W,R.B!D<V\N;PT*3VYL>2!I;B!A<'(M
M,2XR+C<O9'-O+V]S,CH@=`T*3VYL>2!I;B!A<'(M,2XR+C<Z(&5X<&]R=%]V
M87)S+F,-"D]N;'D@:6X@87!R+3$N,BXW.B!E>'!O<G1S+F,-"D]N;'D@:6X@
M87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!C;W!Y+FQO#0I/;FQY(&EN(&%P<BTQ
M+C(N-R]F:6QE7VEO+V]S,CH@8V]P>2YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F
M:6QE7VEO+V]S,CH@9&ER+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO
M+V]S,CH@9&ER+F\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!D
M:7)?;6%K95]R96-U<G-E+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO
M+V]S,CH@9&ER7VUA:V5?<F5C=7)S92YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F
M:6QE7VEO+V]S,CH@9FEL96%C8RYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL
M95]I;R]O<S(Z(&9I;&5A8V,N;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I
M;R]O<S(Z(&9I;&5D=7`N;&\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O
M;W,R.B!F:6QE9'5P+F\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R
M.B!F:6QE<&%T:"YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z
M(&9I;&5P871H+F\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!F
M:6QE<&%T:%]U=&EL+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S
M,CH@9FEL97!A=&A?=71I;"YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO
M+V]S,CH@9FEL97-T870N;&\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O
M;W,R.B!F:6QE<W1A="YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S
M,CH@9FEL97-Y<RYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z
M(&9I;&5S>7,N;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z(&9L
M;V-K+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,CH@9FQO8VLN
M;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z(&9U;&QR=RYL;PT*
M3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z(&9U;&QR=RYO#0I/;FQY
M(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,CH@;6%P97)R;W)C;V1E+FQO#0I/
M;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,CH@;6%P97)R;W)C;V1E+F\-
M"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!M:W1E;7`N;&\-"D]N
M;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!M:W1E;7`N;PT*9&EF9B`M
M=7(@87!R+3$N,BXW+61I<W0O9FEL95]I;R]O<S(O;W!E;BYC(&%P<BTQ+C(N
M-R]F:6QE7VEO+V]S,B]O<&5N+F,-"BTM+2!A<'(M,2XR+C<M9&ES="]F:6QE
M7VEO+V]S,B]O<&5N+F,)5V5D($IU;B`R.2`P-3HS-#HS."`R,#`U#0HK*RL@
M87!R+3$N,BXW+V9I;&5?:6\O;W,R+V]P96XN8PE3=6X@075G("`V(#$Y.C,V
M.C,T(#(P,#8-"D!`("TR."PV("LR."PQ,R!`0`T*("`@("!R971U<FX@87!R
M7V9I;&5?8VQO<V4H9FEL92D[#0H@?0T*(`T**R-I9F1E9B!?7TE.3D]414M?
M3$E"0U]?#0HK87!R7W-T871U<U]T(&%P<E]U;FEX7V9I;&5?8VQE86YU<"AV
M;VED("IT:&5F:6QE*0T**WL-"BL@("`@87!R7V9I;&5?="`J9FEL92`]('1H
M969I;&4[#0HK("`@(')E='5R;B!A<')?9FEL95]C;&]S92AF:6QE*3L-"BM]
M#0HK(V5N9&EF#0H@#0H@#0H@05!27T1%0TQ!4D4H87!R7W-T871U<U]T*2!A
M<')?9FEL95]O<&5N*&%P<E]F:6QE7W0@*BIN97<L(&-O;G-T(&-H87(@*F9N
M86UE+"!A<')?:6YT,S)?="!F;&%G+"`@87!R7V9I;&5P97)M<U]T('!E<FTL
M(&%P<E]P;V]L7W0@*G!O;VPI#0I/;FQY(&EN(&%P<BTQ+C(N-R]F:6QE7VEO
M+V]S,CH@;W!E;BYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z
M(&]P96XN;PT*3VYL>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z('!I<&4N
M;&\-"D]N;'D@:6X@87!R+3$N,BXW+V9I;&5?:6\O;W,R.B!P:7!E+F\-"F1I
M9F8@+75R(&%P<BTQ+C(N-RUD:7-T+V9I;&5?:6\O;W,R+W)E861W<FET92YC
M(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,B]R96%D=W)I=&4N8PT*+2TM(&%P<BTQ
M+C(N-RUD:7-T+V9I;&5?:6\O;W,R+W)E861W<FET92YC"51H=2!&96(@,C,@
M,#4Z,30Z,S8@,C`P-@T**RLK(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,B]R96%D
M=W)I=&4N8PE3=6X@075G("`V(#$Y.C,V.C$X(#(P,#8-"D!`("TS,S$L-B`K
M,S,Q+#4X($!`#0H@?0T*(`T*(`T**R\J(%!U;&P@9G)O;2!U;FEX(&-O9&4@
M=&\@<W1A<G0@82!S>6YC('5P("HO#0HK(VEF("AD969I;F5D*%]?24Y.3U1%
M2U],24)#7U\I('Q\(&1E9FEN960H7U]7051#3TU#7U\I("D-"BL@#0HK<W1R
M=6-T(&%P<E]F:6QE7W!R:6YT9E]D871A('L-"BL@("`@87!R7W9F;W)M871T
M97)?8G5F9E]T('9B=69F.PT**R`@("!A<')?9FEL95]T("IF<'1R.PT**R`@
M("!C:&%R("IB=68[#0HK?3L-"BL-"BMS=&%T:6,@:6YT(&9I;&5?<')I;G1F
M7V9L=7-H*&%P<E]V9F]R;6%T=&5R7V)U9F9?="`J8G5F9BD-"BM[#0HK("`@
M('-T<G5C="!A<')?9FEL95]P<FEN=&9?9&%T82`J9&%T82`]("AS=')U8W0@
M87!R7V9I;&5?<')I;G1F7V1A=&$@*BEB=69F.PT**PT**R`@("!I9B`H87!R
M7V9I;&5?=W)I=&5?9G5L;"AD871A+3YF<'1R+"!D871A+3YB=68L#0HK("`@
M("`@("`@("`@("`@("`@("`@("`@("`@(&1A=&$M/G9B=69F+F-U<G!O<R`M
M(&1A=&$M/F)U9BP@3E5,3"DI('L-"BL@("`@("`@(')E='5R;B`M,3L-"BL@
M("`@?0T**PT**R`@("!D871A+3YV8G5F9BYC=7)P;W,@/2!D871A+3YB=68[
M#0HK("`@(')E='5R;B`P.PT**WT-"BL-"BL-"BM!4%)?1$5#3$%215].3TY3
M5$0H:6YT*2!A<')?9FEL95]P<FEN=&8H87!R7V9I;&5?="`J9G!T<BP-"BL@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@8V]N<W0@
M8VAA<B`J9F]R;6%T+"`N+BXI#0HK>PT**R`@("!S=')U8W0@87!R7V9I;&5?
M<')I;G1F7V1A=&$@9&%T83L-"BL@("`@=F%?;&ES="!A<#L-"BL@("`@:6YT
M(&-O=6YT.PT**PT**R`@("`O*B!D;VXG="!R96%L;'D@;F5E9"!A($A51T5?
M4U1224Y'7TQ%3B!A;GEM;W)E("HO#0HK("`@(&1A=&$N8G5F(#T@;6%L;&]C
M*$A51T5?4U1224Y'7TQ%3BD[#0HK("`@(&EF("AD871A+F)U9B`]/2!.54Q,
M*2![#0HK("`@("`@("!R971U<FX@+3$[#0HK("`@('T-"BL@("`@9&%T82YV
M8G5F9BYC=7)P;W,@/2!D871A+F)U9CL-"BL@("`@9&%T82YV8G5F9BYE;F1P
M;W,@/2!D871A+F)U9B`K($A51T5?4U1224Y'7TQ%3CL-"BL@("`@9&%T82YF
M<'1R(#T@9G!T<CL-"BL@("`@=F%?<W1A<G0H87`L(&9O<FUA="D[#0HK("`@
M(&-O=6YT(#T@87!R7W9F;W)M871T97(H9FEL95]P<FEN=&9?9FQU<V@L#0HK
M("`@("`@("`@("`@("`@("`@("`@("`@("`@*&%P<E]V9F]R;6%T=&5R7V)U
M9F9?="`J*29D871A+"!F;W)M870L(&%P*3L-"BL@("`@+RH@87!R7W9F;W)M
M871T97(@9&]E<R!N;W0@8V%L;"!F;'5S:"!F;W(@=&AE(&QA<W0@8FET<R`J
M+PT**R`@("!I9B`H8V]U;G0@/CT@,"D@9FEL95]P<FEN=&9?9FQU<V@H*&%P
M<E]V9F]R;6%T=&5R7V)U9F9?="`J*29D871A*3L-"BL-"BL@("`@=F%?96YD
M*&%P*3L-"BL-"BL@("`@9G)E92AD871A+F)U9BD[#0HK#0HK("`@(')E='5R
M;B!C;W5N=#L-"BM]#0HK#0HK(V5L<V4-"B`-"B!!4%)?1$5#3$%215].3TY3
M5$0H:6YT*2!A<')?9FEL95]P<FEN=&8H87!R7V9I;&5?="`J9G!T<BP@#0H@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@(&-O;G-T
M(&-H87(@*F9O<FUA="P@+BXN*0T*0$`@+3,U,2PW("LT,#,L-R!`0`T*("`@
M("!F<F5E*&)U9BD[#0H@("`@(')E='5R;B`H8V,@/3T@05!27U-50T-%4U,I
M(#\@;&5N(#H@+3$[#0H@?0T*+0T**R-E;F1I9@T*(`T*(`T*(&%P<E]S=&%T
M=7-?="!A<')?9FEL95]C:&5C:U]R96%D*&%P<E]F:6QE7W0@*F9D*0T*3VYL
M>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z(')E861W<FET92YL;PT*3VYL
M>2!I;B!A<'(M,2XR+C<O9FEL95]I;R]O<S(Z(')E861W<FET92YO#0I/;FQY
M(&EN(&%P<BTQ+C(N-R]F:6QE7VEO+V]S,CH@<V5E:RYL;PT*3VYL>2!I;B!A
M<'(M,2XR+C<O9FEL95]I;R]O<S(Z('-E96LN;PT*3VYL>2!I;B!A<'(M,2XR
M+C<O9FEL95]I;R]O<S(Z('1E;7!D:7(N;&\-"D]N;'D@:6X@87!R+3$N,BXW
M+V9I;&5?:6\O;W,R.B!T96UP9&ER+F\-"F1I9F8@+75R(&%P<BTQ+C(N-RUD
M:7-T+V9I;&5?:6\O=6YI>"]M:W1E;7`N8R!A<'(M,2XR+C<O9FEL95]I;R]U
M;FEX+VUK=&5M<"YC#0HM+2T@87!R+3$N,BXW+61I<W0O9FEL95]I;R]U;FEX
M+VUK=&5M<"YC"49R:2!&96(@(#0@,3,Z-#0Z,#(@,C`P-0T**RLK(&%P<BTQ
M+C(N-R]F:6QE7VEO+W5N:7@O;6MT96UP+F,)4W5N($%U9R`@-B`Q.3HS-CHU
M,"`R,#`V#0I`0"`M.#`L-R`K.#`L.2!`0`T*("-I;F-L=61E(#QF8VYT;"YH
M/@T*("-E;F1I9@T*("-I;F-L=61E(#QS=&1I;RYH/@T**R-I9FYD968@7U])
M3DY/5$5+7TQ)0D-?7PT*("-I;F-L=61E(#QS=&1L:6(N:#X-"BLC96YD:68-
M"B`C:6YC;'5D92`\<W1R:6YG+F@^#0H@(VEN8VQU9&4@/&-T>7!E+F@^#0H@
M(VEF9&5F($A!5D5?5$E-15](#0I`0"`M,3@X+#8@*S$Y,"PQ,2!`0`T*("-E
M;'-E#0H@("`@(&9D(#T@;6MS=&5M<"AT96UP;&%T92D[#0H@(V5N9&EF#0HK
M#0HK(VEF9&5F(%]?24Y.3U1%2U],24)#7U\-"BL@("`@("`@("`@<V5T;6]D
M92AF9"P@3U]"24Y!4EDI.PT**R-E;F1I9B`-"BL-"B`@("`@#0H@("`@(&EF
M("AF9"`]/2`M,2D@>PT*("`@("`@("`@<F5T=7)N(&5R<FYO.PT*3VYL>2!I
M;B!A<'(M,2XR+C<O:6YC;'5D93H@87!R+F@-"D]N;'D@:6X@87!R+3$N,BXW
M+VEN8VQU9&4Z(&%P<BYP871C:`T*9&EF9B`M=7(@87!R+3$N,BXW+61I<W0O
M:6YC;'5D92]A<')?;F5T=V]R:U]I;RYH(&%P<BTQ+C(N-R]I;F-L=61E+V%P
M<E]N971W;W)K7VEO+F@-"BTM+2!A<'(M,2XR+C<M9&ES="]I;F-L=61E+V%P
M<E]N971W;W)K7VEO+F@)4W5N($IU;B`Q,B`Q,3HU-#HU,"`R,#`U#0HK*RL@
M87!R+3$N,BXW+VEN8VQU9&4O87!R7VYE='=O<FM?:6\N:`E3=6X@075G("`V
M(#$Y.C,V.C4P(#(P,#8-"D!`("TW-3(L-R`K-S4R+#<@0$`-"B`@*B!5;G-E
M="!A('-O8VME="!F<F]M(&)E:6YG(&EN:&5R:71E9"!B>2!C:&EL9"!P<F]C
M97-S97,N#0H@("HO#0H@05!27T1%0TQ!4D5?24Y(15))5%]53E-%5"AS;V-K
M970I.PT*+0T**R-I9FYD968@7U])3DY/5$5+7TQ)0D-?7PT*("\J*@T*("`J
M($!D969G<F]U<"!A<')?;6-A<W0@25`@375L=&EC87-T#0H@("H@0'L-"D!`
M("TX,30L-B`K.#$T+#<@0$`-"B!!4%)?1$5#3$%212AA<')?<W1A='5S7W0I
M(&%P<E]M8V%S=%]I;G1E<F9A8V4H87!R7W-O8VME=%]T("IS;V-K+`T*("`@
M("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("!A
M<')?<V]C:V%D9')?="`J:69A8V4I.PT*(`T**R-E;F1I9@T*("\J*B!`?2`J
M+PT*(`T*("\J*B!`?2`J+PT*9&EF9B`M=7(@87!R+3$N,BXW+61I<W0O:6YC
M;'5D92]A<F-H+V]S,B]A<')?87)C:%]F:6QE7VEO+F@@87!R+3$N,BXW+VEN
M8VQU9&4O87)C:"]O<S(O87!R7V%R8VA?9FEL95]I;RYH#0HM+2T@87!R+3$N
M,BXW+61I<W0O:6YC;'5D92]A<F-H+V]S,B]A<')?87)C:%]F:6QE7VEO+F@)
M4V%T($IU;"`Q-B`P,CHP-SHT,B`R,#`U#0HK*RL@87!R+3$N,BXW+VEN8VQU
M9&4O87)C:"]O<S(O87!R7V%R8VA?9FEL95]I;RYH"5-U;B!!=6<@(#8@,3DZ
M,S8Z-3`@,C`P-@T*0$`@+3(Y+#<@*S(Y+#D@0$`-"B`@*B!F<FEE;F1L>2`F
M(&ES('!A<G0@;V8@=&AE(%!/4TE8(&5M=6QA=&EO;B!R871H97(@=&AA;B!N
M871I=F4@<V\@9&]N)W0-"B`@*B!U<V4@:70N#0H@("HO#0HK(VEF;F1E9B!?
M7TE.3D]414M?3$E"0U]?#0H@(W5N9&5F($A!5D5?34M35$5-4`T**R-E;F1I
M9@T*(`T*("-D969I;F4@05!27T9)3$5?0E5&4TE:12`T,#DV#0H@#0I`0"`M
M-#4L-R`K-#<L,3`@0$`-"B`@("`@:6YT('!I<&4[#0H@("`@($A%5B!P:7!E
M4V5M.PT*("`@("!E;G5M('L@0DQ+7U5.2TY/5TXL($),2U]/1D8L($),2U]/
M3B!](&)L;V-K:6YG.PT*+0T**R-I9FYD968@5T%)5$E/7U5315-?4$],3`T*
M*R`@("`O*B!I9B!T:&5R92!I<R!A('1I;65O=70@<V5T+"!T:&5N('1H:7,@
M<&]L;'-E="!I<R!U<V5D("HO#0HK("`@(&%P<E]P;VQL<V5T7W0@*G!O;&QS
M970[#0HK(V5N9&EF#0H@("`@("\J(%-T=69F(&9O<B!B=69F97)E9"!M;V1E
M("HO#0H@("`@(&-H87(@*F)U9F9E<CL-"B`@("`@:6YT(&)U9G!O<SL@("`@
M("`@("`@("`@("`O+R!296%D+U=R:71E('!O<VET:6]N(&EN(&)U9F9E<@T*
M0$`@+38R+#8@*S8W+#$Q($!`#0H@("`@($9)3$5&24Y$0E5&,R!E;G1R>3L-
M"B`@("`@:6YT('9A;&ED96YT<GD[#0H@?3L-"BL-"BLC:69D968@7U])3DY/
M5$5+7TQ)0D-?7PT**V%P<E]S=&%T=7-?="!A<')?=6YI>%]F:6QE7V-L96%N
M=7`H=F]I9"`J*3L-"BLC96YD:68-"BL-"B`-"B!A<')?<W1A='5S7W0@87!R
M7V9I;&5?8VQE86YU<"AV;VED("HI.PT*(&%P<E]S=&%T=7-?="!A<')?;W,R
M7W1I;65?=&]?87!R7W1I;64H87!R7W1I;65?="`J<F5S=6QT+"!&1$%412!O
M<S)D871E+"`-"D]N;'D@:6X@87!R+3$N,BXW+VEN8VQU9&4O87)C:"]U;FEX
M.B!A<')?<')I=F%T92YH#0I/;FQY(&EN(&%P<BTQ+C(N-SH@;&EB87!R+3$N
M;&$-"F1I9F8@+75R(&%P<BTQ+C(N-RUD:7-T+VQO8VMS+V]S,B]P<F]C7VUU
M=&5X+F,@87!R+3$N,BXW+VQO8VMS+V]S,B]P<F]C7VUU=&5X+F,-"BTM+2!A
M<'(M,2XR+C<M9&ES="]L;V-K<R]O<S(O<')O8U]M=71E>"YC"49R:2!&96(@
M(#0@,3,Z-#0Z,#(@,C`P-0T**RLK(&%P<BTQ+C(N-R]L;V-K<R]O<S(O<')O
M8U]M=71E>"YC"5-U;B!!=6<@(#8@,3DZ,S8Z-3`@,C`P-@T*0$`@+3$Q-2PV
M("LQ,34L,3,@0$`-"B`@("`@;F5W+3YO=VYE<B`@("`@(#T@,#L-"B`@("`@
M;F5W+3YL;V-K7V-O=6YT(#T@,#L-"B`-"BLC:69D968@7U])3DY/5$5+7TQ)
M0D-?7PT**R`@("!I9B`H(69N86UE*2![#0HK("`@("`@("`O*B!296EN:71I
M86QI>FEN9R!U;FYA;65D(&UU=&5X97,@:7,@82!N;V]P(&EN('1H92!5;FEX
M(&-O9&4N("HO#0HK("`@("`@("!R971U<FX@05!27U-50T-%4U,[#0HK("`@
M('T-"BLC96YD:68-"BL-"B`@("`@<V5M;F%M92`](&9I>&5D7VYA;64H9FYA
M;64L('!O;VPI.PT*("`@("!R8R`]($1O<T]P96Y-=71E>%-E;2AS96UN86UE
M+"`F*&YE=RT^:$UU=&5X*2D[#0H@("`@("IM=71E>"`](&YE=SL-"D]N;'D@
M:6X@87!R+3$N,BXW+VQO8VMS+V]S,CH@<')O8U]M=71E>"YL;PT*3VYL>2!I
M;B!A<'(M,2XR+C<O;&]C:W,O;W,R.B!P<F]C7VUU=&5X+F\-"D]N;'D@:6X@
M87!R+3$N,BXW+VQO8VMS+V]S,CH@=&AR96%D7V-O;F0N;&\-"D]N;'D@:6X@
M87!R+3$N,BXW+VQO8VMS+V]S,CH@=&AR96%D7V-O;F0N;PT*3VYL>2!I;B!A
M<'(M,2XR+C<O;&]C:W,O;W,R.B!T:')E861?;75T97@N;&\-"D]N;'D@:6X@
M87!R+3$N,BXW+VQO8VMS+V]S,CH@=&AR96%D7VUU=&5X+F\-"D]N;'D@:6X@
M87!R+3$N,BXW+VQO8VMS+V]S,CH@=&AR96%D7W)W;&]C:RYL;PT*3VYL>2!I
M;B!A<'(M,2XR+C<O;&]C:W,O;W,R.B!T:')E861?<G=L;V-K+F\-"D]N;'D@
M:6X@87!R+3$N,BXW.B!L;V<-"D]N;'D@:6X@87!R+3$N,BXW.B!-86ME9FEL
M90T*3VYL>2!I;B!A<'(M,2XR+C<O;65M;W)Y+W5N:7@Z(&%P<E]P;V]L<RYL
M;PT*3VYL>2!I;B!A<'(M,2XR+C<O;65M;W)Y+W5N:7@Z(&%P<E]P;V]L<RYO
M#0I/;FQY(&EN(&%P<BTQ+C(N-R]M:7-C+W5N:7@Z(&-H87)S970N;&\-"D]N
M;'D@:6X@87!R+3$N,BXW+VUI<V,O=6YI>#H@8VAA<G-E="YO#0I/;FQY(&EN
M(&%P<BTQ+C(N-R]M:7-C+W5N:7@Z(&5N=BYL;PT*3VYL>2!I;B!A<'(M,2XR
M+C<O;6ES8R]U;FEX.B!E;G8N;PT*3VYL>2!I;B!A<'(M,2XR+C<O;6ES8R]U
M;FEX.B!E<G)O<F-O9&5S+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]M:7-C+W5N
M:7@Z(&5R<F]R8V]D97,N;PT*3VYL>2!I;B!A<'(M,2XR+C<O;6ES8R]U;FEX
M.B!G971O<'0N;&\-"D]N;'D@:6X@87!R+3$N,BXW+VUI<V,O=6YI>#H@9V5T
M;W!T+F\-"D]N;'D@:6X@87!R+3$N,BXW+VUI<V,O=6YI>#H@;W1H97)C:&EL
M9"YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O;6ES8R]U;FEX.B!O=&AE<F-H:6QD
M+F\-"D]N;'D@:6X@87!R+3$N,BXW+VUI<V,O=6YI>#H@<F%N9"YL;PT*3VYL
M>2!I;B!A<'(M,2XR+C<O;6ES8R]U;FEX.B!R86YD+F\-"F1I9F8@+75R(&%P
M<BTQ+C(N-RUD:7-T+VUI<V,O=6YI>"]R86YD8GET95]O<S(N:6YC(&%P<BTQ
M+C(N-R]M:7-C+W5N:7@O<F%N9&)Y=&5?;W,R+FEN8PT*+2TM(&%P<BTQ+C(N
M-RUD:7-T+VUI<V,O=6YI>"]R86YD8GET95]O<S(N:6YC"51U92!*=6X@,30@
M,#@Z,3$Z,S`@,C`P-0T**RLK(&%P<BTQ+C(N-R]M:7-C+W5N:7@O<F%N9&)Y
M=&5?;W,R+FEN8PE3=6X@075G("`V(#$Y.C,V.C4P(#(P,#8-"D!`("TV,BPX
M("LV,BPQ,"!`0`T*("`J('=H:6-H(&ES('=H>2!I="=S(')U;BUT:6UE(&QI
M;FME9"X-"B`@*B\-"B`-"BLC:69N9&5F(%]?24Y.3U1%2U],24)#7U\-"B!S
M=&%T:6,@05!)4D54($%0245.5%)9*"I$;W-097)F4WES0V%L;"D@*%5,3TY'
M('5L0V]M;6%N9"P@54Q/3D<@=6Q087)M,2P-"B`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("`@("`@("`@("`@(%5,3TY'('5L4&%R;3(L(%5,3TY'
M('5L4&%R;3,I(#T@3E5,3#L-"BLC96YD:68-"B!S=&%T:6,@2$U/1%5,12!H
M1&]S8V%L;',@/2`P.PT*("-D969I;F4@("!#341?2TE?4D1#3E0@("`@*#!X
M-C,I#0H@#0I`0"`M.#4L-B`K.#<L-R!`0`T*("`@("!#4%555$E,('5T:6P[
M#0H@("`@(&EN="!C.PT*(`T**R-I9FYD968@7U])3DY/5$5+7TQ)0D-?7PT*
M("`@("!I9B`H:$1O<V-A;&QS(#T](#`I('L-"B`@("`@("`@(&-H87(@9F%I
M;&5D7VUO9'5L95LR,%T[#0H@("`@("`@("!53$].1R!R8SL-"D!`("TQ,3$L
M-R`K,3$T+#<@0$`-"B`@("`@("`@("`@("!$;W-097)F4WES0V%L;"`]($Y5
M3$P[#0H@("`@("`@("!]#0H@("`@('T-"BT-"BLC96YD:68-"B`@("`@<F5T
M=7)N(&)Y=&4[#0H@?0T*(`T*3VYL>2!I;B!A<'(M,2XR+C<O;6ES8R]U;FEX
M.B!S=&%R="YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O;6ES8R]U;FEX.B!S=&%R
M="YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]M:7-C+W5N:7@Z('9E<G-I;VXN;&\-
M"D]N;'D@:6X@87!R+3$N,BXW+VUI<V,O=6YI>#H@=F5R<VEO;BYO#0I/;FQY
M(&EN(&%P<BTQ+C(N-R]M;6%P+W5N:7@Z(&-O;6UO;BYL;PT*3VYL>2!I;B!A
M<'(M,2XR+C<O;6UA<"]U;FEX.B!C;VUM;VXN;PT*3VYL>2!I;B!A<'(M,2XR
M+C<O;6UA<"]U;FEX.B!M;6%P+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]M;6%P
M+W5N:7@Z(&UM87`N;PT*3VYL>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O
M<S(Z(&EN971?;G1O<"YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I
M;R]O<S(Z(&EN971?;G1O<"YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]N971W;W)K
M7VEO+V]S,CH@:6YE=%]P=&]N+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]N971W
M;W)K7VEO+V]S,CH@:6YE=%]P=&]N+F\-"D]N;'D@:6X@87!R+3$N,BXW+VYE
M='=O<FM?:6\O;W,R.B!O<S)C86QL<RYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O
M;F5T=V]R:U]I;R]O<S(Z(&]S,F-A;&QS+F\-"F1I9F8@+75R(&%P<BTQ+C(N
M-RUD:7-T+VYE='=O<FM?:6\O;W,R+W-E;F1R96-V+F,@87!R+3$N,BXW+VYE
M='=O<FM?:6\O;W,R+W-E;F1R96-V+F,-"BTM+2!A<'(M,2XR+C<M9&ES="]N
M971W;W)K7VEO+V]S,B]S96YD<F5C=BYC"5=E9"!*86X@(#0@,C`Z,#DZ,#`@
M,C`P-@T**RLK(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S,B]S96YD<F5C=BYC
M"5-U;B!!=6<@(#8@,3DZ,S8Z-3`@,C`P-@T*0$`@+3(W+#D@*S(W+#$Q($!`
M#0H@("`@(&%P<E]S<VEZ95]T(')V.PT*("`@("!I;G0@9F1S+"!E<G(@/2`P
M.PT*(`T**R-I9FYD968@7U])3DY/5$5+7TQ)0D-?7PT*("`@("!I9B`H*FQE
M;B`^(#8U-3,V*2![#0H@("`@("`@("`J;&5N(#T@-C4U,S8[#0H@("`@('T-
M"BLC96YD:68@#0H@#0H@("`@(&1O('L-"B`@("`@("`@(&EF("@A<V]C:RT^
M;F]N8FQO8VL@?'P@97)R(#T](%-/0T573U5,1$),3T-+*2![#0I`0"`M,3$T
M+#$Q("LQ,38L,3<@0$`-"B`@("`@:6YT(&9D<RP@97)R(#T@,#L-"B`@("`@
M:6YT(&YV7W1O<V5N9"P@=&]T86P@/2`P.PT*(`T**R-I9FYD968@7U])3DY/
M5$5+7TQ)0D-?7PT*("`@("`O*B!-86ME('-U<F4@=W)I=&5V*"D@;VYL>2!G
M971S(&9E9"`V-&L@870@82!T:6UE("HO#0H@("`@(&9O<B`H(&YV7W1O<V5N
M9"`](#`[(&YV7W1O<V5N9"`\(&YV96,@)B8@=&]T86P@*R!V96-;;G9?=&]S
M96YD72YI;W9?;&5N(#P@-C4U,S8[(&YV7W1O<V5N9"LK("D@>PT*("`@("`@
M("`@=&]T86P@*ST@=F5C6VYV7W1O<V5N9%TN:6]V7VQE;CL-"B`@("`@?0T*
M+0T**R-E;'-E#0HK("`@("\J('=O<FMA<F]U;F0@9F]R('=R:71E=B@I(&YO
M="!R97%U:7)E9"!W:71H(&QI8F,@*B\-"BL@("`@9F]R("@@;G9?=&]S96YD
M(#T@,#L@;G9?=&]S96YD(#P@;G9E8SL@;G9?=&]S96YD*RL@*2![#0HK("`@
M("`@("!T;W1A;"`K/2!V96-;;G9?=&]S96YD72YI;W9?;&5N.PT**R`@("!]
M#0HK(V5N9&EF#0H@("`@('1M<'9E8R`](&%L;&]C82AS:7IE;V8H<W1R=6-T
M(&EO=F5C*2`J(&YV7W1O<V5N9"D[#0H@("`@(&UE;6-P>2AT;7!V96,L('9E
M8RP@<VEZ96]F*'-T<G5C="!I;W9E8RD@*B!N=E]T;W-E;F0I.PT*(`T*3VYL
M>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O<S(Z('-E;F1R96-V+FQO#0I/
M;FQY(&EN(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S,CH@<V5N9')E8W8N;PT*
M3VYL>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O<S(Z('-E;F1R96-V7W5D
M<"YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O<S(Z('-E;F1R
M96-V7W5D<"YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S,CH@
M<V]C:V%D9'(N;&\-"D]N;'D@:6X@87!R+3$N,BXW+VYE='=O<FM?:6\O;W,R
M.B!S;V-K861D<BYO#0I/;FQY(&EN(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S
M,CH@<V]C:V5T<RYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O
M<S(Z('-O8VME=',N;PT*9&EF9B`M=7(@87!R+3$N,BXW+61I<W0O;F5T=V]R
M:U]I;R]O<S(O<V]C:V]P="YC(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S,B]S
M;V-K;W!T+F,-"BTM+2!A<'(M,2XR+C<M9&ES="]N971W;W)K7VEO+V]S,B]S
M;V-K;W!T+F,)1G)I($9E8B`@-"`Q,SHT-#HP,B`R,#`U#0HK*RL@87!R+3$N
M,BXW+VYE='=O<FM?:6\O;W,R+W-O8VMO<'0N8PE3=6X@075G("`V(#$Y.C,V
M.C4P(#(P,#8-"D!`("TR-"PW("LR-"PY($!`#0H@(VEN8VQU9&4@/'-Y<R]S
M;V-K970N:#X-"B`C:6YC;'5D92`\;F5T:6YE="]T8W`N:#X-"B`C:6YC;'5D
M92`\;F5T:6YE="]I;BYH/@T**R-I9FYD968@7U])3DY/5$5+7TQ)0D-?7PT*
M("-I;F-L=61E(#QU;FES=&0N:#X-"BLC96YD:68-"B`C:6YC;'5D92`\;F5T
M9&(N:#X-"B`C:6YC;'5D92`\<WES+W-O7VEO8W1L+F@^#0H@#0I/;FQY(&EN
M(&%P<BTQ+C(N-R]N971W;W)K7VEO+V]S,CH@<V]C:V]P="YL;PT*3VYL>2!I
M;B!A<'(M,2XR+C<O;F5T=V]R:U]I;R]O<S(Z('-O8VMO<'0N;PT*3VYL>2!I
M;B!A<'(M,2XR+C<O<&%S<W=D.B!A<')?9V5T<&%S<RYL;PT*3VYL>2!I;B!A
M<'(M,2XR+C<O<&%S<W=D.B!A<')?9V5T<&%S<RYO#0I/;FQY(&EN(&%P<BTQ
M+C(N-SH@<&%T8V@N;&]G#0I/;FQY(&EN(&%P<BTQ+C(N-R]P;VQL+V]S,CH@
M<&]L;"YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O<&]L;"]O<S(Z('!O;&PN;PT*
M3VYL>2!I;B!A<'(M,2XR+C<O<&]L;"]O<S(Z('!O;&QS970N;&\-"D]N;'D@
M:6X@87!R+3$N,BXW+W!O;&PO;W,R.B!P;VQL<V5T+F\-"D]N;'D@:6X@87!R
M+3$N,BXW+W)A;F1O;2]U;FEX.B!A<')?<F%N9&]M+FQO#0I/;FQY(&EN(&%P
M<BTQ+C(N-R]R86YD;VTO=6YI>#H@87!R7W)A;F1O;2YO#0I/;FQY(&EN(&%P
M<BTQ+C(N-R]R86YD;VTO=6YI>#H@<VAA,BYL;PT*3VYL>2!I;B!A<'(M,2XR
M+C<O<F%N9&]M+W5N:7@Z('-H83(N;PT*3VYL>2!I;B!A<'(M,2XR+C<O<F%N
M9&]M+W5N:7@Z('-H83)?9VQU92YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O<F%N
M9&]M+W5N:7@Z('-H83)?9VQU92YO#0I/;FQY(&EN(&%P<BTQ+C(N-R]S:&UE
M;2]O<S(Z('-H;2YL;PT*3VYL>2!I;B!A<'(M,2XR+C<O<VAM96TO;W,R.B!S
M:&TN;PT*3VYL>2!I;B!A<'(M,2XR+C<O<W1R:6YG<SH@87!R7V-P>7-T<FXN
M;&\-"D]N;'D@:6X@87!R+3$N,BXW+W-T<FEN9W,Z(&%P<E]C<'ES=')N+F\-
M"D]N;'D@:6X@87!R+3$N,BXW+W-T<FEN9W,Z(&%P<E]F;FUA=&-H+FQO#0I/
M;FQY(&EN(&%P<BTQ+C(N-R]S=')I;F=S.B!A<')?9FYM871C:"YO#0I/;FQY
M(&EN(&%P<BTQ+C(N-R]S=')I;F=S.B!A<')?<VYP<FEN=&8N;&\-"D]N;'D@
M:6X@87!R+3$N,BXW+W-T<FEN9W,Z(&%P<E]S;G!R:6YT9BYO#0I/;FQY(&EN
M(&%P<BTQ+C(N-R]S=')I;F=S.B!A<')?<W1R:6YG<RYL;PT*3VYL>2!I;B!A
M<'(M,2XR+C<O<W1R:6YG<SH@87!R7W-T<FEN9W,N;PT*3VYL>2!I;B!A<'(M
M,2XR+C<O<W1R:6YG<SH@87!R7W-T<FYA=&-M<"YL;PT*3VYL>2!I;B!A<'(M
M,2XR+C<O<W1R:6YG<SH@87!R7W-T<FYA=&-M<"YO#0I/;FQY(&EN(&%P<BTQ
M+C(N-R]S=')I;F=S.B!A<')?<W1R=&]K+FQO#0I/;FQY(&EN(&%P<BTQ+C(N
M-R]S=')I;F=S.B!A<')?<W1R=&]K+F\-"D]N;'D@:6X@87!R+3$N,BXW+W-U
M<'!O<G0O=6YI>#H@=V%I=&EO+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]S=7!P
M;W)T+W5N:7@Z('=A:71I;RYO#0I/;FQY(&EN(&%P<BTQ+C(N-R]T86)L97,Z
M(&%P<E]H87-H+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]T86)L97,Z(&%P<E]H
M87-H+F\-"D]N;'D@:6X@87!R+3$N,BXW+W1A8FQE<SH@87!R7W1A8FQE<RYL
M;PT*3VYL>2!I;B!A<'(M,2XR+C<O=&%B;&5S.B!A<')?=&%B;&5S+F\-"D]N
M;'D@:6X@87!R+3$N,BXW+W1E<W0O:6YT97)N86PZ($UA:V5F:6QE#0I/;FQY
M(&EN(&%P<BTQ+C(N-R]T97-T.B!-86ME9FEL90T*3VYL>2!I;B!A<'(M,2XR
M+C<O=&AR96%D<')O8R]O<S(Z('!R;V,N;&\-"D]N;'D@:6X@87!R+3$N,BXW
M+W1H<F5A9'!R;V,O;W,R.B!P<F]C+F\-"D]N;'D@:6X@87!R+3$N,BXW+W1H
M<F5A9'!R;V,O;W,R.B!S:6=N86QS+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]T
M:')E861P<F]C+V]S,CH@<VEG;F%L<RYO#0I/;FQY(&EN(&%P<BTQ+C(N-R]T
M:')E861P<F]C+V]S,CH@=&AR96%D+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]T
M:')E861P<F]C+V]S,CH@=&AR96%D+F\-"D]N;'D@:6X@87!R+3$N,BXW+W1H
M<F5A9'!R;V,O;W,R.B!T:')E861P<FEV+FQO#0I/;FQY(&EN(&%P<BTQ+C(N
M-R]T:')E861P<F]C+V]S,CH@=&AR96%D<')I=BYO#0ID:69F("UU<B!A<'(M
M,2XR+C<M9&ES="]T:')E861P<F]C+W5N:7@O<VEG;F%L<RYC(&%P<BTQ+C(N
M-R]T:')E861P<F]C+W5N:7@O<VEG;F%L<RYC#0HM+2T@87!R+3$N,BXW+61I
M<W0O=&AR96%D<')O8R]U;FEX+W-I9VYA;',N8PE&<FD@1F5B("`T(#$S.C0T
M.C`R(#(P,#4-"BLK*R!A<'(M,2XR+C<O=&AR96%D<')O8R]U;FEX+W-I9VYA
M;',N8PE3=6X@075G("`V(#$Y.C,V.C4P(#(P,#8-"D!`("TT-"PW("LT-"PV
M($!`#0H@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
M("`@("`@("`@("`@("!80U!47U-)1TY!3%]"4D5!2RDI.PT*("`@("!]#0H@
M(V5N9&EF("\J($]3,B`J+PT*+0T*("`@("!I9B`H:VEL;"AP<F]C+3YP:60L
M('-I9VYU;2D@/3T@+3$I('L-"B`@("`@("`@(')E='5R;B!E<G)N;SL-"B`@
M("`@?0T*0$`@+30Q-BPW("LT,34L-R!`0`T*("`@("!S:6=F:6QL<V5T*"9S
M:6=?;6%S:RD[#0H@("`@(')E;6]V95]S>6YC7W-I9W,H)G-I9U]M87-K*3L-
M"B`-"BTC:68@9&5F:6YE9"A324=04D]#34%32U]315137U1(4D5!1%]-05-+
M*2!\?"`A($%04E](05-?5$A214%$4PT**R-I9B!D969I;F5D*%-)1U!23T--
M05-+7U-%5%-?5$A214%$7TU!4TLI('Q\("$@05!27TA!4U]42%)%0413('Q\
M(&1E9FEN960H3U,R*0T*("`@("!I9B`H*')V(#T@<VEG<')O8VUA<VLH4TE'
M7U-%5$U!4TLL("9S:6=?;6%S:RP@3E5,3"DI("$](#`I('L-"B`@("`@("`@
M(')V(#T@97)R;F\[#0H@("`@('T-"D!`("TT-#(L-R`K-#0Q+#<@0$`-"B`-
M"B`@("`@<VEG861D<V5T*"9S:6=?;6%S:RP@<VEG;G5M*3L-"B`-"BTC:68@
M9&5F:6YE9"A324=04D]#34%32U]315137U1(4D5!1%]-05-+*2!\?"`A($%0
M4E](05-?5$A214%$4PT**R-I9B!D969I;F5D*%-)1U!23T--05-+7U-%5%-?
M5$A214%$7TU!4TLI('Q\("$@05!27TA!4U]42%)%0413('Q\(&1E9FEN960H
M3U,R*0T*("`@("!I9B`H*')V(#T@<VEG<')O8VUA<VLH4TE'7T),3T-++"`F
M<VEG7VUA<VLL($Y53$PI*2`A/2`P*2![#0H@("`@("`@("!R=B`](&5R<FYO
M.PT*("`@("!]#0I`0"`M-#8Y+#<@*S0V."PW($!`#0H@#0H@("`@('-I9V%D
M9'-E="@F<VEG7VUA<VLL('-I9VYU;2D[#0H@#0HM(VEF(&1E9FEN960H4TE'
M4%)/0TU!4TM?4T544U]42%)%041?34%32RD@?'P@(2!!4%)?2$%37U1(4D5!
M1%,-"BLC:68@9&5F:6YE9"A324=04D]#34%32U]315137U1(4D5!1%]-05-+
M*2!\?"`A($%04E](05-?5$A214%$4R!\?"!D969I;F5D*$]3,BD-"B`@("`@
M:68@*"AR=B`]('-I9W!R;V-M87-K*%-)1U]53D),3T-++"`F<VEG7VUA<VLL
M($Y53$PI*2`A/2`P*2![#0H@("`@("`@("!R=B`](&5R<FYO.PT*("`@("!]
M#0I/;FQY(&EN(&%P<BTQ+C(N-R]T:6UE+W5N:7@Z('1I;64N;&\-"D]N;'D@
M:6X@87!R+3$N,BXW+W1I;64O=6YI>#H@=&EM92YO#0I/;FQY(&EN(&%P<BTQ
M+C(N-R]T:6UE+W5N:7@Z('1I;65S='(N;&\-"D]N;'D@:6X@87!R+3$N,BXW
M+W1I;64O=6YI>#H@=&EM97-T<BYO#0I/;FQY(&EN(&%P<BTQ+C(N-R]U<V5R
M+W5N:7@Z(&=R;W5P:6YF;RYL;PT*3VYL>2!I;B!A<'(M,2XR+C<O=7-E<B]U
M;FEX.B!G<F]U<&EN9F\N;PT*9&EF9B`M=7(@87!R+3$N,BXW+61I<W0O=7-E
M<B]U;FEX+W5S97)I;F9O+F,@87!R+3$N,BXW+W5S97(O=6YI>"]U<V5R:6YF
M;RYC#0HM+2T@87!R+3$N,BXW+61I<W0O=7-E<B]U;FEX+W5S97)I;F9O+F,)
M5V5D($%U9R`R-"`P,SHT,CHR,"`R,#`U#0HK*RL@87!R+3$N,BXW+W5S97(O
M=6YI>"]U<V5R:6YF;RYC"5-U;B!!=6<@(#8@,3DZ,S8Z-3`@,C`P-@T*0$`@
M+3<W+#<@*S<W+#<@0$`-"B`@("`@:68@*"AR=B`](&=E='!W;F%M7W-A9F4H
M=7-E<FYA;64L("9P=RP@<'=B=68I*2`A/2!!4%)?4U5#0T534RD-"B`@("`@
M("`@(')E='5R;B!R=CL-"B`-"BTC:69D968@3U,R#0HK(VEF("AD969I;F5D
M*$]3,BDF)B%D969I;F5D*%]?24Y.3U1%2U],24)#7U\I*0T*("`@("`O*B!.
M965D('1O(&UA;G5A;&QY(&%D9"!U<V5R(&YA;64@9F]R($]3+S(@*B\-"B`@
M("`@*F1I<FYA;64@/2!A<')?<'-T<F-A="AP+"!P=RYP=U]D:7(L('!W+G!W
M7VYA;64L($Y53$PI.PT*("-E;'-E#0I/;FQY(&EN(&%P<BTQ+C(N-R]U<V5R
M+W5N:7@Z('5S97)I;F9O+FQO#0I/;FQY(&EN(&%P<BTQ+C(N-R]U<V5R+W5N
0:7@Z('5S97)I;F9O+F\-"FQO
`
end
Re: modphp problems with file >=64k - apr-1.2.7.patch [1/1]
Posted by Paul Smedley <pa...@smedleydot.info>.
G'day Garrett,
On Wed, 9 Aug 2006 13:41:29 UTC, "Garrett Rooney"
<ro...@electricjellyfish.net> wrote:
> On 8/9/06, Paul Smedley <pa...@smedleydot.info> wrote:
> > Hi Justin,
> >
> > On Mon, 7 Aug 2006 17:51:05 UTC, "Justin Erenkrantz"
> > <ju...@erenkrantz.com> wrote:
> >
> > > On 8/5/06, Paul Smedley <pa...@smedleydot.info> wrote:
> > > > I read the website on how to submit patches - submitted in bug report
> > > > 40193
> > >
> > > (Not aimed at you, but at whomever edited the contributing page on the
> > > APR site.)
> > >
> > > I think only submitting patches to Bugzilla is huge mistake. Patches
> > > should *always* be posted on-list. If folks want to *also* post them
> > > to Bugzilla, they can waste their time and do so. Bugzilla is not a
> > > place to store discussions around patches as it purposely moves
> > > development discussion off-list.
> > >
> > > If people are posting patches only to Bugzilla, I know that it's very
> > > unlikely that I'll ever see them or ever apply them. -- justin
> >
> > I'll also attach the patch here. I just didn't want to post patches
> > here if they were supposed to go to Bugzilla. Other groups can be
> > rather anal about patches ONLY going to something like Bugzilla :)
> >
> Could you please post patches as plain text?
Sorry - see below:
Only in apr-1.2.7: .libs
Only in apr-1.2.7: .make.dirs
Only in apr-1.2.7: apr-1-config
Only in apr-1.2.7: apr-config.out
Only in apr-1.2.7: apr.exp
Only in apr-1.2.7: apr.pc
Only in apr-1.2.7/atomic/unix: apr_atomic.lo
Only in apr-1.2.7/atomic/unix: apr_atomic.o
diff -ur apr-1.2.7-dist/build/aplibtool.c apr-1.2.7/build/aplibtool.c
--- apr-1.2.7-dist/build/aplibtool.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/build/aplibtool.c Sun Aug 6 19:22:46 2006
@@ -36,7 +36,7 @@
# define CC "gcc"
# define GEN_EXPORTS "emxexp"
# define DEF2IMPLIB_CMD "emximp"
-# define SHARE_SW "-Zdll -Zmtd"
+# define SHARE_SW "-Zdll -Zmap -Zmtd"
# define USE_OMF true
# define TRUNCATE_DLL_NAME
# define DYNAMIC_LIB_EXT "dll"
@@ -45,7 +45,7 @@
# if USE_OMF
/* OMF is the native format under OS/2 */
# define STATIC_LIB_EXT "lib"
-# define OBJECT_EXT "obj"
+# define OBJECT_EXT "o"
# define LIBRARIAN "emxomfar"
# else
/* but the alternative, a.out, can fork() which is sometimes
necessary */
Only in apr-1.2.7/build: aplibtool.c#
Only in apr-1.2.7/build: aplibtool.exe
Only in apr-1.2.7/build: apr_rules.mk
Only in apr-1.2.7/build: apr_rules.out
Only in apr-1.2.7/build/pkg: pkginfo
Only in apr-1.2.7: conf.cmd
Only in apr-1.2.7: config.log
Only in apr-1.2.7: config.nice
Only in apr-1.2.7: config.status
Only in apr-1.2.7: configure.lineno
Only in apr-1.2.7: configure.log
diff -ur apr-1.2.7-dist/dso/os2/dso.c apr-1.2.7/dso/os2/dso.c
--- apr-1.2.7-dist/dso/os2/dso.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/dso/os2/dso.c Sun Aug 6 19:46:54 2006
@@ -50,13 +50,23 @@
(*res_handle)->load_error = APR_SUCCESS;
(*res_handle)->failed_module = NULL;
- if ((rc = DosLoadModule(failed_module, sizeof(failed_module),
path, &handle)) != 0) {
+ rc = DosLoadModule(failed_module, sizeof(failed_module), path,
&handle);
+
+ if ((rc != 0)&&(rc!=87)) {
(*res_handle)->load_error = APR_FROM_OS_ERROR(rc);
(*res_handle)->failed_module = apr_pstrdup(ctx,
failed_module);
return APR_FROM_OS_ERROR(rc);
}
+ if (rc==87){
+ int rc2;
+ HMODULE handle2;
+ rc2=DosQueryModuleHandle(path,&handle2);
+ (*res_handle)->handle = handle2;
+ }
+ if (rc==0)
(*res_handle)->handle = handle;
+
apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup,
apr_pool_cleanup_null);
return APR_SUCCESS;
}
@@ -80,7 +90,16 @@
if (symname == NULL || ressym == NULL)
return APR_ESYMNOTFOUND;
- if ((rc = DosQueryProcAddr(handle->handle, 0, symname, &func)) !=
0) {
+#if defined(__INNOTEK_LIBC__)
+ void *retval;
+ char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2));
+ sprintf(symbol, "_%s", symname);
+ rc = DosQueryProcAddr(handle->handle, 0, symbol, &func);
+ free(symbol);
+#else
+ rc = DosQueryProcAddr(handle->handle, 0, symname, &func);
+#endif
+ if (rc != 0) {
handle->load_error = APR_FROM_OS_ERROR(rc);
return handle->load_error;
}
Only in apr-1.2.7/dso/os2: dso.lo
Only in apr-1.2.7/dso/os2: dso.o
Only in apr-1.2.7/dso/os2: t
Only in apr-1.2.7: export_vars.c
Only in apr-1.2.7: exports.c
Only in apr-1.2.7/file_io/os2: copy.lo
Only in apr-1.2.7/file_io/os2: copy.o
Only in apr-1.2.7/file_io/os2: dir.lo
Only in apr-1.2.7/file_io/os2: dir.o
Only in apr-1.2.7/file_io/os2: dir_make_recurse.lo
Only in apr-1.2.7/file_io/os2: dir_make_recurse.o
Only in apr-1.2.7/file_io/os2: fileacc.lo
Only in apr-1.2.7/file_io/os2: fileacc.o
Only in apr-1.2.7/file_io/os2: filedup.lo
Only in apr-1.2.7/file_io/os2: filedup.o
Only in apr-1.2.7/file_io/os2: filepath.lo
Only in apr-1.2.7/file_io/os2: filepath.o
Only in apr-1.2.7/file_io/os2: filepath_util.lo
Only in apr-1.2.7/file_io/os2: filepath_util.o
Only in apr-1.2.7/file_io/os2: filestat.lo
Only in apr-1.2.7/file_io/os2: filestat.o
Only in apr-1.2.7/file_io/os2: filesys.lo
Only in apr-1.2.7/file_io/os2: filesys.o
Only in apr-1.2.7/file_io/os2: flock.lo
Only in apr-1.2.7/file_io/os2: flock.o
Only in apr-1.2.7/file_io/os2: fullrw.lo
Only in apr-1.2.7/file_io/os2: fullrw.o
Only in apr-1.2.7/file_io/os2: maperrorcode.lo
Only in apr-1.2.7/file_io/os2: maperrorcode.o
Only in apr-1.2.7/file_io/os2: mktemp.lo
Only in apr-1.2.7/file_io/os2: mktemp.o
diff -ur apr-1.2.7-dist/file_io/os2/open.c
apr-1.2.7/file_io/os2/open.c
--- apr-1.2.7-dist/file_io/os2/open.c Wed Jun 29 05:34:38 2005
+++ apr-1.2.7/file_io/os2/open.c Sun Aug 6 19:36:34 2006
@@ -28,6 +28,13 @@
return apr_file_close(file);
}
+#ifdef __INNOTEK_LIBC__
+apr_status_t apr_unix_file_cleanup(void *thefile)
+{
+ apr_file_t *file = thefile;
+ return apr_file_close(file);
+}
+#endif
APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char
*fname, apr_int32_t flag, apr_fileperms_t perm, apr_pool_t *pool)
Only in apr-1.2.7/file_io/os2: open.lo
Only in apr-1.2.7/file_io/os2: open.o
Only in apr-1.2.7/file_io/os2: pipe.lo
Only in apr-1.2.7/file_io/os2: pipe.o
diff -ur apr-1.2.7-dist/file_io/os2/readwrite.c
apr-1.2.7/file_io/os2/readwrite.c
--- apr-1.2.7-dist/file_io/os2/readwrite.c Thu Feb 23 05:14:36 2006
+++ apr-1.2.7/file_io/os2/readwrite.c Sun Aug 6 19:36:18 2006
@@ -331,6 +331,58 @@
}
+/* Pull from unix code to start a sync up */
+#if (defined(__INNOTEK_LIBC__) || defined(__WATCOMC__) )
+
+struct apr_file_printf_data {
+ apr_vformatter_buff_t vbuff;
+ apr_file_t *fptr;
+ char *buf;
+};
+
+static int file_printf_flush(apr_vformatter_buff_t *buff)
+{
+ struct apr_file_printf_data *data = (struct apr_file_printf_data
*)buff;
+
+ if (apr_file_write_full(data->fptr, data->buf,
+ data->vbuff.curpos - data->buf, NULL)) {
+ return -1;
+ }
+
+ data->vbuff.curpos = data->buf;
+ return 0;
+}
+
+
+APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr,
+ const char *format, ...)
+{
+ struct apr_file_printf_data data;
+ va_list ap;
+ int count;
+
+ /* don't really need a HUGE_STRING_LEN anymore */
+ data.buf = malloc(HUGE_STRING_LEN);
+ if (data.buf == NULL) {
+ return -1;
+ }
+ data.vbuff.curpos = data.buf;
+ data.vbuff.endpos = data.buf + HUGE_STRING_LEN;
+ data.fptr = fptr;
+ va_start(ap, format);
+ count = apr_vformatter(file_printf_flush,
+ (apr_vformatter_buff_t *)&data, format,
ap);
+ /* apr_vformatter does not call flush for the last bits */
+ if (count >= 0) file_printf_flush((apr_vformatter_buff_t
*)&data);
+
+ va_end(ap);
+
+ free(data.buf);
+
+ return count;
+}
+
+#else
APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr,
const char *format, ...)
@@ -351,7 +403,7 @@
free(buf);
return (cc == APR_SUCCESS) ? len : -1;
}
-
+#endif
apr_status_t apr_file_check_read(apr_file_t *fd)
Only in apr-1.2.7/file_io/os2: readwrite.lo
Only in apr-1.2.7/file_io/os2: readwrite.o
Only in apr-1.2.7/file_io/os2: seek.lo
Only in apr-1.2.7/file_io/os2: seek.o
Only in apr-1.2.7/file_io/os2: tempdir.lo
Only in apr-1.2.7/file_io/os2: tempdir.o
diff -ur apr-1.2.7-dist/file_io/unix/mktemp.c
apr-1.2.7/file_io/unix/mktemp.c
--- apr-1.2.7-dist/file_io/unix/mktemp.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/file_io/unix/mktemp.c Sun Aug 6 19:36:50 2006
@@ -80,7 +80,9 @@
#include <fcntl.h>
#endif
#include <stdio.h>
+#ifndef __INNOTEK_LIBC__
#include <stdlib.h>
+#endif
#include <string.h>
#include <ctype.h>
#ifdef HAVE_TIME_H
@@ -188,6 +190,11 @@
#else
fd = mkstemp(template);
#endif
+
+#ifdef __INNOTEK_LIBC__
+ setmode(fd, O_BINARY);
+#endif
+
if (fd == -1) {
return errno;
Only in apr-1.2.7/include: apr.h
Only in apr-1.2.7/include: apr.patch
diff -ur apr-1.2.7-dist/include/apr_network_io.h
apr-1.2.7/include/apr_network_io.h
--- apr-1.2.7-dist/include/apr_network_io.h Sun Jun 12 11:54:50 2005
+++ apr-1.2.7/include/apr_network_io.h Sun Aug 6 19:36:50 2006
@@ -752,7 +752,7 @@
* Unset a socket from being inherited by child processes.
*/
APR_DECLARE_INHERIT_UNSET(socket);
-
+#ifndef __INNOTEK_LIBC__
/**
* @defgroup apr_mcast IP Multicast
* @{
@@ -814,6 +814,7 @@
APR_DECLARE(apr_status_t) apr_mcast_interface(apr_socket_t *sock,
apr_sockaddr_t *iface);
+#endif
/** @} */
/** @} */
diff -ur apr-1.2.7-dist/include/arch/os2/apr_arch_file_io.h
apr-1.2.7/include/arch/os2/apr_arch_file_io.h
--- apr-1.2.7-dist/include/arch/os2/apr_arch_file_io.h Sat Jul 16
02:07:42 2005
+++ apr-1.2.7/include/arch/os2/apr_arch_file_io.h Sun Aug 6 19:36:50
2006
@@ -29,7 +29,9 @@
* friendly & is part of the POSIX emulation rather than native so
don't
* use it.
*/
+#ifndef __INNOTEK_LIBC__
#undef HAVE_MKSTEMP
+#endif
#define APR_FILE_BUFSIZE 4096
@@ -45,7 +47,10 @@
int pipe;
HEV pipeSem;
enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
-
+#ifndef WAITIO_USES_POLL
+ /* if there is a timeout set, then this pollset is used */
+ apr_pollset_t *pollset;
+#endif
/* Stuff for buffered mode */
char *buffer;
int bufpos; // Read/Write position in buffer
@@ -62,6 +67,11 @@
FILEFINDBUF3 entry;
int validentry;
};
+
+#ifdef __INNOTEK_LIBC__
+apr_status_t apr_unix_file_cleanup(void *);
+#endif
+
apr_status_t apr_file_cleanup(void *);
apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE
os2date,
Only in apr-1.2.7/include/arch/unix: apr_private.h
Only in apr-1.2.7: libapr-1.la
diff -ur apr-1.2.7-dist/locks/os2/proc_mutex.c
apr-1.2.7/locks/os2/proc_mutex.c
--- apr-1.2.7-dist/locks/os2/proc_mutex.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/locks/os2/proc_mutex.c Sun Aug 6 19:36:50 2006
@@ -115,6 +115,13 @@
new->owner = 0;
new->lock_count = 0;
+#ifdef __INNOTEK_LIBC__
+ if (!fname) {
+ /* Reinitializing unnamed mutexes is a noop in the Unix code.
*/
+ return APR_SUCCESS;
+ }
+#endif
+
semname = fixed_name(fname, pool);
rc = DosOpenMutexSem(semname, &(new->hMutex));
*mutex = new;
Only in apr-1.2.7/locks/os2: proc_mutex.lo
Only in apr-1.2.7/locks/os2: proc_mutex.o
Only in apr-1.2.7/locks/os2: thread_cond.lo
Only in apr-1.2.7/locks/os2: thread_cond.o
Only in apr-1.2.7/locks/os2: thread_mutex.lo
Only in apr-1.2.7/locks/os2: thread_mutex.o
Only in apr-1.2.7/locks/os2: thread_rwlock.lo
Only in apr-1.2.7/locks/os2: thread_rwlock.o
Only in apr-1.2.7: log
Only in apr-1.2.7: Makefile
Only in apr-1.2.7/memory/unix: apr_pools.lo
Only in apr-1.2.7/memory/unix: apr_pools.o
Only in apr-1.2.7/misc/unix: charset.lo
Only in apr-1.2.7/misc/unix: charset.o
Only in apr-1.2.7/misc/unix: env.lo
Only in apr-1.2.7/misc/unix: env.o
Only in apr-1.2.7/misc/unix: errorcodes.lo
Only in apr-1.2.7/misc/unix: errorcodes.o
Only in apr-1.2.7/misc/unix: getopt.lo
Only in apr-1.2.7/misc/unix: getopt.o
Only in apr-1.2.7/misc/unix: otherchild.lo
Only in apr-1.2.7/misc/unix: otherchild.o
Only in apr-1.2.7/misc/unix: rand.lo
Only in apr-1.2.7/misc/unix: rand.o
diff -ur apr-1.2.7-dist/misc/unix/randbyte_os2.inc
apr-1.2.7/misc/unix/randbyte_os2.inc
--- apr-1.2.7-dist/misc/unix/randbyte_os2.inc Tue Jun 14 08:11:30 2005
+++ apr-1.2.7/misc/unix/randbyte_os2.inc Sun Aug 6 19:36:50 2006
@@ -62,8 +62,10 @@
* which is why it's run-time linked.
*/
+#ifndef __INNOTEK_LIBC__
static APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG
ulParm1,
ULONG ulParm2, ULONG
ulParm3) = NULL;
+#endif
static HMODULE hDoscalls = 0;
#define CMD_KI_RDCNT (0x63)
@@ -85,6 +87,7 @@
CPUUTIL util;
int c;
+#ifndef __INNOTEK_LIBC__
if (hDoscalls == 0) {
char failed_module[20];
ULONG rc;
@@ -111,7 +114,7 @@
DosPerfSysCall = NULL;
}
}
-
+#endif
return byte;
}
Only in apr-1.2.7/misc/unix: start.lo
Only in apr-1.2.7/misc/unix: start.o
Only in apr-1.2.7/misc/unix: version.lo
Only in apr-1.2.7/misc/unix: version.o
Only in apr-1.2.7/mmap/unix: common.lo
Only in apr-1.2.7/mmap/unix: common.o
Only in apr-1.2.7/mmap/unix: mmap.lo
Only in apr-1.2.7/mmap/unix: mmap.o
Only in apr-1.2.7/network_io/os2: inet_ntop.lo
Only in apr-1.2.7/network_io/os2: inet_ntop.o
Only in apr-1.2.7/network_io/os2: inet_pton.lo
Only in apr-1.2.7/network_io/os2: inet_pton.o
Only in apr-1.2.7/network_io/os2: os2calls.lo
Only in apr-1.2.7/network_io/os2: os2calls.o
diff -ur apr-1.2.7-dist/network_io/os2/sendrecv.c
apr-1.2.7/network_io/os2/sendrecv.c
--- apr-1.2.7-dist/network_io/os2/sendrecv.c Wed Jan 4 20:09:00 2006
+++ apr-1.2.7/network_io/os2/sendrecv.c Sun Aug 6 19:36:50 2006
@@ -27,9 +27,11 @@
apr_ssize_t rv;
int fds, err = 0;
+#ifndef __INNOTEK_LIBC__
if (*len > 65536) {
*len = 65536;
}
+#endif
do {
if (!sock->nonblock || err == SOCEWOULDBLOCK) {
@@ -114,11 +116,17 @@
int fds, err = 0;
int nv_tosend, total = 0;
+#ifndef __INNOTEK_LIBC__
/* Make sure writev() only gets fed 64k at a time */
for ( nv_tosend = 0; nv_tosend < nvec && total +
vec[nv_tosend].iov_len < 65536; nv_tosend++ ) {
total += vec[nv_tosend].iov_len;
}
-
+#else
+ /* workaround for writev() not required with libc */
+ for ( nv_tosend = 0; nv_tosend < nvec; nv_tosend++ ) {
+ total += vec[nv_tosend].iov_len;
+ }
+#endif
tmpvec = alloca(sizeof(struct iovec) * nv_tosend);
memcpy(tmpvec, vec, sizeof(struct iovec) * nv_tosend);
Only in apr-1.2.7/network_io/os2: sendrecv.lo
Only in apr-1.2.7/network_io/os2: sendrecv.o
Only in apr-1.2.7/network_io/os2: sendrecv_udp.lo
Only in apr-1.2.7/network_io/os2: sendrecv_udp.o
Only in apr-1.2.7/network_io/os2: sockaddr.lo
Only in apr-1.2.7/network_io/os2: sockaddr.o
Only in apr-1.2.7/network_io/os2: sockets.lo
Only in apr-1.2.7/network_io/os2: sockets.o
diff -ur apr-1.2.7-dist/network_io/os2/sockopt.c
apr-1.2.7/network_io/os2/sockopt.c
--- apr-1.2.7-dist/network_io/os2/sockopt.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/network_io/os2/sockopt.c Sun Aug 6 19:36:50 2006
@@ -24,7 +24,9 @@
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
+#ifndef __INNOTEK_LIBC__
#include <unistd.h>
+#endif
#include <netdb.h>
#include <sys/so_ioctl.h>
Only in apr-1.2.7/network_io/os2: sockopt.lo
Only in apr-1.2.7/network_io/os2: sockopt.o
Only in apr-1.2.7/passwd: apr_getpass.lo
Only in apr-1.2.7/passwd: apr_getpass.o
Only in apr-1.2.7: patch.log
Only in apr-1.2.7/poll/os2: poll.lo
Only in apr-1.2.7/poll/os2: poll.o
Only in apr-1.2.7/poll/os2: pollset.lo
Only in apr-1.2.7/poll/os2: pollset.o
Only in apr-1.2.7/random/unix: apr_random.lo
Only in apr-1.2.7/random/unix: apr_random.o
Only in apr-1.2.7/random/unix: sha2.lo
Only in apr-1.2.7/random/unix: sha2.o
Only in apr-1.2.7/random/unix: sha2_glue.lo
Only in apr-1.2.7/random/unix: sha2_glue.o
Only in apr-1.2.7/shmem/os2: shm.lo
Only in apr-1.2.7/shmem/os2: shm.o
Only in apr-1.2.7/strings: apr_cpystrn.lo
Only in apr-1.2.7/strings: apr_cpystrn.o
Only in apr-1.2.7/strings: apr_fnmatch.lo
Only in apr-1.2.7/strings: apr_fnmatch.o
Only in apr-1.2.7/strings: apr_snprintf.lo
Only in apr-1.2.7/strings: apr_snprintf.o
Only in apr-1.2.7/strings: apr_strings.lo
Only in apr-1.2.7/strings: apr_strings.o
Only in apr-1.2.7/strings: apr_strnatcmp.lo
Only in apr-1.2.7/strings: apr_strnatcmp.o
Only in apr-1.2.7/strings: apr_strtok.lo
Only in apr-1.2.7/strings: apr_strtok.o
Only in apr-1.2.7/support/unix: waitio.lo
Only in apr-1.2.7/support/unix: waitio.o
Only in apr-1.2.7/tables: apr_hash.lo
Only in apr-1.2.7/tables: apr_hash.o
Only in apr-1.2.7/tables: apr_tables.lo
Only in apr-1.2.7/tables: apr_tables.o
Only in apr-1.2.7/test/internal: Makefile
Only in apr-1.2.7/test: Makefile
Only in apr-1.2.7/threadproc/os2: proc.lo
Only in apr-1.2.7/threadproc/os2: proc.o
Only in apr-1.2.7/threadproc/os2: signals.lo
Only in apr-1.2.7/threadproc/os2: signals.o
Only in apr-1.2.7/threadproc/os2: thread.lo
Only in apr-1.2.7/threadproc/os2: thread.o
Only in apr-1.2.7/threadproc/os2: threadpriv.lo
Only in apr-1.2.7/threadproc/os2: threadpriv.o
diff -ur apr-1.2.7-dist/threadproc/unix/signals.c
apr-1.2.7/threadproc/unix/signals.c
--- apr-1.2.7-dist/threadproc/unix/signals.c Fri Feb 4 13:44:02 2005
+++ apr-1.2.7/threadproc/unix/signals.c Sun Aug 6 19:36:50 2006
@@ -44,7 +44,6 @@
XCPT_SIGNAL_BREAK));
}
#endif /* OS2 */
-
if (kill(proc->pid, signum) == -1) {
return errno;
}
@@ -416,7 +415,7 @@
sigfillset(&sig_mask);
remove_sync_sigs(&sig_mask);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS ||
defined(OS2)
if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
rv = errno;
}
@@ -442,7 +441,7 @@
sigaddset(&sig_mask, signum);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS ||
defined(OS2)
if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
rv = errno;
}
@@ -469,7 +468,7 @@
sigaddset(&sig_mask, signum);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS ||
defined(OS2)
if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
rv = errno;
}
Only in apr-1.2.7/time/unix: time.lo
Only in apr-1.2.7/time/unix: time.o
Only in apr-1.2.7/time/unix: timestr.lo
Only in apr-1.2.7/time/unix: timestr.o
Only in apr-1.2.7/user/unix: groupinfo.lo
Only in apr-1.2.7/user/unix: groupinfo.o
diff -ur apr-1.2.7-dist/user/unix/userinfo.c
apr-1.2.7/user/unix/userinfo.c
--- apr-1.2.7-dist/user/unix/userinfo.c Wed Aug 24 03:42:20 2005
+++ apr-1.2.7/user/unix/userinfo.c Sun Aug 6 19:36:50 2006
@@ -77,7 +77,7 @@
if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS)
return rv;
-#ifdef OS2
+#if (defined(OS2)&&!defined(__INNOTEK_LIBC__))
/* Need to manually add user name for OS/2 */
*dirname = apr_pstrcat(p, pw.pw_dir, pw.pw_name, NULL);
#else
Only in apr-1.2.7/user/unix: userinfo.lo
Only in apr-1.2.7/user/unix: userinfo.o
--
Cheers,
Paul.
Re: modphp problems with file >=64k - apr-1.2.7.patch [1/1]
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 8/9/06, Paul Smedley <pa...@smedleydot.info> wrote:
> Hi Justin,
>
> On Mon, 7 Aug 2006 17:51:05 UTC, "Justin Erenkrantz"
> <ju...@erenkrantz.com> wrote:
>
> > On 8/5/06, Paul Smedley <pa...@smedleydot.info> wrote:
> > > I read the website on how to submit patches - submitted in bug report
> > > 40193
> >
> > (Not aimed at you, but at whomever edited the contributing page on the
> > APR site.)
> >
> > I think only submitting patches to Bugzilla is huge mistake. Patches
> > should *always* be posted on-list. If folks want to *also* post them
> > to Bugzilla, they can waste their time and do so. Bugzilla is not a
> > place to store discussions around patches as it purposely moves
> > development discussion off-list.
> >
> > If people are posting patches only to Bugzilla, I know that it's very
> > unlikely that I'll ever see them or ever apply them. -- justin
>
> I'll also attach the patch here. I just didn't want to post patches
> here if they were supposed to go to Bugzilla. Other groups can be
> rather anal about patches ONLY going to something like Bugzilla :)
>
> --
> Cheers,
>
> Paul.
>
> begin 666 apr-1.2.7.patch
> M3VYL>2!I;B!A<'(M,2XR+C<Z("YL:6)S#0I/;FQY(&EN(&%P<BTQ+C(N-SH@
> M+FUA:V4N9&ER<PT*3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BTQ+6-O;F9I9PT*
> M3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BUC;VYF:6<N;W5T#0I/;FQY(&EN(&%P
> M<BTQ+C(N-SH@87!R+F5X<`T*3VYL>2!I;B!A<'(M,2XR+C<Z(&%P<BYP8PT*
Could you please post patches as plain text?
-garrett