[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2008-05-12 Thread changelog
changelog   Tue May 13 01:31:54 2008 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1299r2=1.1300diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1299 ZendEngine2/ChangeLog:1.1300
--- ZendEngine2/ChangeLog:1.1299Mon May 12 01:31:47 2008
+++ ZendEngine2/ChangeLog   Tue May 13 01:31:53 2008
@@ -1,3 +1,173 @@
+2008-05-12  Felipe Pena  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  tests/035.phpt
+  tests/class_alias_011.phpt
+  tests/class_alias_012.phpt
+  tests/class_alias_013.phpt
+  tests/class_alias_014.phpt
+  tests/class_alias_015.phpt
+  tests/class_alias_016.phpt
+  tests/class_alias_016.phpt
+  tests/class_alias_017.phpt
+  tests/class_alias_018.phpt
+  tests/class_alias_019.phpt
+  tests/class_alias_020.phpt
+  tests/class_alias_021.phpt
+  tests/class_exists_001.phpt
+  tests/class_exists_002.phpt
+  tests/class_exists_003.phpt
+  tests/constants_001.phpt
+  tests/constants_002.phpt
+  tests/constants_003.phpt
+  tests/constants_004.phpt
+  tests/each_001.phpt
+  tests/each_002.phpt
+  tests/each_003.phpt
+  tests/exception_005.phpt
+  tests/exception_006.phpt
+  tests/get_called_class_001.phpt
+  tests/get_parent_class_001.phpt
+  tests/heredoc_018.phpt
+  tests/inter_05.phpt
+  tests/inter_06.phpt
+  tests/interface_exists_001.phpt
+  tests/interface_exists_002.phpt
+  tests/list_006.phpt
+  tests/objects_028.phpt
+  tests/objects_029.phpt
+  tests/objects_030.phpt:
+  - New tests
+
+* tests/035.phpt
+  tests/035.phpt
+  tests/class_alias_001.phpt
+  tests/class_alias_021.phpt
+  tests/class_alias_021.phpt
+  tests/class_exists_001.phpt
+  tests/class_exists_001.phpt
+  tests/class_exists_002.phpt
+  tests/class_exists_002.phpt
+  tests/class_exists_003.phpt
+  tests/class_exists_003.phpt
+  tests/constants_001.phpt
+  tests/constants_001.phpt
+  tests/constants_002.phpt
+  tests/constants_002.phpt
+  tests/constants_003.phpt
+  tests/constants_003.phpt
+  tests/constants_004.phpt
+  tests/constants_004.phpt
+  tests/each_001.phpt
+  tests/each_001.phpt
+  tests/each_002.phpt
+  tests/each_002.phpt
+  tests/each_003.phpt
+  tests/each_003.phpt
+  tests/exception_005.phpt
+  tests/exception_005.phpt
+  tests/exception_006.phpt
+  tests/exception_006.phpt
+  tests/get_called_class_001.phpt
+  tests/get_called_class_001.phpt
+  tests/get_parent_class_001.phpt
+  tests/get_parent_class_001.phpt
+  tests/heredoc_018.phpt
+  tests/heredoc_018.phpt
+  tests/inter_05.phpt
+  tests/inter_05.phpt
+  tests/inter_06.phpt
+  tests/inter_06.phpt
+  tests/interface_exists_001.phpt
+  tests/interface_exists_001.phpt
+  tests/interface_exists_002.phpt
+  tests/interface_exists_002.phpt
+  tests/list_006.phpt
+  tests/list_006.phpt
+  tests/objects_028.phpt
+  tests/objects_028.phpt
+  tests/objects_029.phpt
+  tests/objects_029.phpt
+  tests/objects_030.phpt
+  tests/objects_030.phpt:
+  
+  - New tests
+
+* tests/class_alias_017.phpt
+  tests/class_alias_017.phpt
+  tests/class_alias_018.phpt
+  tests/class_alias_018.phpt
+  tests/class_alias_019.phpt
+  tests/class_alias_019.phpt
+  tests/class_alias_020.phpt
+  tests/class_alias_020.phpt:
+  
+  file class_alias_017.phpt was initially added on branch PHP_5_3.
+
+* tests/class_alias_011.phpt
+  tests/class_alias_011.phpt
+  tests/class_alias_012.phpt
+  tests/class_alias_012.phpt
+  tests/class_alias_013.phpt
+  tests/class_alias_013.phpt
+  tests/class_alias_014.phpt
+  tests/class_alias_014.phpt
+  tests/class_alias_015.phpt
+  tests/class_alias_015.phpt
+  tests/class_alias_016.phpt:
+  
+  file class_alias_011.phpt was initially added on branch PHP_5_3.
+
+* (PHP_5_3)
+  tests/class_alias_001.phpt
+  tests/class_alias_002.phpt
+  tests/class_alias_002.phpt
+  tests/class_alias_003.phpt
+  tests/class_alias_003.phpt
+  tests/class_alias_004.phpt
+  tests/class_alias_004.phpt
+  tests/class_alias_005.phpt
+  tests/class_alias_005.phpt
+  tests/class_alias_006.phpt
+  tests/class_alias_006.phpt
+  tests/class_alias_007.phpt
+  tests/class_alias_007.phpt
+  tests/class_alias_008.phpt
+  tests/class_alias_008.phpt
+  tests/class_alias_009.phpt
+  tests/class_alias_009.phpt
+  tests/class_alias_010.phpt
+  tests/class_alias_010.phpt:
+  file class_alias_001.phpt was added on branch PHP_5_3 on 2008-05-12
+  13:31:36 +
+
+* tests/isset_003.phpt
+  tests/isset_003.phpt
+  

[PHP-CVS] cvs: php-src /scripts/dev find_tested.php

2008-05-12 Thread Steve Seear
stevseeaMon May 12 08:27:50 2008 UTC

  Modified files:  
/php-src/scripts/devfind_tested.php 
  Log:
  Added a script that generates phpt test coverage information for functions 
and methods.
  
http://cvs.php.net/viewvc.cgi/php-src/scripts/dev/find_tested.php?r1=1.1r2=1.2diff_format=u
Index: php-src/scripts/dev/find_tested.php
diff -u /dev/null php-src/scripts/dev/find_tested.php:1.2
--- /dev/null   Mon May 12 08:27:50 2008
+++ php-src/scripts/dev/find_tested.php Mon May 12 08:27:50 2008
@@ -0,0 +1,222 @@
+?php
+
+
+$usage = USAGE
+
+Usage: php find_tested.php [path_to_test_files] ([extension])
+
+Outputs test coverage information for functions and methods in csv format.
+Supplying an optional extension name outputs only information for functions 
and methods from that extension.
+
+Output format:
+Extension, Class Name, Method/Function Name, Test Status, Test Files
+
+A test status of verify for a method means that there is at least one other 
method of the same name, so test coverage must be verified manually.
+
+USAGE;
+
+
+/* method record fields */
+define(CLASS_NAME, CLASS_NAME);
+define(METHOD_NAME, METHOD_NAME);
+define(EXTENSION_NAME, EXTENSION_NAME);
+define(IS_DUPLICATE, IS_DUPLICATE);
+define(IS_TESTED, IS_TESTED);
+define(TESTS, TESTS);
+
+
+// process command line args
+$num_params = $argc;
+if ($num_params  2 || $num_params  3) {
+die($usage);
+}
+
+$extension_test_path = $argv[1];
+
+if ($num_params == 3) {
+$extension_name = $argv[2];
+
+// check extension exists
+$extensions = get_loaded_extensions();
+if (!in_array($extension_name, $extensions)) {
+echo Error: extension $extension_name is not loaded. Loaded 
extensions:\n;
+foreach($extensions as $extension) {
+echo $extension\n;
+}
+die();
+}
+} else {
+$extension_name = false;
+}
+
+
+$method_info = populate_method_info();
+
+if ($extension_name != false) {
+// get only the methods from the extension we are querying
+$extension_method_info = array();
+foreach($method_info as $method_record) {
+if (strcasecmp($extension_name, $method_record[EXTENSION_NAME]) == 0) {
+$extension_method_info[] = $method_record;
+}
+}
+} else {
+$extension_method_info = $method_info;
+}
+
+get_phpt_files($extension_test_path, $count, $phpt_files);
+
+$extension_method_info = mark_methods_as_tested($extension_method_info, 
$phpt_files);
+
+
+foreach($extension_method_info as $record) {
+echo $record[EXTENSION_NAME] . ,;
+echo $record[CLASS_NAME] . ,;
+echo $record[METHOD_NAME] . ,;
+echo $record[IS_TESTED] . ,;
+echo $record[TESTS] . \n;
+}
+
+/**
+ * Marks the tested status of methods in $method_info according
+ * to whether they are tested in $phpt_files
+ */
+function mark_methods_as_tested($method_info, $phpt_files) { 
+
+foreach($phpt_files as $phpt_file) {
+$tested_functions = extract_tests($phpt_file);
+
+foreach($tested_functions as $tested_function) {
+
+// go through method info array marking this funtion as tested
+foreach($method_info as $current_method_record) {
+if (strcasecmp($tested_function, 
$current_method_record[METHOD_NAME]) == 0) {
+// matched the method name
+if ($current_method_record[IS_DUPLICATE] == true) {
+// we cannot be sure which class this method 
corresponds to,
+// so mark method as needing to be verified 
+$current_method_record[IS_TESTED] = verify;
+} else {
+$current_method_record[IS_TESTED] = yes;
+}
+$current_method_record[TESTS] .= $phpt_file . ; ;
+}
+}
+}
+}
+return $method_info;
+}
+
+/**
+ * returns an array containing a record for each defined method.
+ */
+function populate_method_info() {
+
+$method_info = array();
+
+// get functions
+$all_functions = get_defined_functions();
+$internal_functions = $all_functions[internal];
+
+foreach ($internal_functions as $function) {
+// populate new method record
+$function_record = array();
+$function_record[CLASS_NAME] = Function;
+$function_record[METHOD_NAME] = $function;
+$function_record[IS_TESTED] = no;
+$function_record[TESTS] = ;
+$function_record[IS_DUPLICATE] = false;
+
+// record the extension that the function belongs to
+$reflectionFunction = new ReflectionFunction($function);
+$extension = $reflectionFunction-getExtension();
+if ($extension != null) {
+$function_record[EXTENSION_NAME] = $extension-getName();
+} else {
+$function_record[EXTENSION_NAME] = ;
+}
+// insert new method record into info array
+$method_info[] = 

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

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 08:46:50 2008 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  revert patch that causes invalid reads/crashes on Linux
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.898r2=1.899diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.898 
php-src/ext/standard/basic_functions.c:1.899
--- php-src/ext/standard/basic_functions.c:1.898Tue May  6 18:04:25 2008
+++ php-src/ext/standard/basic_functions.c  Mon May 12 08:46:49 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.898 2008/05/06 18:04:25 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.899 2008/05/12 08:46:49 tony2001 Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -3822,7 +3822,9 @@
SetEnvironmentVariable(pe-key, bugbug);
 #endif
putenv(pe-previous_value);
+# if defined(PHP_WIN32)
efree(pe-previous_value);
+# endif
} else {
 # if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4386,8 +4388,12 @@
pe.previous_value = NULL;
for (env = environ; env != NULL  *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)  
(*env)[pe.key_len] == '=') {  /* found it */
-   /* must copy previous value because putenv can 
free the string without notice */
+#if defined(PHP_WIN32)
+   /* must copy previous value because MSVCRT's 
putenv can free the string without notice */
pe.previous_value = estrdup(*env);
+#else
+   pe.previous_value = *env;
+#endif
break;
}
}



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



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

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 08:47:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   basic_functions.c 
  Log:
  MFH: revert patch that causes invalid reads/crashes on Linux
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.33r2=1.725.2.31.2.64.2.34diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.33 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.34
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.33 Thu May  8 
22:21:18 2008
+++ php-src/ext/standard/basic_functions.c  Mon May 12 08:47:01 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.33 2008/05/08 22:21:18 felipe 
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.34 2008/05/12 08:47:01 tony2001 
Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -3820,7 +3820,9 @@
SetEnvironmentVariable(pe-key, bugbug);
 #endif
putenv(pe-previous_value);
+# if defined(PHP_WIN32)
efree(pe-previous_value);
+# endif
} else {
 # if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4425,8 +4427,12 @@
pe.previous_value = NULL;
for (env = environ; env != NULL  *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)  
(*env)[pe.key_len] == '=') {  /* found it */
-   /* must copy previous value because putenv can 
free the string without notice */
+#if defined(PHP_WIN32)
+   /* must copy previous value because MSVCRT's 
putenv can free the string without notice */
pe.previous_value = estrdup(*env);
+#else
+   pe.previous_value = *env;
+#endif
break;
}
}



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

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 08:47:29 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/standard   basic_functions.c 
  Log:
  MFH: revert patch that causes invalid reads/crashes on Linux
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1156r2=1.2027.2.547.2.1157diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1156 php-src/NEWS:1.2027.2.547.2.1157
--- php-src/NEWS:1.2027.2.547.2.1156Fri May  9 10:29:01 2008
+++ php-src/NEWSMon May 12 08:47:29 2008
@@ -5,8 +5,6 @@
   functions. (Andrey)
 - Fixed bug #44891 Memory leak using registerPHPFunctions and XSLT Variable 
   as function parameter. (Rob)
-- Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
-  POSIX systems). (Ilia, delphij at FreeBSD dot org)
 - Fixed bug #44830 (Very minor issue with backslash in heredoc). (Matt)
 - Fixed bug #44811 (Improve error message when creating a new SoapClient that 
   contains invalid data). (Markus Fischer, David C)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.70r2=1.725.2.31.2.71diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.70 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.71
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.70  Tue May  6 
18:03:51 2008
+++ php-src/ext/standard/basic_functions.c  Mon May 12 08:47:29 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.70 2008/05/06 18:03:51 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp $ 
*/
 
 #include php.h
 #include php_streams.h
@@ -3859,7 +3859,9 @@
SetEnvironmentVariable(pe-key, bugbug);
 #endif
putenv(pe-previous_value);
+# if defined(PHP_WIN32)
efree(pe-previous_value);
+# endif
} else {
 # if HAVE_UNSETENV
unsetenv(pe-key);
@@ -4459,8 +4461,12 @@
pe.previous_value = NULL;
for (env = environ; env != NULL  *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len)  
(*env)[pe.key_len] == '=') {  /* found it */
-   /* must copy previous value because putenv can 
free the string without notice */
+#if defined(PHP_WIN32)
+   /* must copy previous value because MSVCRT's 
putenv can free the string without notice */
pe.previous_value = estrdup(*env);
+#else
+   pe.previous_value = *env;
+#endif
break;
}
}



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

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 15:30:53 2008 UTC

  Added files: 
