Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:3583
Return-Path: <steph@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 47673 invoked from network); 23 Jul 2003 21:28:26 -0000
Received: from unknown (HELO mta3-svc.business.ntl.com) (62.253.164.43)
  by pb1.pair.com with SMTP; 23 Jul 2003 21:28:26 -0000
Received: from p2q4w7 ([80.1.19.57]) by mta3-svc.business.ntl.com
          (InterMail vM.4.01.03.37 201-229-121-137-20020806) with SMTP
          id <20030723212825.UVFL5914.mta3-svc.business.ntl.com@p2q4w7>
          for <internals@lists.php.net>; Wed, 23 Jul 2003 22:28:25 +0100
Message-ID: <004e01c3516a$17f63320$461b0150@p2q4w7>
Reply-To: "Steph" <steph.fox@virgin.net>
To: <internals@lists.php.net>
Date: Wed, 23 Jul 2003 22:30:59 -0000
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_004B_01C3516A.173D9180"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.50.4522.1200
X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4522.1200
Subject: Fw: [PHP-DEV] small patch (fixes #19613)
From: steph@php.net ("Steph")

------=_NextPart_000_004B_01C3516A.173D9180
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

ok, now let's try it _with_ attachments ..
!
----- Original Message -----
From: "Steph" <steph@php.net>
To: <internals@lists.php.net>
Sent: Wednesday, July 23, 2003 10:27 PM
Subject: [PHP-DEV] small patch (fixes #19613)


> It took 180 times longer to test this than it did to fix it ..
>
> Please can someone check the test file, I'm not sure what the protocol
> is when the expected results are different on win32 and *nix.  (or
what
> SHLIB_SUFFIX macos uses, come to that!)
>
>


------------------------------------------------------------------------
--------


> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php

------=_NextPart_000_004B_01C3516A.173D9180
Content-Type: text/plain;
	name="basicfunctions.diff.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="basicfunctions.diff.txt"

--- current_basic_functions.c	2003-07-23 22:18:26.000000000 +0000=0A=
+++ basic_functions.c	2003-07-23 22:19:10.000000000 +0000=0A=
@@ -1335,14 +1335,16 @@=0A=
 	convert_to_string_ex(str);=0A=
 =0A=
 	if (Z_STRVAL_PP(str) && *(Z_STRVAL_PP(str))) {=0A=
-		char *p, **env;=0A=
+		char *p =3D NULL, **env;=0A=
 		putenv_entry pe;=0A=
 =0A=
 		pe.putenv_string =3D estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));=0A=
 		pe.key =3D estrndup(Z_STRVAL_PP(str), Z_STRLEN_PP(str));=0A=
+		#ifndef PHP_WIN32=0A=
 		if ((p =3D strchr(pe.key, '=3D'))) {	/* nullify the '=3D' if there is =
one */=0A=
 			*p =3D '\0';=0A=
 		}=0A=
+		#endif=0A=
 		pe.key_len =3D strlen(pe.key);=0A=
 =0A=
 		if (PG(safe_mode)) {=0A=

------=_NextPart_000_004B_01C3516A.173D9180
Content-Type: text/plain;
	name="bug19613.phpt.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="bug19613.phpt.txt"

--TEST--=0A=
Bug #19613 (putenv("VAR=3D") does not empty VAR on win32)=0A=
--FILE--=0A=
<?php=0A=
=0A=
function test_system_env($test) {=0A=
=0A=
	var_dump($test);=0A=
=0A=
	if(PHP_SHLIB_SUFFIX =3D=3D 'dll') {=0A=
		system("echo %TEST%");=0A=
	}=0A=
	else {=0A=
		system("echo $TEST");=0A=
		}=0A=
	}=0A=
=0A=
putenv("TEST=3Dresult");=0A=
$test =3D getenv("TEST");=0A=
test_system_env($test);=0A=
=0A=
putenv("TEST=3D");=0A=
$test =3D getenv("TEST");=0A=
test_system_env($test);=0A=
=0A=
?>=0A=
--EXPECT--=0A=
(on win32)=0A=
string(6) "result"=0A=
result=0A=
bool(false)=0A=
ECHO is on=0A=
=0A=
(on *nix)=0A=
string(6) "result"=0A=
result=0A=
string(0)=0A=
=0A=

------=_NextPart_000_004B_01C3516A.173D9180--