[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2007-06-01 Thread Antony Dovgal
tony2001Fri Jun  1 10:02:41 2007 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fix #39330 (apache2handler does not call shutdown actions before apache child 
die)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.82&r2=1.83&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.82 
php-src/sapi/apache2handler/sapi_apache2.c:1.83
--- php-src/sapi/apache2handler/sapi_apache2.c:1.82 Wed Feb  7 09:35:09 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Jun  1 10:02:41 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.82 2007/02/07 09:35:09 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.83 2007/06/01 10:02:41 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -646,11 +646,17 @@
return OK;
 }
 
+static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
+{
+   apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, 
apr_pool_cleanup_null);
+}
+
 void php_ap2_register_hook(apr_pool_t *p)
 {
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(php_apache_server_startup, NULL, NULL, 
APR_HOOK_MIDDLE);
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
+   ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/apache2handler sapi_apache2.c

2007-06-01 Thread Antony Dovgal
tony2001Fri Jun  1 10:04:06 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: fix #39330 (apache2handler does not call shutdown actions before apache 
child die)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.747&r2=1.2027.2.547.2.748&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.747 php-src/NEWS:1.2027.2.547.2.748
--- php-src/NEWS:1.2027.2.547.2.747 Wed May 30 18:48:58 2007
+++ php-src/NEWSFri Jun  1 10:04:05 2007
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.4
+- Fixed bug #39330 (apache2handler does not call shutdown actions before 
+  apache child die). (isk at ecommerce dot com, Gopal, Tony)
 
 31 May 2007, PHP 5.2.3
 - Changed CGI install target to php-cgi and 'make install' to install CLI
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.13&r2=1.57.2.10.2.14&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.13 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.14
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.13   Mon Jan  1 
09:36:12 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Jun  1 10:04:06 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.13 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.14 2007/06/01 10:04:06 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -651,11 +651,17 @@
return OK;
 }
 
+static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
+{
+   apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, 
apr_pool_cleanup_null);
+}
+
 void php_ap2_register_hook(apr_pool_t *p)
 {
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(php_apache_server_startup, NULL, NULL, 
APR_HOOK_MIDDLE);
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
+   ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions bug41518.phpt /main fopen_wrappers.c

2007-06-01 Thread Antony Dovgal
tony2001Fri Jun  1 13:33:48 2007 UTC

  Added files: 
/php-src/ext/standard/tests/general_functions   bug41518.phpt 

  Modified files:  
/php-src/main   fopen_wrappers.c 
  Log:
  fix #41518 (file_exists() warns of open_basedir restriction on non-existent 
file)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.193&r2=1.194&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.193 php-src/main/fopen_wrappers.c:1.194
--- php-src/main/fopen_wrappers.c:1.193 Wed Apr 18 11:59:03 2007
+++ php-src/main/fopen_wrappers.c   Fri Jun  1 13:33:48 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.193 2007/04/18 11:59:03 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.194 2007/06/01 13:33:48 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -229,8 +229,8 @@
}
}
 
+   resolved_name_len = strlen(resolved_name);
if (path_tmp[path_len - 1] == PHP_DIR_SEPARATOR) {
-   resolved_name_len = strlen(resolved_name);
if (resolved_name[resolved_name_len - 1] != 
PHP_DIR_SEPARATOR) {
resolved_name[resolved_name_len] = 
PHP_DIR_SEPARATOR;
resolved_name[++resolved_name_len] = '\0';
@@ -246,6 +246,16 @@
/* File is in the right directory */
return 0;
} else {
+   /* /openbasedir/ and /openbasedir are the same 
directory */
+   if (resolved_basedir_len == (resolved_name_len + 1) && 
resolved_basedir[resolved_basedir_len - 1] == PHP_DIR_SEPARATOR) {
+#if defined(PHP_WIN32) || defined(NETWARE)
+   if (strncasecmp(resolved_basedir, 
resolved_name, resolved_name_len) == 0) {
+#else
+   if (strncmp(resolved_basedir, resolved_name, 
resolved_name_len) == 0) {
+#endif
+   return 0;
+   }
+   }
return -1;
}
} else {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41518.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/general_functions/bug41518.phpt
+++ php-src/ext/standard/tests/general_functions/bug41518.phpt
--TEST--
Bug #41518 (file_exists() warns of open_basedir restriction on non-existent 
file)
--SKIPIF--

--INI--
open_basedir=/tmp/
--FILE--

--EXPECTF-- 
bool(true)
bool(false)
Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard/tests/general_functions bug41518.phpt /main fopen_wrappers.c

2007-06-01 Thread Antony Dovgal
tony2001Fri Jun  1 13:35:23 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions   bug41518.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/main   fopen_wrappers.c 
  Log:
  MFH: fix #41518 (file_exists() warns of open_basedir restriction on 
non-existent file)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.748&r2=1.2027.2.547.2.749&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.748 php-src/NEWS:1.2027.2.547.2.749
--- php-src/NEWS:1.2027.2.547.2.748 Fri Jun  1 10:04:05 2007
+++ php-src/NEWSFri Jun  1 13:35:23 2007
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2007, PHP 5.2.4
+- Fixed bug #41518 (file_exists() warns of open_basedir restriction on 
+  non-existent file). (Tony)
 - Fixed bug #39330 (apache2handler does not call shutdown actions before 
   apache child die). (isk at ecommerce dot com, Gopal, Tony)
 
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.11&r2=1.175.2.3.2.12&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.11 
php-src/main/fopen_wrappers.c:1.175.2.3.2.12
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.11Wed Apr 18 11:58:40 2007
+++ php-src/main/fopen_wrappers.c   Fri Jun  1 13:35:23 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.11 2007/04/18 11:58:40 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.12 2007/06/01 13:35:23 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -172,8 +172,8 @@
}
}
 