/php-src/ext/standard/tests/url .cvsignore 
  Log:
  add missing .cvsignore
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/.cvsignore?view=markuprev=1.1
Index: php-src/ext/standard/tests/url/.cvsignore
+++ php-src/ext/standard/tests/url/.cvsignore
phpt.*
*.mem
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/url .cvsignore

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 15:31:09 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/url .cvsignore 
  Log:
  MFH
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/.cvsignore?view=markuprev=1.1
Index: php-src/ext/standard/tests/url/.cvsignore
+++ php-src/ext/standard/tests/url/.cvsignore
phpt.*
*.mem
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno



-- 
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/tests/url .cvsignore

2008-05-12 Thread Antony Dovgal
tony2001Mon May 12 15:31:20 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/url .cvsignore 
  Log:
  MFH
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/.cvsignore?view=markuprev=1.1
Index: php-src/ext/standard/tests/url/.cvsignore
+++ php-src/ext/standard/tests/url/.cvsignore
phpt.*
*.mem
*.diff
*.log
*.exp
*.out
*.php
*.gcda
*.gcno



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



[PHP-CVS] cvs: CVSROOT / avail

2008-05-12 Thread Andrei Zmievski
andrei  Mon May 12 18:55:26 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  Give mmdrake access to php-gtk-web.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1395r2=1.1396diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1395 CVSROOT/avail:1.1396
--- CVSROOT/avail:1.1395Fri May  9 13:14:59 2008
+++ CVSROOT/avail   Mon May 12 18:55:26 2008
@@ -108,7 +108,7 @@
 
 # The PHP-GTK Web Group has access to the PHP-GTK website.
 
