date:20070612

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2007-06-12 Thread changelog

changelog   Wed Jun 13 01:31:08 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2717r2=1.2718diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2717 php-src/ChangeLog:1.2718
--- php-src/ChangeLog:1.2717Tue Jun 12 01:31:19 2007
+++ php-src/ChangeLog   Wed Jun 13 01:31:08 2007
@@ -1,3 +1,40 @@
+2007-06-12  Johannes Schlüter  [EMAIL PROTECTED]
+
+* ext/simplexml/tests/bug37565.phpt:
+  - Fix test
+
+2007-06-12  Nuno Lopes  [EMAIL PROTECTED]
+
+* .cvsignore
+  .cvsignore:
+  ignore tmp-php.ini
+
+2007-06-12  Scott MacVicar  [EMAIL PROTECTED]
+
+* ext/pcre/php_pcre.c
+  ext/pcre/php_pcre.c:
+  Display PCRE ini entries as part of module info
+
+* ext/standard/dir.c
+  ext/standard/dir.c
+  ext/standard/dir.c:
+  Fix ZTS build
+
+2007-06-12  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_4_4)
+  NEWS
+  ext/standard/dir.c
+  ext/standard/dir.c:
+  
+  MFB: Fixed bug #41655 (open_basedir bypass via glob())
+
+* (PHP_5_2)
+  NEWS
+  ext/standard/dir.c:
+  
+  Fixed bug #41655 (open_basedir bypass via glob())
+
 2007-06-11  Jani Taskinen  [EMAIL PROTECTED]
 
 * (PHP_5_2)

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/wddx wddx.c /ext/wddx/tests bug41527.phpt

2007-06-12 Thread Matt Wilmas

Hi Ilia,

Could you, or anyone, just put Matt instead of the e-mail addy in the NEWS
files? :-)


Thanks,
Matt

- Original Message -
From: Ilia Alshanetsky
Sent: Monday, June 11, 2007

 iliaa Mon Jun 11 15:08:43 2007 UTC

   Added files: (Branch: PHP_5_2)
 /php-src/ext/wddx/tests bug41527.phpt

   Modified files:
 /php-src NEWS
 /php-src/ext/wddx wddx.c
   Log:

   Fixed bug #41527 (WDDX deserialize numeric string array key).


http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.773r2=1.2027.2.547.2.774diff_format=u
[...]
 +- Fixed bug #41527 (WDDX deserialize numeric string array key).
(php_lists
 +  at realplain dot com, Ilia)

-- 
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 dir.c

2007-06-12 Thread Ilia Alshanetsky

iliaa   Tue Jun 12 12:53:08 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   dir.c 
  Log:
  
  Fixed bug #41655 (open_basedir bypass via glob())
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.775r2=1.2027.2.547.2.776diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.775 php-src/NEWS:1.2027.2.547.2.776
--- php-src/NEWS:1.2027.2.547.2.775 Mon Jun 11 20:22:45 2007
+++ php-src/NEWSTue Jun 12 12:53:07 2007
@@ -25,6 +25,7 @@
 - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory 
   already exists). (Pierre)
 
+- Fixed bug #41655 (open_basedir bypass via glob()). (Ilia)
 - Fixed bug #41640 (get_class_vars produces error on class constants).
   (Johannes)
 - Fixed bug #41630 (segfault when an invalid color index is present in
@@ -46,8 +47,7 @@
   with ini_set()). (Tony, Dmitry)
 - Fixed bug #41555 (configure failure: regression caused by fix for #41265).
   (Jani)
-- Fixed bug #41527 (WDDX deserialize numeric string array key). (php_lists
-  at realplain dot com, Ilia)
+- Fixed bug #41527 (WDDX deserialize numeric string array key). (Matt, Ilia)
 - 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 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.4r2=1.147.2.3.2.5diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.4 
php-src/ext/standard/dir.c:1.147.2.3.2.5
--- php-src/ext/standard/dir.c:1.147.2.3.2.4Sat Feb 24 17:16:23 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 12:53:08 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.147.2.3.2.4 2007/02/24 17:16:23 iliaa Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.5 2007/06/12 12:53:08 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -24,6 +24,7 @@
 #include fopen_wrappers.h
 #include file.h
 #include php_dir.h