+   resolved_name_len = strlen(resolved_name);
if (path_tmp[path_len - 1] == PHP_DIR_SEPARATOR) {
-   resolved_name_len = strlen(resolved_name);
if (resolved_name[resolved_name_len - 1] != 
PHP_DIR_SEPARATOR) {
resolved_name[resolved_name_len] = 
PHP_DIR_SEPARATOR;
resolved_name[++resolved_name_len] = '\0';
@@ -189,6 +189,16 @@
/* File is in the right directory */
return 0;
} else {
+   /* /openbasedir/ and /openbasedir are the same 
directory */
+   if (resolved_basedir_len == (resolved_name_len + 1) && 
resolved_basedir[resolved_basedir_len - 1] == PHP_DIR_SEPARATOR) {
+#if defined(PHP_WIN32) || defined(NETWARE)
+   if (strncasecmp(resolved_basedir, 
resolved_name, resolved_name_len) == 0) {
+#else
+   if (strncmp(resolved_basedir, resolved_name, 
resolved_name_len) == 0) {
+#endif
+   return 0;
+   }
+   }
return -1;
}
} else {

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41518.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/general_functions/bug41518.phpt
+++ php-src/ext/standard/tests/general_functions/bug41518.phpt
--TEST--
Bug #41518 (file_exists() warns of open_basedir restriction on non-existent 
file)
--SKIPIF--

--INI--
open_basedir=/tmp/
--FILE--

--EXPECTF-- 
bool(true)
bool(false)
Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /scripts phpize.m4

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 15:12:10 2007 UTC

  Modified files:  
/php-src/scriptsphpize.m4 
  Log:
  - Add missing CXXFLAGS_CLEAN variable.
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.21&r2=1.22&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.21 php-src/scripts/phpize.m4:1.22
--- php-src/scripts/phpize.m4:1.21  Fri Jan 12 19:02:14 2007
+++ php-src/scripts/phpize.m4   Fri Jun  1 15:12:10 2007
@@ -83,6 +83,7 @@
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
 CFLAGS_CLEAN='$(CFLAGS)'
+CXXFLAGS_CLEAN='$(CXXFLAGS)'
 
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
@@ -105,6 +106,7 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
+PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(PHP_EXECUTABLE)
 PHP_SUBST(EXTRA_LDFLAGS)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /scripts phpize.m4

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 15:12:29 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/scriptsphpize.m4 
  Log:
  MFH: - Add missing CXXFLAGS_CLEAN variable.
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3&r2=1.17.2.3.2.1&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3 
php-src/scripts/phpize.m4:1.17.2.3.2.1
--- php-src/scripts/phpize.m4:1.17.2.3  Mon Apr 10 12:16:17 2006
+++ php-src/scripts/phpize.m4   Fri Jun  1 15:12:29 2007
@@ -81,6 +81,7 @@
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
 CFLAGS_CLEAN='$(CFLAGS)'
+CXXFLAGS_CLEAN='$(CXXFLAGS)'
 
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
@@ -103,6 +104,7 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
+PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(PHP_EXECUTABLE)
 PHP_SUBST(EXTRA_LDFLAGS)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_4_4) /scripts phpize.m4

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 15:13:59 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/scriptsphpize.m4 
  Log:
  MFH:- Add missing CXXFLAGS_CLEAN variable.
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.1.2.11&r2=1.1.2.11.2.1&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.1.2.11 
php-src/scripts/phpize.m4:1.1.2.11.2.1
--- php-src/scripts/phpize.m4:1.1.2.11  Thu Mar 17 08:13:21 2005
+++ php-src/scripts/phpize.m4   Fri Jun  1 15:13:59 2007
@@ -67,6 +67,7 @@
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
 CFLAGS_CLEAN='$(CFLAGS)'