-avail|fmk,jmoore,cmv,alan_k,sfox,imajes,ramsey,cweiske,scottmattocks,anant,auroraeosrose|php-gtk-web
+avail|fmk,jmoore,cmv,alan_k,sfox,imajes,ramsey,cweiske,scottmattocks,anant,auroraeosrose,mmdrake|php-gtk-web
 
 # The Smarty Group has access to the Smarty code
 



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



[PHP-CVS] cvs: win-installer / build.bat

2008-05-12 Thread John Mertic
jmertic Mon May 12 19:59:09 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Removed extra set command at the end of the script.
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.6r2=1.7diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.6 win-installer/build.bat:1.7
--- win-installer/build.bat:1.6 Wed Apr 30 20:41:19 2008
+++ win-installer/build.bat Mon May 12 19:59:09 2008
@@ -30,5 +30,4 @@
 Wix\candle.exe ExtensionsComponents.wxs ExtensionsFeaturesBuild.wxs 
WebServerConfig%1.wxs PHPInstaller%1.wxs 
 
 echo Linking Installer
-Wix\light.exe -out %msiname% ExtensionsComponents.wixobj 
ExtensionsFeaturesBuild.wixobj WebServerConfig%1.wixobj PHPInstaller%1.wixobj 
PHPInstallerCommon.wixlib -loc WixUI_en-us.wxl
-set phpver=
+Wix\light.exe -out %msiname% ExtensionsComponents.wixobj 
ExtensionsFeaturesBuild.wixobj WebServerConfig%1.wixobj PHPInstaller%1.wixobj 
PHPInstallerCommon.wixlib -loc WixUI_en-us.wxls



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8/tests connect_scope1.phpt connect_scope2.phpt connect_scope_try1.phpt connect_scope_try2.phpt connect_scope_try3.phpt connect_scope_try4.phpt connect_scope_tr

