Re: Bug #2229 Updated: Unable to restore magic_quotes_gpc
| From: | Kirill Maximov | Date: | Wed, 08 Sep 1999 08:11:17 +0000 |
| Subject: | Re: Bug #2229 Updated: Unable to restore magic_quotes_gpc | ||
| References: | 1 2 | Groups: | php.dev |
| Request: | Send a blank email to php-dev+get-10691@lists.php.net to get a copy of this message | ||
On Tue, Sep 07, 1999 at 09:55:46AM -0400, Rasmus Lerdorf wrote:
Anyway, I got a solution for the problem using this small patch
to mod_php3.c. I would appreciate if you explain me
what could be wrong with it.
Best regards,
KIR
--
----- ----- ----- ----- ----- ----- ----- -----
Kirill Maximov; support@itc.rus.net ICQ: 14796643
PGP public key: finger://autobahn.itc.rus.net
Index: mod_php3.c =================================================================== RCS file: /repository/php3/mod_php3.c,v retrieving revision 1.92 diff -c -r1.92 mod_php3.c *** mod_php3.c 1999/05/22 15:27:46 1.92 --- mod_php3.c 1999/09/08 07:48:41 *************** *** 294,301 **** /* Start with the base config */ memcpy(new,base,sizeof(php3_ini_structure)); ! /* Now, add any fields that have changed in *add compared to the master config */ if (add->smtp != orig.smtp) new->smtp = add->smtp; if (add->sendmail_path != orig.sendmail_path) new->sendmail_path = add->sendmail_path; if (add->sendmail_from != orig.sendmail_from) new->sendmail_from = add->sendmail_from; --- 294,302 ---- /* Start with the base config */ memcpy(new,base,sizeof(php3_ini_structure)); + orig = *((php3_ini_structure *)base); ! /* Now, add any fields that have changed in *add compared to the base config */ if (add->smtp != orig.smtp) new->smtp = add->smtp; if (add->sendmail_path != orig.sendmail_path) new->sendmail_path = add->sendmail_path; if (add->sendmail_from != orig.sendmail_from) new->sendmail_from = add->sendmail_from;
Index: mod_php3.c =================================================================== RCS file: /repository/php3/mod_php3.c,v retrieving revision 1.92 diff -c -r1.92 mod_php3.c *** mod_php3.c 1999/05/22 15:27:46 1.92 --- mod_php3.c 1999/09/08 07:48:41 *************** *** 294,301 **** /* Start with the base config */ memcpy(new,base,sizeof(php3_ini_structure)); ! /* Now, add any fields that have changed in *add compared to the master config */ if (add->smtp != orig.smtp) new->smtp = add->smtp; if (add->sendmail_path != orig.sendmail_path) new->sendmail_path = add->sendmail_path; if (add->sendmail_from != orig.sendmail_from) new->sendmail_from = add->sendmail_from; --- 294,302 ---- /* Start with the base config */ memcpy(new,base,sizeof(php3_ini_structure)); + orig = *((php3_ini_structure *)base); ! /* Now, add any fields that have changed in *add compared to the base config */ if (add->smtp != orig.smtp) new->smtp = add->smtp; if (add->sendmail_path != orig.sendmail_path) new->sendmail_path = add->sendmail_path; if (add->sendmail_from != orig.sendmail_from) new->sendmail_from = add->sendmail_from;