+CXXFLAGS_CLEAN='$(CXXFLAGS)'
 
 test "$prefix" = "NONE" && prefix="/usr/local"
 test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
@@ -89,6 +90,7 @@
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
+PHP_SUBST(CXXFLAGS_CLEAN)
 PHP_SUBST(EXTENSION_DIR)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: CVSROOT / loginfo modules

2007-06-01 Thread Philip Olson
philip  Fri Jun  1 17:09:13 2007 UTC

  Modified files:  
/CVSROOTloginfo modules 
  Log:
  Added the Norwegian translation
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.119&r2=1.120&diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.119 CVSROOT/loginfo:1.120
--- CVSROOT/loginfo:1.119   Tue May 22 05:41:00 2007
+++ CVSROOT/loginfo Fri Jun  1 17:09:13 2007
@@ -1,5 +1,5 @@
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: loginfo,v 1.119 2007/05/22 05:41:00 
derick Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: loginfo,v 1.120 2007/06/01 17:09:13 
philip Exp $"
 #
 # The "loginfo" file is used to control where "cvs commit" log information
 # is sent.  The first entry on a line is a regular expression which is tested
@@ -73,6 +73,7 @@
 ^phpdoc-kr $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-lt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-nl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^phpdoc-no $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-pl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-pt_BR $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
 ^phpdoc-pt $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
http://cvs.php.net/viewvc.cgi/CVSROOT/modules?r1=1.72&r2=1.73&diff_format=u
Index: CVSROOT/modules
diff -u CVSROOT/modules:1.72 CVSROOT/modules:1.73
--- CVSROOT/modules:1.72Sat Oct 29 16:35:49 2005
+++ CVSROOT/modules Fri Jun  1 17:09:13 2007
@@ -1,7 +1,7 @@
 #
 # The CVS Modules File
 #
-#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.72 2005/10/29 16:35:49 
derick Exp $"
+#ident "@(#)cvs/examples:$Name:  $:$Id: modules,v 1.73 2007/06/01 17:09:13 
philip Exp $"
 #
 # Three different line formats are valid:
 #  key -aaliases...
@@ -64,7 +64,7 @@
 phpdoc phpdoc
 
 # this checks out the build system all of the languages
-phpdoc-all phpdoc &phpdoc-ar-dir &phpdoc-bg-dir &phpdoc-ca-dir &phpdoc-cs-dir 
&phpdoc-da-dir &phpdoc-de-dir &phpdoc-el-dir &phpdoc-es-dir &phpdoc-fa_IR-dir 
&phpdoc-fi-dir &phpdoc-fr-dir &phpdoc-he-dir &phpdoc-hk-dir &phpdoc-hu-dir 
&phpdoc-id-dir &phpdoc-it-dir &phpdoc-ja-dir &phpdoc-kr-dir &phpdoc-lt-dir 
&phpdoc-nl-dir &phpdoc-pl-dir &phpdoc-pt-dir &phpdoc-pt_BR-dir &phpdoc-ro-dir 
&phpdoc-ru-dir &phpdoc-sk-dir &phpdoc-sl-dir &phpdoc-sv-dir &phpdoc-tr-dir 
&phpdoc-tw-dir &phpdoc-zh-dir
+phpdoc-all phpdoc &phpdoc-ar-dir &phpdoc-bg-dir &phpdoc-ca-dir &phpdoc-cs-dir 
&phpdoc-da-dir &phpdoc-de-dir &phpdoc-el-dir &phpdoc-es-dir &phpdoc-fa_IR-dir 
&phpdoc-fi-dir &phpdoc-fr-dir &phpdoc-he-dir &phpdoc-hk-dir &phpdoc-hu-dir 
&phpdoc-id-dir &phpdoc-it-dir &phpdoc-ja-dir &phpdoc-kr-dir &phpdoc-lt-dir 
&phpdoc-nl-dir &phpdoc-no-dir &phpdoc-pl-dir &phpdoc-pt-dir &phpdoc-pt_BR-dir 
&phpdoc-ro-dir &phpdoc-ru-dir &phpdoc-sk-dir &phpdoc-sl-dir &phpdoc-sv-dir 
&phpdoc-tr-dir &phpdoc-tw-dir &phpdoc-zh-dir
 
 # these allow checking out each translation on its own, or with the english
 # version and build infrastructure
@@ -128,6 +128,9 @@
 phpdoc-nl-dir -d nl phpdoc-nl
 phpdoc-nl-only phpdoc-nl
 phpdoc-nl phpdoc &phpdoc-nl-dir
+phpdoc-no-dir -d no phpdoc-no
+phpdoc-no-only phpdoc-no
+phpdoc-no phpdoc &phpdoc-no-dir
 phpdoc-pl-dir -d pl phpdoc-pl
 phpdoc-pl-only phpdoc-pl
 phpdoc-pl phpdoc &phpdoc-pl-dir

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: CVSROOT / avail