2008-05-12 Thread Christopher Jones
sixdTue May 13 00:05:09 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/oci8/tests connect_scope1.phpt connect_scope2.phpt 
connect_scope_try1.phpt 
connect_scope_try2.phpt 
connect_scope_try3.phpt 
connect_scope_try4.phpt 
connect_scope_try5.phpt 
connect_scope_try6.phpt minfo.phpt 

  Modified files:  
/php-src/ext/oci8/tests drcp_scope4.phpt 
  Log:
  MFH: New/updated tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/drcp_scope4.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/oci8/tests/drcp_scope4.phpt
diff -u php-src/ext/oci8/tests/drcp_scope4.phpt:1.1.2.2 
php-src/ext/oci8/tests/drcp_scope4.phpt:1.1.2.3
--- php-src/ext/oci8/tests/drcp_scope4.phpt:1.1.2.2 Fri Apr 18 00:05:27 2008
+++ php-src/ext/oci8/tests/drcp_scope4.phpt Tue May 13 00:05:09 2008
@@ -10,10 +10,15 @@
 require dirname(__FILE__)./drcp_functions.inc;
 require dirname(__FILE__)./details.inc;
 
-// The test opens a connection within function1 and updates a table
-// (without committing).  Another connection is opened from function
-// 2, and the table queried.  When function1 ends, the txn is rolled
-// back and hence the updated value will not be reflected in function2
+// The default expected behavior of this test is different between PHP
+// 5.2 and PHP 5.3
+//
+// In PHP 5.3, the test opens a connection within function1 and
+// updates a table (without committing).  Another connection is opened
+// from function 2, and the table queried.  When function1 ends, the
+// txn is rolled back and hence the updated value will not be
+// reflected in function2.  Use oci8.old_oci_close_semantics=1 to
+// get old behavior
 
 // Create the table
 $c = oci_new_connect($user,$password,$dbase);

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope1.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope1.phpt
+++ php-src/ext/oci8/tests/connect_scope1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope2.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope2.phpt
+++ php-src/ext/oci8/tests/connect_scope2.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try1.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try1.phpt
+++ php-src/ext/oci8/tests/connect_scope_try1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try2.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try2.phpt
+++ php-src/ext/oci8/tests/connect_scope_try2.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try3.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try3.phpt
+++ php-src/ext/oci8/tests/connect_scope_try3.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try4.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try4.phpt
+++ php-src/ext/oci8/tests/connect_scope_try4.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try5.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try5.phpt
+++ php-src/ext/oci8/tests/connect_scope_try5.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_scope_try6.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/connect_scope_try6.phpt
+++ php-src/ext/oci8/tests/connect_scope_try6.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/minfo.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/minfo.phpt
+++ php-src/ext/oci8/tests/minfo.phpt
--TEST--
Code coverage for PHP_MINFO_FUNCTION(oci)
--SKIPIF--
?php if (!extension_loaded('oci8')) die (skip no oci8 extension); ?
--FILE--
?php

ob_start();
phpinfo(INFO_MODULES);
$v = ob_get_clean();
$r = strpos($v, 'OCI8 Support = enabled');
var_dump($r);

echo Done\n;

?
--EXPECTF--
int(%d)
Done



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



[PHP-CVS] cvs: win-installer / build.bat

2008-05-12 Thread John Mertic
jmertic Tue May 13 00:50:43 2008 UTC

  Modified files:  
/win-installer  build.bat 
  Log:
  Fix error in script
  
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.7r2=1.8diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.7 win-installer/build.bat:1.8
--- win-installer/build.bat:1.7 Mon May 12 19:59:09 2008
+++ win-installer/build.bat Tue May 13 00:50:43 2008
@@ -6,11 +6,13 @@
 if %phpver%==53 set phpver=52
 
 set msiname=php-%1-win32-installer.msi
-if %2==nts set msiname=php-%1-nts-win32-installer.msi
-
 set suffix=
+
+if (%2)==() goto build
+if %2==nts set msiname=php-%1-nts-win32-installer.msi
 if %2==nts set suffix=NTS
 
+:build
 echo Building ExtensionsComponents.wxs
 Files\php.exe GenExtensionsComponents.wxs.php
 



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