I've recently opened a bug report #35243, and was requested to send the patch in unified diff format to this list. Here it is, as requested, both in plaintext, and uuencoded (in case the mailer really messes things up).
I'd appreciate any feedback, as this is my first time posting a patch.
Thanks,
David Oren
uuencoded:
begin 666 patch-35243.diff
M+2TM("XO97AT+W-T86YD87)D+V)A<VEC7V9U;F-T:6]N<RYC("@(#(P,#4M M,3$M,38@,3$Z,S0Z,C0N,#P,#P,#P("LP,CP#0HK*RL@+BXO<&AP-2TR M,#U,3$Q-SS,SM<&%T8VAE9"]E>'0O<W1A;F1A<F0O8F%S:6-?9G5N8W1I
M;VYS+F,@,CP-2TQ,2TQ-RP.#HP-3HR,2XP,#P,#P,#@*SR,#-"D!
M("TY-30L-BK.34T+#$P($!#0H@("@("@(&UE;7-E="@F0D<H=7)L7V%D
M87!T7W-T871E2P@,"P@<VEZ96]F$)''5R;%]A9&%P=%]S=&%T92DI3L-
M"B@("@("@;65M<V5T*"9"1RAU<FQ?861A<'1?<W1A=&5?97@I+"P+"!S
M:7IE;V8H0D<H=7)L7V%D87!T7W-T871E7V5X2DI.PT("-"BLC:68@9&5F M:6YE9"A?4D5%3E1204Y4*2F)B!D969I;F5D*$A!5D5?34)23$5.2F)B!D M969I;F5D*$A!5D5?34)35$%415]4*0T**R@("@("!M96US970H)D)'*&UB M;&5N7W-T871E*2P@,"P@<VEZ96]F*$)'*&UB;&5N7W-T871E*2DI.PT**R-E M;F1I9@T**PT*("@("@("!"1RAI;F-O;7!L971E7V-L87-S*2]('!H<%]C
G<F5A=&5?:6YC;VUP;&5T95]C;&%S<RA44U)-3%-?0RD[#0H@?0T
`
end
plaintext:
--- ./ext/standard/basic_functions.c 2005-11-16 11:34:24.000000000 +0200
+++ ../php5-200511170330-patched/ext/standard/basic_functions.c 2005-11-17 08:05:21.000000000 +0200
@@ -954,6 +954,10 @@
memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state)));
memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex)));
+#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
-
memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
+#endif
-
BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
}
Join Excite! - http://www.excite.com
The most personalized portal on the Web!
Please send patches as plain text MIME attachments, and ideally
include a URL where it can be downloaded as well.
--Wez.
I've recently opened a bug report #35243, and was requested to send the patch in unified diff format to this list. Here it is, as requested, both in plaintext, and uuencoded (in case the mailer really messes things up).
I'd appreciate any feedback, as this is my first time posting a patch.
Thanks,
David Oren
uuencoded:
begin 666 patch-35243.diff
M+2TM("XO97AT+W-T86YD87)D+V)A<VEC7V9U;F-T:6]N<RYC("`@(#(P,#4M
M,3$M,38@,3$Z,S0Z,C0N,#
P,#P,#P("LP,CP#0HK*RL@+BXO<&AP-2TRM,#
U,3$Q-SS,S`M<&%T8VAE9"]E>'0O<W1A;F1A<F0O8F%S:6-?9G5N8W1IM;VYS+F,@,C
P-2TQ,2TQ-RP.#HP-3HR,2XP,#P,#P,#@*SR,#-"D!M("TY-30L-B
K.34T+#$P($!#0H@("@("@(&UE;7-E="@F0D<H=7)L7V%DM87!T7W-T871E2P@,"P@<VEZ96]F$)''5R;%]A9&%P=%]S=&%T92DI3L-
M"B
@("@("@;65M<V5T*"9"1RAU<FQ?861A<'1?<W1A=&5?97@I+"P+"!SM:7IE;V8H0D<H=7)L7V%D87!T7W-T871E7V5X2DI.PT("`-"BLC:68@9&5F
M:6YE9"A?4D5%3E1204Y4*2
F)B!D969I;F5D*$A!5D5?34)23$5.*2F)B!DM969I;F5D*$A!5D5?34)35$%415]40TR
@("@("!M96US970H)D)'&UBM;&5N7W-T871E2P@,"P@<VEZ96]F$)'&UB;&5N7W-T871E2DI.PT**R-E
M;F1I9@TPT("
@("@("!"1RAI;F-O;7!L971E7V-L87-S2`]('!H<%]CG<F5A=&5?:6YC;VUP;&5T95]C;&%S<RA44U)-3%-?0RD[#0H@?0T*
`
end
plaintext:
--- ./ext/standard/basic_functions.c 2005-11-16 11:34:24.000000000 +0200
+++ ../php5-200511170330-patched/ext/standard/basic_functions.c 2005-11-17 08:05:21.000000000 +0200
@@ -954,6 +954,10 @@
memset(&BG(url_adapt_state), 0, sizeof(BG(url_adapt_state))); memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex)));+#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));+#endif
BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);}
Join Excite! - http://www.excite.com
The most personalized portal on the Web!