2007-06-01 Thread Philip Olson
philip  Fri Jun  1 17:20:41 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  Add phpdoc-no (Norwegian translation) and give Knut Urdalen phpdoc karma
  
  http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1274&r2=1.1275&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1274 CVSROOT/avail:1.1275
--- CVSROOT/avail:1.1274Sat May 26 06:21:09 2007
+++ CVSROOT/avail   Fri Jun  1 17:20:41 2007
@@ -17,7 +17,7 @@
 # The PHP Developers have full access to the full source trees for
 # PHP, as well as the documentation.
 
-avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac|phpfi,php3,php!
 
-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca
+avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac|phpfi,php3,php!
 
-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no
 
 # fastcgi implementation for IIS
 avail|shane,wez,edink|fastcgi-isapi
@@ -40,7 +40,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief97!
 
7,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,b

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd config.m4

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 21:34:17 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd config.m4 
  Log:
  MFH: - Fixed bug #41555 (configure failure: regression caused by fix for 
#41265)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.154.2.1.2.4&r2=1.154.2.1.2.5&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.4 
php-src/ext/gd/config.m4:1.154.2.1.2.5
--- php-src/ext/gd/config.m4:1.154.2.1.2.4  Fri May  4 21:57:47 2007
+++ php-src/ext/gd/config.m4Fri Jun  1 21:34:17 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.154.2.1.2.4 2007/05/04 21:57:47 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.5 2007/06/01 21:34:17 sniper Exp $
 dnl
 
 dnl
@@ -450,7 +450,7 @@
 
 PHP_TEST_BUILD(foobar, [], [
   AC_MSG_ERROR([GD build test failed. Please check the config.log for 
details.])
-], [ -L$GD_LIB $GD_SHARED_LIBADD ], [char foobar () {}])
+], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
 GD_HEADER_DIRS="ext/gd/"
 GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cli/tests 015.phpt

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 22:18:56 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cli/tests 015.phpt 
  Log:
  fix test
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/sapi/cli/tests/015.phpt
diff -u php-src/sapi/cli/tests/015.phpt:1.1.2.4 
php-src/sapi/cli/tests/015.phpt:1.1.2.5
--- php-src/sapi/cli/tests/015.phpt:1.1.2.4 Thu Apr 19 07:00:41 2007
+++ php-src/sapi/cli/tests/015.phpt Fri Jun  1 22:18:56 2007
@@ -31,5 +31,5 @@
 )
 
 PHP %d.%d.%d%s(cli) (built: %s)%s
-Usage: php [options] [-f]  [--] [args...]
+Usage: %s [options] [-f]  [--] [args...]
 Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /sapi/cli/tests 015.phpt

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 22:19:20 2007 UTC

  Modified files:  
/php-src/sapi/cli/tests 015.phpt 
  Log:
  fix test
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/sapi/cli/tests/015.phpt
diff -u php-src/sapi/cli/tests/015.phpt:1.3 php-src/sapi/cli/tests/015.phpt:1.4
--- php-src/sapi/cli/tests/015.phpt:1.3 Thu Apr 19 07:00:57 2007
+++ php-src/sapi/cli/tests/015.phpt Fri Jun  1 22:19:20 2007
@@ -31,5 +31,5 @@
 )
 
 PHP %d.%d.%d%s(cli) (built: %s)%s
-Usage: php [options] [-f]  [--] [args...]
+Usage: %s [options] [-f]  [--] [args...]
 Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/gd config.m4

2007-06-01 Thread Jani Taskinen
sniper  Fri Jun  1 21:33:30 2007 UTC

  Modified files:  
/php-src/ext/gd config.m4 
  Log:
  - Fixed bug #41555 (configure failure: regression caused by fix for #41265
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.172&r2=1.173&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.172 php-src/ext/gd/config.m4:1.173
--- php-src/ext/gd/config.m4:1.172  Fri May  4 21:57:22 2007
+++ php-src/ext/gd/config.m4Fri Jun  1 21:33:30 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.172 2007/05/04 21:57:22 sniper Exp $
+dnl $Id: config.m4,v 1.173 2007/06/01 21:33:30 sniper Exp $
 dnl
 
 dnl
@@ -383,7 +383,7 @@
 
 PHP_TEST_BUILD(foobar, [], [
   AC_MSG_ERROR([GD build test failed. Please check the config.log for 
details.])
-], [ -L$GD_LIB $GD_SHARED_LIBADD ], [char foobar () {}])
+], [ $GD_SHARED_LIBADD ], [char foobar () {}])
   else
 GD_INCDIR=`$GDLIB_CONFIG --includedir`
 GD_CFLAGS=`$GDLIB_CONFIG --cflags`

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php