+#include php_string.h
 #include php_scandir.h
 
 #ifdef HAVE_DIRENT_H
@@ -361,7 +362,6 @@
Find pathnames matching a pattern */
 PHP_FUNCTION(glob)
 {
-   char cwd[MAXPATHLEN];
int cwd_skip = 0;
 #ifdef ZTS
char work_pattern[MAXPATHLEN];
@@ -395,6 +395,22 @@
} 
 #endif
 
+   if (PG(safe_mode) || (PG(open_basedir)  *PG(open_basedir))) {
+   size_t base_len = php_dirname(pattern, strlen(pattern));
+   char pos = pattern[base_len];
+
+   pattern[base_len] = '\0';
+
+   if (PG(safe_mode)  (!php_checkuid(pattern, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+   RETURN_FALSE;
+   }
+   if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   RETURN_FALSE;
+   }
+
+   pattern[base_len] = pos;
+   }
+
globbuf.gl_offs = 0;
if (0 != (ret = glob(pattern, flags  GLOB_FLAGMASK, NULL, globbuf))) {
 #ifdef GLOB_NOMATCH
@@ -420,16 +436,6 @@
return;
}
 
-   /* we assume that any glob pattern will match files from one directory 
only
-  so checking the dirname of the first match should be sufficient */
-   strlcpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
-   if (PG(safe_mode)  (!php_checkuid(cwd, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
-   RETURN_FALSE;
-   }
-   if (php_check_open_basedir(cwd TSRMLS_CC)) {
-   RETURN_FALSE;
-   }
-
array_init(return_value);
for (n = 0; n  globbuf.gl_pathc; n++) {
/* we need to do this everytime since GLOB_ONLYDIR does not 
guarantee that

-- 
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) / NEWS /ext/standard dir.c

2007-06-12 Thread Ilia Alshanetsky

iliaa   Tue Jun 12 12:56:17 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-srcNEWS 
/php-src/ext/standard   dir.c 
  Log:
  
  MFB: Fixed bug #41655 (open_basedir bypass via glob())
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.236r2=1.1247.2.920.2.237diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.236 php-src/NEWS:1.1247.2.920.2.237
--- php-src/NEWS:1.1247.2.920.2.236 Mon Jun 11 20:19:53 2007
+++ php-src/NEWSTue Jun 12 12:56:17 2007
@@ -29,8 +29,8 @@
 - Fixed CVE-2007-1001 (GD wbmp used with invalid image size). (Pierre)
 - Fixed CVE-2007-0455 (Buffer overflow in gdImageStringFTEx, used by imagettf
   function). (Kees Cook, Pierre)
-- Fixed bug #41527 (WDDX deserialize numeric string array key). (php_lists
-  at realplain dot com, Ilia)
+- Fixed bug #41655 (open_basedir bypass via glob()). (Ilia)
+- Fixed bug #41527 (WDDX deserialize numeric string array key). (Matt, Ilia)
 - Fixed bug #41252 (Calling mcrypt_generic without first calling
   mcrypt_generic_init crashes). (Derick)
 - Fixed bug #40998 (long session array keys are truncated). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.109.2.18.2.4r2=1.109.2.18.2.5diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.18.2.4 
php-src/ext/standard/dir.c:1.109.2.18.2.5
--- php-src/ext/standard/dir.c:1.109.2.18.2.4   Mon Jan  1 09:46:47 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 12:56:17 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.109.2.18.2.4 2007/01/01 09:46:47 sebastian Exp $ */
+/* $Id: dir.c,v 1.109.2.18.2.5 2007/06/12 12:56:17 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -24,6 +24,7 @@
 #include fopen_wrappers.h
 #include file.h
 #include php_dir.h
+#include php_string.h
 
 #ifdef HAVE_DIRENT_H
 # include dirent.h
@@ -349,7 +350,6 @@
Find pathnames matching a pattern */
 PHP_FUNCTION(glob)
 {
-   char cwd[MAXPATHLEN];
int cwd_skip = 0;
 #ifdef ZTS
char work_pattern[MAXPATHLEN];
@@ -382,6 +382,22 @@
} 
 #endif
 
+   if (PG(safe_mode) || (PG(open_basedir)  *PG(open_basedir))) {
+   size_t base_len = php_dirname(pattern, strlen(pattern));
+   char pos = pattern[base_len];
+
+   pattern[base_len] = '\0';
+
+   if (PG(safe_mode)  (!php_checkuid(pattern, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
+   RETURN_FALSE;
+   }
+   if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   RETURN_FALSE;
+   }
+
+   pattern[base_len] = pos;
+   }
+
globbuf.gl_offs = 0;
if (0 != (ret = glob(pattern, flags  GLOB_FLAGMASK, NULL, globbuf))) {
 #ifdef GLOB_NOMATCH
@@ -403,16 +419,6 @@
return;
}
 
-   /* we assume that any glob pattern will match files from one directory 
only
-  so checking the dirname of the first match should be sufficient */
-   strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
-   if (PG(safe_mode)  (!php_checkuid(cwd, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) {
-   RETURN_FALSE;
-   }
-   if (php_check_open_basedir(cwd TSRMLS_CC)) {
-   RETURN_FALSE;
-   }
-
array_init(return_value);
for (n = 0; n  globbuf.gl_pathc; n++) {
/* we need to this everytime since GLOB_ONLYDIR does not 
guarantee that

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

[PHP-CVS] cvs: php-src /ext/standard dir.c

2007-06-12 Thread Ilia Alshanetsky

iliaa   Tue Jun 12 12:57:43 2007 UTC

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  
  MFB: Fixed bug #41655 (open_basedir bypass via glob())
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.161r2=1.162diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.161 php-src/ext/standard/dir.c:1.162
--- php-src/ext/standard/dir.c:1.161Tue May 29 20:11:23 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 12:57:43 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.161 2007/05/29 20:11:23 iliaa Exp $ */
+/* $Id: dir.c,v 1.162 2007/06/12 12:57:43 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -385,7 +385,6 @@
Find pathnames matching a pattern */
 PHP_FUNCTION(glob)
 {
-   char cwd[MAXPATHLEN];
int cwd_skip = 0;
 #ifdef ZTS
char work_pattern[MAXPATHLEN];
@@ -422,6 +421,19 @@
} 
 #endif
 
+   if (PG(open_basedir)  *PG(open_basedir)) {
+   size_t base_len = php_dirname(pattern, strlen(pattern));
+   char pos = pattern[base_len];
+
+   pattern[base_len] = '\0';
+
+   if (php_check_open_basedir(pattern TSRMLS_CC)) {
+   RETURN_FALSE;
+   }
+
+   pattern[base_len] = pos;
+   }
+
globbuf.gl_offs = 0;
if (0 != (ret = glob(pattern, flags  GLOB_FLAGMASK, NULL, globbuf))) {
 #ifdef GLOB_NOMATCH
@@ -447,14 +459,6 @@
return;
}
 
-   /* we assume that any glob pattern will match files from one directory 
only
-  so checking the dirname of the first match should be sufficient */
-   strlcpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
-
-   if (php_check_open_basedir(cwd TSRMLS_CC)) {
-   RETURN_FALSE;
-   }
-
array_init(return_value);
for (n = 0; n  globbuf.gl_pathc; n++) {
/* we need to do this everytime since GLOB_ONLYDIR does not 
guarantee that

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

[PHP-CVS] cvs: php-src /ext/standard dir.c

2007-06-12 Thread Scott MacVicar

scottmacTue Jun 12 13:42:05 2007 UTC

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  Fix ZTS build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.162r2=1.163diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.162 php-src/ext/standard/dir.c:1.163
--- php-src/ext/standard/dir.c:1.162Tue Jun 12 12:57:43 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 13:42:04 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.162 2007/06/12 12:57:43 iliaa Exp $ */
+/* $Id: dir.c,v 1.163 2007/06/12 13:42:04 scottmac Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -387,6 +387,7 @@
 {
int cwd_skip = 0;
 #ifdef ZTS
+   char cwd[MAXPATHLEN];
char work_pattern[MAXPATHLEN];
char *result;
 #endif

-- 
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) /ext/standard dir.c

2007-06-12 Thread Scott MacVicar

scottmacTue Jun 12 13:42:32 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   dir.c 
  Log:
  Fix ZTS build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.5r2=1.147.2.3.2.6diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.5 
php-src/ext/standard/dir.c:1.147.2.3.2.6
--- php-src/ext/standard/dir.c:1.147.2.3.2.5Tue Jun 12 12:53:08 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 13:42:32 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.147.2.3.2.5 2007/06/12 12:53:08 iliaa Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.6 2007/06/12 13:42:32 scottmac Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -364,6 +364,7 @@
 {
int cwd_skip = 0;
 #ifdef ZTS
+   char cwd[MAXPATHLEN];
char work_pattern[MAXPATHLEN];
char *result;
 #endif

-- 
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) /ext/standard dir.c

2007-06-12 Thread Scott MacVicar

scottmacTue Jun 12 13:48:02 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   dir.c 
  Log:
  Fix ZTS build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.109.2.18.2.5r2=1.109.2.18.2.6diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.18.2.5 
php-src/ext/standard/dir.c:1.109.2.18.2.6
--- php-src/ext/standard/dir.c:1.109.2.18.2.5   Tue Jun 12 12:56:17 2007
+++ php-src/ext/standard/dir.c  Tue Jun 12 13:48:02 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.109.2.18.2.5 2007/06/12 12:56:17 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.18.2.6 2007/06/12 13:48:02 scottmac Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -352,6 +352,7 @@
 {
int cwd_skip = 0;
 #ifdef ZTS
+   char cwd[MAXPATHLEN];
char work_pattern[MAXPATHLEN];
char *result;
 #endif

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

[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c

2007-06-12 Thread Scott MacVicar

scottmacTue Jun 12 14:07:42 2007 UTC

  Modified files:  
/php-src/ext/pcre   php_pcre.c 
  Log:
  Display PCRE ini entries as part of module info
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.212r2=1.213diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.212 php-src/ext/pcre/php_pcre.c:1.213
--- php-src/ext/pcre/php_pcre.c:1.212   Mon Apr 23 10:05:25 2007
+++ php-src/ext/pcre/php_pcre.c Tue Jun 12 14:07:42 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_pcre.c,v 1.212 2007/04/23 10:05:25 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.213 2007/06/12 14:07:42 scottmac Exp $ */
 
 /*  TODO
  *  php_pcre_replace_impl():
@@ -138,6 +138,8 @@
php_info_print_table_row(2, PCRE (Perl Compatible Regular Expressions) 
Support, enabled );
php_info_print_table_row(2, PCRE Library Version, pcre_version() );
php_info_print_table_end();
+
+   DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 

-- 
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) /ext/pcre php_pcre.c

2007-06-12 Thread Scott MacVicar

scottmacTue Jun 12 14:08:16 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pcre   php_pcre.c 
  Log:
  Display PCRE ini entries as part of module info
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.17r2=1.168.2.9.2.18diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.17 
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.18
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.17  Mon Apr 23 10:05:33 2007
+++ php-src/ext/pcre/php_pcre.c Tue Jun 12 14:08:16 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_pcre.c,v 1.168.2.9.2.17 2007/04/23 10:05:33 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.18 2007/06/12 14:08:16 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -126,6 +126,8 @@
php_info_print_table_row(2, PCRE (Perl Compatible Regular Expressions) 
Support, enabled );
php_info_print_table_row(2, PCRE Library Version, pcre_version() );
php_info_print_table_end();
+
+   DISPLAY_INI_ENTRIES();
 }
 /* }}} */
 

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

[PHP-CVS] cvs: php-src / .cvsignore

2007-06-12 Thread Nuno Lopes

nlopess Tue Jun 12 14:53:10 2007 UTC

  Modified files:  
/php-src.cvsignore 
  Log:
  ignore tmp-php.ini
  
http://cvs.php.net/viewvc.cgi/php-src/.cvsignore?r1=1.52r2=1.53diff_format=u
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.52 php-src/.cvsignore:1.53
--- php-src/.cvsignore:1.52 Tue Nov  8 16:43:09 2005
+++ php-src/.cvsignore  Tue Jun 12 14:53:10 2007
@@ -69,4 +69,4 @@
 php_lcov.info
 lcov_data
 lcov_html
-
+tmp-php.ini

-- 
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) / .cvsignore

2007-06-12 Thread Nuno Lopes

nlopess Tue Jun 12 14:54:14 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src.cvsignore 
  Log:
  ignore tmp-php.ini
  
http://cvs.php.net/viewvc.cgi/php-src/.cvsignore?r1=1.51.4.1r2=1.51.4.2diff_format=u
Index: php-src/.cvsignore
diff -u php-src/.cvsignore:1.51.4.1 php-src/.cvsignore:1.51.4.2
--- php-src/.cvsignore:1.51.4.1 Tue Jun 13 22:02:57 2006
+++ php-src/.cvsignore  Tue Jun 12 14:54:14 2007
@@ -69,3 +69,4 @@
 lcov_data
 lcov_html
 php_lcov.info
+tmp-php.ini

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

[PHP-CVS] cvs: php-src /ext/simplexml/tests bug37565.phpt

2007-06-12 Thread Johannes Schl

johannesTue Jun 12 17:23:57 2007 UTC

  Modified files:  
/php-src/ext/simplexml/testsbug37565.phpt 
  Log:
  - Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37565.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/simplexml/tests/bug37565.phpt
diff -u php-src/ext/simplexml/tests/bug37565.phpt:1.5 
php-src/ext/simplexml/tests/bug37565.phpt:1.6
--- php-src/ext/simplexml/tests/bug37565.phpt:1.5   Mon May  7 17:23:04 2007
+++ php-src/ext/simplexml/tests/bug37565.phpt   Tue Jun 12 17:23:57 2007
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37565 (Using reflection::export with simplexml causing a crash)
 --SKIPIF--
-?php if (!extension_loaded(simplexml)) print skip; ?
+?php if (!extension_loaded(simplexml) || !extension_loaded('reflection')) 
print skip; ?
 --FILE--
 ?php
 function my_error_handler($errno, $errstr, $errfile, $errline) {

-- 
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) /ext/simplexml/tests bug37565.phpt

2007-06-12 Thread Johannes Schl

johannesTue Jun 12 17:24:38 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug37565.phpt 
  Log:
  - MFH: Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37565.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/simplexml/tests/bug37565.phpt
diff -u php-src/ext/simplexml/tests/bug37565.phpt:1.1.2.5 
php-src/ext/simplexml/tests/bug37565.phpt:1.1.2.6
--- php-src/ext/simplexml/tests/bug37565.phpt:1.1.2.5   Mon May  7 18:03:00 2007
+++ php-src/ext/simplexml/tests/bug37565.phpt   Tue Jun 12 17:24:38 2007
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37565 (Using reflection::export with simplexml causing a crash)
 --SKIPIF--
-?php if (!extension_loaded(simplexml)) print skip; ?
+?php if (!extension_loaded(simplexml) || !extension_loaded('reflection')) 
print skip; ?
 --FILE--
 ?php
 

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/wddx wddx.c /ext/wddx/tests bug41527.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard dir.c

[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/standard dir.c

[PHP-CVS] cvs: php-src /ext/standard dir.c

[PHP-CVS] cvs: php-src /ext/standard dir.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard dir.c

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dir.c

[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c

[PHP-CVS] cvs: php-src / .cvsignore

[PHP-CVS] cvs: php-src(PHP_5_2) / .cvsignore

[PHP-CVS] cvs: php-src /ext/simplexml/tests bug37565.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml/tests bug37565.phpt

14 matches

Site Navigation

Mail list logo

Footer information