[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Jun 10 01:32:47 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3429r2=1.3430diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3429 php-src/ChangeLog:1.3430 --- php-src/ChangeLog:1.3429Tue Jun 9 01:32:45 2009 +++ php-src/ChangeLog Wed Jun 10 01:32:46 2009 @@ -1,3 +1,129 @@ +2009-06-09 andy wharmby whar...@uk.ibm.com + +* ext/mbstring/tests/mb_substitute_character_variation1.phpt + ext/mbstring/tests/mb_substitute_character_variation1.phpt + ext/mbstring/tests/mb_substitute_character_variation1.phpt: + Fix test - remove bogus variation + +2009-06-09 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_3) + NEWS: + - missing ACL entry + +* (PHP_5_3) + NEWS: + - #41874 + +* ext/standard/proc_open.c + ext/standard/tests/file/bug41874.phpt + ext/standard/tests/file/bug41874_1.phpt + ext/standard/tests/file/bug41874_2.phpt + ext/standard/tests/file/bug41874_3.phpt: + - MFB: #41874, separate STDOUT and STDERR in exec functions + +* TSRM/tsrm_win32.c: + - #41874, separate STDOUT and STDERR in exec functions + +* (PHP_5_2) + NEWS: + - fix NEWS + +2009-06-09 David Soria Parra dso...@gmx.net + +* (PHP_5_3) + sapi/cgi/cgi_main.c: + MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME + for non apache). + The fix was provided by Sriram Natarajan. + +* (PHP_5_2) + NEWS + sapi/cgi/cgi_main.c + sapi/cgi/cgi_main.c: + Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for + non apache). + The fix was provided by Sriram Natarajan. + +2009-06-09 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS: + TZ update news + +2009-06-09 Pierre-Alain Joye pierre@gmail.com + +* sapi/apache/mod_php.c: + - fix build (test before commit maybe?) + +* ext/mysqlnd/php_mysqlnd.c: + - fix TS build + +* ext/mysqlnd/php_mysqlnd.c: + - ws + +* (PHP_5_3) + ZendEngine2/zend_execute.h: + - fix build (void alarm) + +* (PHP_5_3) + TSRM/tsrm_win32.c: + - missing include + +2009-06-09 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + ext/spl/php_spl.c + ext/spl/tests/bug48493.phpt: + MFH Fix bug #48493 - spl_autoload_register can leave the HT in an + inconsistent way. + Need to point the second elements previous item to head so we can traverse + upwards. + +* ext/spl/php_spl.c + ext/spl/tests/bug48493.phpt + ext/spl/tests/bug48493.phpt: + Fix bug #48493 - spl_autoload_register can leave the HT in an inconsistent + way. + Need to point the second elements previous item to head so we can traverse + upwards. + +* (PHP_5_2) + NEWS + NEWS + NEWS: + BFN + +* (PHP_5_2) + ext/mysqli/tests/bug46109.phpt: + Add test + +* (PHP_5_2) + ext/mysqli/mysqli_api.c: + MFH #46019 - Memory leak when Mysqli::init() is called multiple times. + +* (PHP_5_3) + NEWS: + Move entry to 5.2 + +2009-06-09 Pierre-Alain Joye pierre@gmail.com + +* ext/standard/tests/file/bug41874.phpt + ext/standard/tests/file/bug41874.phpt + ext/standard/tests/file/bug41874_1.phpt + ext/standard/tests/file/bug41874_1.phpt + ext/standard/tests/file/bug41874_2.phpt + ext/standard/tests/file/bug41874_2.phpt + ext/standard/tests/file/bug41874_3.phpt + ext/standard/tests/file/bug41874_3.phpt: + + file bug41874.phpt was initially added on branch PHP_5_3. + +* (PHP_5_3) + TSRM/tsrm_win32.c + ext/standard/proc_open.c: + + 2009-06-08 Scott MacVicar sc...@macvicar.net * (PHP_5_2) @@ -45062,7 +45188,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3429 2009/06/09 01:32:45 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3430 2009/06/10 01:32:46 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Jun 10 01:32:52 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1500r2=1.1501diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1500 ZendEngine2/ChangeLog:1.1501 --- ZendEngine2/ChangeLog:1.1500Tue Jun 9 01:32:50 2009 +++ ZendEngine2/ChangeLog Wed Jun 10 01:32:52 2009 @@ -1,3 +1,9 @@ +2009-06-09 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_3) + zend_execute.h: + - fix build (void alarm) + 2009-06-08 Pierre-Alain Joye pierre@gmail.com * (PHP_5_2) @@ -29092,7 +29098,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1500 2009/06/09 01:32:50 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1501 2009/06/10 01:32:52 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30816,7 +30822,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1500 2009/06/09 01:32:50 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1501 2009/06/10 01:32:52 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] commit freeze for 5.3 branch ahead of thursdays RC3 release
Ahoi, Just a heads up, as announced last week, we are in a commit freeze effective since this morning on the 5.3 branch. If all goes according to plan we will release RC3 this Thursday hoping for this release to become the golden stable release. We will announce the end of the commit freeze sometime during Wednesday. As things look we will stick with re2c as is (including Dmitry's hack to fallback to 5.2 behavior if the new mmap solution doesnt work). Derick is close to having a full fix, but Derick is short on time to really get out all the kinks this can also just get into 5.3.1. Again a commit freeze means no commits to any part unless its clearly a build fix or just touches README's. When in doubt ask Johannes (who should be available again some time tonight). regards, Lukas Kahwe Smith m...@pooteeweet.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c
pajoye Tue Jun 9 09:51:56 2009 UTC
Modified files:
/php-src/ext/mysqlndphp_mysqlnd.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.14
php-src/ext/mysqlnd/php_mysqlnd.c:1.15
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.14 Mon Jun 8 10:19:29 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c Tue Jun 9 09:51:56 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysqlnd.c,v 1.14 2009/06/08 10:19:29 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.15 2009/06/09 09:51:56 pajoye Exp $ */
#include php.h
#include php_ini.h
#include mysqlnd.h
@@ -46,7 +46,7 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-
(void **)values_entry, pos_values) == SUCCESS) {
+ (void **)values_entry, pos_values) == SUCCESS) {
TSRMLS_FETCH();
zstrstring_key;
uintstring_key_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c
pajoye Tue Jun 9 10:03:42 2009 UTC
Modified files:
/php-src/ext/mysqlndphp_mysqlnd.c
Log:
- fix TS build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.15
php-src/ext/mysqlnd/php_mysqlnd.c:1.16
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.15 Tue Jun 9 09:51:56 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c Tue Jun 9 10:03:42 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysqlnd.c,v 1.15 2009/06/09 09:51:56 pajoye Exp $ */
+/* $Id: php_mysqlnd.c,v 1.16 2009/06/09 10:03:42 pajoye Exp $ */
#include php.h
#include php_ini.h
#include mysqlnd.h
@@ -47,12 +47,12 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
(void **)values_entry, pos_values) == SUCCESS) {
- TSRMLS_FETCH();
zstrstring_key;
uintstring_key_len;
ulong num_key;
int s_len;
char*s = NULL;
+ TSRMLS_FETCH();
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key,
string_key_len, num_key, 0, pos_values);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
pajoye Tue Jun 9 10:23:10 2009 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
- fix build (test before commit maybe?)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.15r2=1.16diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.15 php-src/sapi/apache/mod_php.c:1.16
--- php-src/sapi/apache/mod_php.c:1.15 Sat May 23 18:03:27 2009
+++ php-src/sapi/apache/mod_php.c Tue Jun 9 10:23:10 2009
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: mod_php.c,v 1.15 2009/05/23 18:03:27 andrei Exp $ */
+/* $Id: mod_php.c,v 1.16 2009/06/09 10:23:10 pajoye Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -257,7 +257,7 @@
zval **path_translated;
HashTable *symbol_table;
unsigned int new_val_len;
- UConveter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ UConverter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
for (i = 0; i arr-nelts; i++) {
char *val;
--
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
iliaa Tue Jun 9 12:16:31 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: TZ update news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1547r2=1.2027.2.547.2.1548diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1547 php-src/NEWS:1.2027.2.547.2.1548 --- php-src/NEWS:1.2027.2.547.2.1547Tue Jun 9 01:09:28 2009 +++ php-src/NEWSTue Jun 9 12:16:31 2009 @@ -1,6 +1,7 @@ PHP NEWS ||| ?? Jun 2009, PHP 5.2.10 +- Updated timezone database to version 2009.9 (2009i) (Derick) - Added ignore_errors option to http fopen wrapper. (David Zulke, Sara) - Fixed bug #48469 (ldap_get_entries() leaks memory on empty search results). -- 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/cgi cgi_main.c
dsp Tue Jun 9 13:29:40 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
/php-srcNEWS
Log:
Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non
apache).
The fix was provided by Sriram Natarajan.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.70r2=1.267.2.15.2.71diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.70
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.71
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.70 Thu Jun 4 11:53:38 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun 9 13:29:39 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.70 2009/06/04 11:53:38 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.71 2009/06/09 13:29:39 dsp Exp $ */
#include php.h
#include php_globals.h
@@ -964,7 +964,8 @@
}
if (env_path_translated != NULL env_redirect_url !=
NULL
- orig_script_filename != NULL
script_path_translated != NULL) {
+ env_path_translated != script_path_translated
+ strcmp(env_path_translated, script_path_translated)
!= 0) {
/*
pretty much apache specific. If we have a
redirect_url
then our script_filename and script_name
point to the
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1548r2=1.2027.2.547.2.1549diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1548 php-src/NEWS:1.2027.2.547.2.1549
--- php-src/NEWS:1.2027.2.547.2.1548Tue Jun 9 12:16:31 2009
+++ php-src/NEWSTue Jun 9 13:29:39 2009
@@ -34,6 +34,8 @@
(Nuno, Scott)
- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
(Kanwaljeet Singla, Venkat Raman Don)
+- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
+ (Sriram Natarajan, David Soria Parra)
27 May 2009, PHP 5.2.10RC1
--
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) /sapi/cgi cgi_main.c
dsp Tue Jun 9 13:31:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for
non apache).
The fix was provided by Sriram Natarajan.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.40r2=1.267.2.15.2.50.2.41diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.40
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.41
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.40Thu Jun 4 11:51:43 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun 9 13:31:39 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.40 2009/06/04 11:51:43 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.41 2009/06/09 13:31:39 dsp Exp $ */
#include php.h
#include php_globals.h
@@ -1085,8 +1085,8 @@
}
if (env_path_translated != NULL env_redirect_url !=
NULL
- orig_script_filename != NULL
script_path_translated != NULL
- ) {
+ env_path_translated != script_path_translated
+ strcmp(env_path_translated, script_path_translated)
!= 0) {
/*
* pretty much apache specific. If we have a
redirect_url
* then our script_filename and script_name
point to the
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
dsp Tue Jun 9 13:32:12 2009 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non
apache).
The fix was provided by Sriram Natarajan.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.383r2=1.384diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.383 php-src/sapi/cgi/cgi_main.c:1.384
--- php-src/sapi/cgi/cgi_main.c:1.383 Thu Jun 4 11:51:10 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun 9 13:32:12 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.383 2009/06/04 11:51:10 jani Exp $ */
+/* $Id: cgi_main.c,v 1.384 2009/06/09 13:32:12 dsp Exp $ */
#include php.h
#include php_globals.h
@@ -1082,8 +1082,8 @@
}
if (env_path_translated != NULL env_redirect_url !=
NULL
- orig_script_filename != NULL
script_path_translated != NULL
- ) {
+ env_path_translated != script_path_translated
+ strcmp(env_path_translated, script_path_translated)
!= 0) {
/*
* pretty much apache specific. If we have a
redirect_url
* then our script_filename and script_name
point to the
--
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
pajoye Tue Jun 9 14:04:28 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - fix NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1549r2=1.2027.2.547.2.1550diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1549 php-src/NEWS:1.2027.2.547.2.1550 --- php-src/NEWS:1.2027.2.547.2.1549Tue Jun 9 13:29:39 2009 +++ php-src/NEWSTue Jun 9 14:04:28 2009 @@ -24,6 +24,8 @@ - Fixed bug #48247 (Crash on errors during startup). (Stas) - Fixed bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX index value). (Matt) +- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME). + (Sriram Natarajan, David Soria Parra) - Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL SOAP services). (Ilia, lordelph at gmail dot com) - Fixed bug #46109 (Memory leak when mysqli::init() is called multiple times). @@ -34,8 +36,7 @@ (Nuno, Scott) - Fixed bug #42143 (The constant NAN is reported as 0 on Windows) (Kanwaljeet Singla, Venkat Raman Don) -- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME). - (Sriram Natarajan, David Soria Parra) + 27 May 2009, PHP 5.2.10RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c /ext/standard/tests/file bug41874.phpt bug41874_1.phpt bug41874_2.phpt bug41874_3.phpt
pajoye Tue Jun 9 14:07:06 2009 UTC
Modified files:
/php-src/ext/standard proc_open.c
/php-src/ext/standard/tests/filebug41874.phpt bug41874_1.phpt
bug41874_2.phpt bug41874_3.phpt
Log:
- MFB: #41874, separate STDOUT and STDERR in exec functions
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.68
php-src/ext/standard/proc_open.c:1.69
--- php-src/ext/standard/proc_open.c:1.68 Thu Mar 26 20:02:29 2009
+++ php-src/ext/standard/proc_open.cTue Jun 9 14:07:06 2009
@@ -15,7 +15,7 @@
| Author: Wez Furlong w...@thebrainroom.com |
+--+
*/
-/* $Id: proc_open.c,v 1.68 2009/03/26 20:02:29 felipe Exp $ */
+/* $Id: proc_open.c,v 1.69 2009/06/09 14:07:06 pajoye Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -444,6 +444,7 @@
STARTUPINFO si;
BOOL newprocok;
SECURITY_ATTRIBUTES security;
+ DWORD dwCreateFlags = 0;
char *command_with_cmd;
UINT old_error_mode;
#endif
@@ -742,13 +743,18 @@
old_error_mode =
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
}
+ dwCreateFlags = NORMAL_PRIORITY_CLASS;
+ if(strcmp(sapi_module.name, cli) != 0) {
+ dwCreateFlags |= CREATE_NO_WINDOW;
+ }
+
if (bypass_shell) {
- newprocok = CreateProcess(NULL, command, security, security,
TRUE, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env.envp, cwd, si, pi);
+ newprocok = CreateProcess(NULL, command, security, security,
TRUE, dwCreateFlags, env.envp, cwd, si, pi);
} else {
spprintf(command_with_cmd, 0, %s /c %s, GetVersion()
0x8000 ? COMSPEC_NT : COMSPEC_9X, command);
- newprocok = CreateProcess(NULL, command_with_cmd, security,
security, TRUE, NORMAL_PRIORITY_CLASS|CREATE_NO_WINDOW, env.envp, cwd, si,
pi);
-
+ newprocok = CreateProcess(NULL, command_with_cmd, security,
security, TRUE, dwCreateFlags, env.envp, cwd, si, pi);
+
efree(command_with_cmd);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41874.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug41874.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug41874.phpt:1.2
--- /dev/null Tue Jun 9 14:07:06 2009
+++ php-src/ext/standard/tests/file/bug41874.phpt Tue Jun 9 14:07:06 2009
@@ -0,0 +1,22 @@
+--TEST--
+bug #41874 (Separate STDOUT and STDERR in exec functions)
+--CREDITS--
+Venkat Raman Don
+--SKIPIF--
+?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+ die('skip windows only test');
+}
+?
+--FILE--
+?php
+$result = exec('cd 1:\\non_existant; dir nonexistant');
+echo $result;
+system('cd 1:\\non_existant; dir nonexistant');
+$result = shell_exec('cd 1:\\non_existant; dir nonexistant');
+echo $result;
+?
+--EXPECT--
+The system cannot find the drive specified.
+The system cannot find the drive specified.
+The system cannot find the drive specified.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41874_1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug41874_1.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug41874_1.phpt:1.2
--- /dev/null Tue Jun 9 14:07:06 2009
+++ php-src/ext/standard/tests/file/bug41874_1.phpt Tue Jun 9 14:07:06 2009
@@ -0,0 +1,16 @@
+--TEST--
+bug #41874 (Separate STDOUT and STDERR in exec functions)
+--CREDITS--
+Venkat Raman Don
+--SKIPIF--
+?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+ die('skip windows only test');
+}
+?
+--FILE--
+?php
+popen(1:\\non_existent, r);
+?
+--EXPECT--
+The system cannot find the drive specified.
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41874_2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug41874_2.phpt
diff -u /dev/null php-src/ext/standard/tests/file/bug41874_2.phpt:1.2
--- /dev/null Tue Jun 9 14:07:06 2009
+++ php-src/ext/standard/tests/file/bug41874_2.phpt Tue Jun 9 14:07:06 2009
@@ -0,0 +1,17 @@
+--TEST--
+bug #41874 (Separate STDOUT and STDERR in exec functions)
+--CREDITS--
+Venkat Raman Don
+--SKIPIF--
+?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+ die('skip windows only test');
+}
+?
+--FILE--
+?php
+$result = exec('cd 1:\\non_existant; dir nonexistant');
+echo $result;
+?
+--EXPECT--
+The system cannot find the drive specified.
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug41874_3.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/bug41874_3.phpt
diff
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
pajoye Tue Jun 9 14:10:09 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - #41874 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.618r2=1.2027.2.547.2.965.2.619diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.618 php-src/NEWS:1.2027.2.547.2.965.2.619 --- php-src/NEWS:1.2027.2.547.2.965.2.618 Tue Jun 9 02:00:46 2009 +++ php-src/NEWSTue Jun 9 14:10:08 2009 @@ -23,6 +23,8 @@ --enable-zend-multibyte is used). (Jani) - Fixed bug #48188 (Cannot execute a scrollable cursors twice with PDO_PGSQL). (Matteo) +- Fixed bug #41874 (separate STDOUT and STDERR in exec functions). + (Kanwaljeet Singla, Venkat Raman Don, Pierre) - Fixed bug #38802 (max_redirects and ignore_errors). (patch by datib...@php.net) - Fixed isset() on sub-directories (isset(blah) if file blah/foo.php exists). -- 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) / NEWS
pajoye Tue Jun 9 16:38:17 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - missing ACL entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.619r2=1.2027.2.547.2.965.2.620diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.619 php-src/NEWS:1.2027.2.547.2.965.2.620 --- php-src/NEWS:1.2027.2.547.2.965.2.619 Tue Jun 9 14:10:08 2009 +++ php-src/NEWSTue Jun 9 16:38:17 2009 @@ -14,6 +14,8 @@ - Added the ability for json_decode() to take a user specified depth. (Scott) - Added support for the mysql_stmt_next_result() function from libmysql. (Andrey) +- Added support for ACL (is_writable, is_readable, reports now correct results) + on Windows. (Pierre, Venkat Raman Don, Kanwaljeet Singla) - Fixed bug #48493 (spl_autoload_register() doesn't work correctly when prepending functions). (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/tests mb_substitute_character_variation1.phpt
wharmby Tue Jun 9 20:18:29 2009 UTC Modified files: /php-src/ext/mbstring/tests mb_substitute_character_variation1.phpt Log: Fix test - remove bogus variation http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.2 php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.3 --- php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.2 Fri Dec 5 13:13:14 2008 +++ php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt Tue Jun 9 20:18:29 2009 @@ -105,9 +105,6 @@ // unset data 'unset var' = @$unset_var, - - // resource variable - 'resource' = $fp ); // loop through each element of the array for substchar @@ -232,8 +229,5 @@ --unset var-- Error: 2 - mb_substitute_character(): Unknown character., %s(%d) bool(false) - ---resource-- -bool(true) ===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_3) /ext/mbstring/tests mb_substitute_character_variation1.phpt
wharmby Tue Jun 9 20:18:31 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests mb_substitute_character_variation1.phpt Log: Fix test - remove bogus variation http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.4.2 php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.4.3 --- php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.4.2 Fri Dec 5 13:10:48 2008 +++ php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt Tue Jun 9 20:18:31 2009 @@ -105,9 +105,6 @@ // unset data 'unset var' = @$unset_var, - - // resource variable - 'resource' = $fp ); // loop through each element of the array for substchar @@ -230,8 +227,5 @@ --unset var-- Error: 2 - mb_substitute_character(): Unknown character., %s(%d) bool(false) - ---resource-- -bool(true) ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase/sections/executablesections rtFileExternalSectionTest.php
zoe Tue Jun 9 20:27:57 2009 UTC
Modified files:
/phpruntests/tests/testcase/sections/executablesections
rtFileExternalSectionTest.php
Log:
modified file external test
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php?r1=1.2r2=1.3diff_format=u
Index:
phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php
diff -u
phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php:1.2
phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php:1.3
---
phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php:1.2
Mon May 18 22:38:27 2009
+++
phpruntests/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php
Tue Jun 9 20:27:57 2009
@@ -12,28 +12,6 @@
$this-assertEquals('?php', $code[0]);
}
-
-public function testTooMuchFiles()
-{
-$fileSection = rtFileExternalSection::getInstance('FILE_EXTERNAL',
array('file1','file2'));
- $content = $fileSection-getContents();
- $config = rtRuntestsConfiguration::getInstance(array());
- $test = new rtPhpTest($content, 'TEST', array('FILE_EXTERNAL'),
$config);
-
- $status = $fileSection-run($test, $config);
-
-$this-assertEquals('One file per testcase permitted.',
$status['fail']);
-}
-
-public function testNotExistingFile()
-{
-$fileSection = rtFileExternalSection::getInstance('FILE_EXTERNAL',
array('file1'));
-$content = $fileSection-getContents();
-$config = rtRuntestsConfiguration::getInstance(array());
-$test = new rtPhpTest($content, 'TEST', array('FILE_EXTERNAL'),
$config);
-
-$this-assertEquals('Can not open external file /file1',
$status['fail']);
-}
}
?
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase rtFileExternalExecutionTest.php
zoe Tue Jun 9 20:28:28 2009 UTC
Added files:
/phpruntests/tests/testcase rtFileExternalExecutionTest.php
Log:
new file external test - tests execution
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtFileExternalExecutionTest.php?view=markuprev=1.1
Index: phpruntests/tests/testcase/rtFileExternalExecutionTest.php
+++ phpruntests/tests/testcase/rtFileExternalExecutionTest.php
?php
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../src/rtAutoload.php';
class rtCleanExecutionTest extends PHPUnit_Framework_TestCase
{
private $path_to_tests;
private $sample_test;
private $sample_fail;
public function setUp()
{
$this-php = trim(shell_exec(which php));
$this-path_to_tests = realpath(dirname(__FILE__) .
'/../../phpt-tests');
$this-sample_test = $this-path_to_tests . '/sample_fileexternal.phpt';
$this-sample_fail1 = $this-path_to_tests .
'/sample_fileexternal1.phpt';
$this-sample_fail2 = $this-path_to_tests .
'/sample_fileexternal2.phpt';
}
public function tearDown()
{
}
public function testFileRun()
{
//Create a new test configuration
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this-php, $this-sample_test));
$config-configure();
//Retrieve the array of test file names
$testFiles = $config-getSetting('TestFiles');
//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testFiles[0]);
$testFile-normaliseLineEndings();
//Create a new test case
$status = new rtTestStatus($testFile-getTestName());
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $config, $status);
//Setup and set the local environment for the test case
$testCase-executeTest($config);
//Check that the temp file has been removed
$this-assertTrue($testCase-getStatus()-getValue('pass'));
}
public function testFail1()
{
//Create a new test configuration
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this-php, $this-sample_fail1));
$config-configure();
//Retrieve the array of test file names
$testFiles = $config-getSetting('TestFiles');
//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testFiles[0]);
$testFile-normaliseLineEndings();
//Create a new test case
$status = new rtTestStatus($testFile-getTestName());
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $config, $status);
//Setup and set the local environment for the test case
$testCase-executeTest($config);
$this-assertTrue($testCase-getStatus()-getValue('fail'));
$this-assertEquals('One file per testcase
permitted.',$testCase-getStatus()-getMessage('fail'));
}
public function testFail2()
{
//Create a new test configuration
$config = rtRuntestsConfiguration::getInstance(array('run-tests.php',
'-p', $this-php, $this-sample_fail2));
$config-configure();
//Retrieve the array of test file names
$testFiles = $config-getSetting('TestFiles');
//Read the test file
$testFile = new rtPhpTestFile();
$testFile-doRead($testFiles[0]);
$testFile-normaliseLineEndings();
//Create a new test case
$status = new rtTestStatus($testFile-getTestName());
$testCase = new rtPhpTest($testFile-getContents(),
$testFile-getTestName(), $testFile-getSectionHeadings(), $config, $status);
//Setup and set the local environment for the test case
$testCase-executeTest($config);
$this-assertTrue($testCase-getStatus()-getValue('fail'));
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtFileExternalSection.php
zoe Tue Jun 9 20:28:48 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/executablesections
rtFileExternalSection.php
Log:
fixed a typo
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php?r1=1.8r2=1.9diff_format=u
Index:
phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php:1.8
phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php:1.9
---
phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php:1.8
Sun Jun 7 08:34:15 2009
+++
phpruntests/src/testcase/sections/executablesections/rtFileExternalSection.php
Tue Jun 9 20:28:47 2009
@@ -34,8 +34,8 @@
private function copyExternalFileContent($testStatus)
{
if (sizeof($this-sectionContents) != 1) {
- $this-testStatus-setTrue('fail');
-$this-testStatus-setMessage('fail', 'One file per testcase
permitted.');
+ $testStatus-setTrue('fail');
+$testStatus-setMessage('fail', 'One file per testcase
permitted.');
return $testStatus;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase rtFileExternalExecutionTest.php
zoe Tue Jun 9 20:37:20 2009 UTC
Modified files:
/phpruntests/tests/testcase rtFileExternalExecutionTest.php
Log:
copy and paste mistake
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/rtFileExternalExecutionTest.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/tests/testcase/rtFileExternalExecutionTest.php
diff -u phpruntests/tests/testcase/rtFileExternalExecutionTest.php:1.1
phpruntests/tests/testcase/rtFileExternalExecutionTest.php:1.2
--- phpruntests/tests/testcase/rtFileExternalExecutionTest.php:1.1 Tue Jun
9 20:28:28 2009
+++ phpruntests/tests/testcase/rtFileExternalExecutionTest.php Tue Jun 9
20:37:20 2009
@@ -3,7 +3,7 @@
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../src/rtAutoload.php';
-class rtCleanExecutionTest extends PHPUnit_Framework_TestCase
+class rtFileExternalExecutionTest extends PHPUnit_Framework_TestCase
{
private $path_to_tests;
private $sample_test;
--
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/mbstring/tests mb_substitute_character_variation1.phpt
wharmby Tue Jun 9 20:18:28 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring/tests mb_substitute_character_variation1.phpt Log: Fix test - remove bogus variation http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt diff -u php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.2.1 php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.2.2 --- php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt:1.1.2.1 Wed Dec 3 13:03:56 2008 +++ php-src/ext/mbstring/tests/mb_substitute_character_variation1.phpt Tue Jun 9 20:18:28 2009 @@ -105,9 +105,6 @@ // unset data 'unset var' = @$unset_var, - - // resource variable - 'resource' = $fp ); // loop through each element of the array for substchar @@ -232,7 +229,4 @@ --unset var-- Error: 2 - mb_substitute_character(): Unknown character., %s(%d) bool(false) - ---resource-- -bool(true) ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
