Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:16165
Return-Path: <hgrunw@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 83453 invoked by uid 1010); 5 May 2005 11:43:09 -0000
Delivered-To: ezmlm-scan-internals@lists.php.net
Delivered-To: ezmlm-internals@lists.php.net
Received: (qmail 52494 invoked from network); 5 May 2005 11:23:59 -0000
Received: from unknown (HELO pb1.pair.com) (127.0.0.1)
  by localhost with SMTP; 5 May 2005 11:23:59 -0000
X-Host-Fingerprint: 64.233.184.200 wproxy.gmail.com Linux 2.4/2.6
Received: from ([64.233.184.200:25629] helo=wproxy.gmail.com)
	by pb1.pair.com (ecelerity 1.2.12rc1 r(5476:5477)) with SMTP
	id 78/F3-00155-F420A724 for <internals@lists.php.net>; Thu, 05 May 2005 07:23:59 -0400
Received: by wproxy.gmail.com with SMTP id 37so435117wra
	for <internals@lists.php.net>; Thu, 05 May 2005 04:23:54 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
	s=beta; d=gmail.com;
	h=received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=es8BLhUyWKuBcO+1A6qnFkaLDCDvIKuInVVxHC5z2CCESyH46f4GnW+alh+kQS6syNRwfhmu1binY+GbH/F/wLX/qVUECBwhN9jQyxvZRVKt8mQlfp+IJvNvs50aFMByJk16T+bEqO2hWJIK31+u3U/JjkN084iv8/L5Q8sO5MI=
Received: by 10.54.29.40 with SMTP id c40mr125895wrc;
	Thu, 05 May 2005 04:17:14 -0700 (PDT)
Received: by 10.54.109.15 with HTTP; Thu, 5 May 2005 04:17:14 -0700 (PDT)
Message-ID: <9f0a78fc05050504172178b317@mail.gmail.com>
Date: Thu, 5 May 2005 16:47:14 +0530
Reply-To: Herbert Grunwald <hgrunw@gmail.com>
To: internals@lists.php.net
In-Reply-To: <9f0a78fc05050409492a339d4f@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <OF58A456F1.634FCBAA-ON80256FF7.00497C6D@d-h.co.uk>
	<9f0a78fc05050409492a339d4f@mail.gmail.com>
Subject: Re: [PHP-DEV] php.ini
From: hgrunw@gmail.com (Herbert Grunwald)

I propose the following trivial patches to PHP5 to resolve the problem.

1) Registry based fix:

diff -Nurp win32.orig\registry.c win32\registry.c
--- win32.orig\registry.c=09Mon Mar 14 18:12:56 2005
+++ win32\registry.c=09Thu May 05 13:47:40 2005
@@ -1,7 +1,7 @@
 #include "php.h"
 #include "php_ini.h"
=20
-#define PHP_REGISTRY_KEY "SOFTWARE\\PHP"
+#define PHP_REGISTRY_KEY "SOFTWARE\\PHP5"
=20
 void UpdateIniFromRegistry(char *path TSRMLS_DC)
 {

2) PHPRC / PHP5RC env. variable

diff -Nurp main.orig\php_ini.c main\php_ini.c
--- main.orig\php_ini.c=09Fri Sep 17 08:18:48 2004
+++ main\php_ini.c=09Thu May 05 13:56:32 2005
@@ -290,9 +290,11 @@ int php_init_config()
 =09safe_mode_state =3D PG(safe_mode);
 =09open_basedir =3D PG(open_basedir);
=20
-=09env_location =3D getenv("PHPRC");
+=09env_location =3D getenv("PHP5RC");
 =09if (!env_location) {
-=09=09env_location =3D "";
+=09=09env_location =3D getenv("PHPRC");
+=09=09if (!env_location)
+=09=09=09env_location =3D "";
 =09}
 =09if (sapi_module.php_ini_path_override) {
 =09=09php_ini_search_path =3D sapi_module.php_ini_path_override;