[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
bjori Sat Jun 27 13:23:03 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcUPGRADING
Log:
- Added missing deprecated things
- Added missing INI settings
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.32r2=1.1.2.3.2.1.2.33diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.32 php-src/UPGRADING:1.1.2.3.2.1.2.33
--- php-src/UPGRADING:1.1.2.3.2.1.2.32 Fri Jun 26 15:15:02 2009
+++ php-src/UPGRADING Sat Jun 27 13:23:03 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.32 2009/06/26 15:15:02 sixd Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.33 2009/06/27 13:23:03 bjori Exp $
UPGRADE NOTES - PHP 5.3
@@ -162,6 +162,8 @@
- call_user_method() and call_user_method_array() are now deprecated. Use
call_user_func() and call_user_func_array() instead.
+- dl() is deprecated.
+
- The set_magic_quotes_runtime() function is now deprecated.
- mysql_listtables(), mysql_dropdb(), mysql_createdb(), mysql_list_tables(),
@@ -174,6 +176,10 @@
- mcrypt_generic_end() is deprecated.
+- mysql_db_query() is deprecated.
+
+- mysql_escape_string() is deprecated.
+
- session_register(), session_unregister(), and session_is_registered() are now
deprecated. Use the $_SESSION superglobal array instead.
@@ -190,6 +196,16 @@
- magic_quotes_runtime
- magic_quotes_sybase
+- The is_dst parameter to mktime() is deprecated.
+
+- Assigning the return value of new by reference is deprecated
+
+- Call-time pass-by-reference has been deprecated
+
+- Usage of {} to access string offsets is deprecated
+
+- Passing locale category name as string to setlocale() is deprecated.
+
===
6. Undeprecated
===
@@ -309,9 +325,37 @@
- The default value of oci8.default_prefetch has been changed from 10 to 100.
+- open_basedir is now PHP_INI_ALL
+
- A new directive, request_order, controls the behavior of $_REQUEST
independently of variables_order.
+- New INI directives:
+ - mail.add_x_header
+ - user_ini.filename
+ - user_ini.cache_ttl
+ - exit_on_timeout
+ - mysqli.allow_persistent
+ - mysqli.default_host
+ - mysqli.default_socket
+ - mysqli.allow_local_infile
+ - mysqli.cache_size
+ - oci8.connection_class
+ - pdo_mysql.default_socket
+ - pdo_mysql.debug
+ - pdo_mysql.cache_size
+ - sqlite3.extension_dir
+ - mysql.default_socket
+ - mysql.allow_local_infile
+ - mysql.cache_size
+ - mysqlnd.collect_statistics
+ - mysqlnd.collect_memory_statistics
+ - mysqlnd.debug
+ - mysqlnd.net_cmd_buffer_size
+ - mysqlnd.net_read_buffer_size
+ - mysqlnd.log_mask
+
+
10. Syntax additions
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/configuration/preconditions rtIfParallelHasPcntlTest.php
zoe Sat Jun 27 13:23:17 2009 UTC
Modified files:
/phpruntests/tests/configuration/preconditions
rtIfParallelHasPcntlTest.php
Log:
fixing test to provide argument to -z
http://cvs.php.net/viewvc.cgi/phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php?r1=1.6r2=1.7diff_format=u
Index:
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
diff -u
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.6
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.7
---
phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php:1.6
Tue May 12 22:41:20 2009
+++ phpruntests/tests/configuration/preconditions/rtIfParallelHasPcntlTest.php
Sat Jun 27 13:23:17 2009
@@ -43,7 +43,7 @@
*/
public function testCheckWhenCommandLineOptionIsSet()
{
-$runtestsConfiguration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', '-z'));
+$runtestsConfiguration =
rtRuntestsConfiguration::getInstance(array('run-tests.php', '-z', '1'));
$this-assertEquals(extension_loaded('pcntl'),
$this-preCondition-check($runtestsConfiguration));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskScheduler.php
zoe Sat Jun 27 13:29:33 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskScheduler.php
Log:
Fix missing L in NULL
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskScheduler.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskScheduler.php
diff -u phpruntests/src/taskScheduler/rtTaskScheduler.php:1.1
phpruntests/src/taskScheduler/rtTaskScheduler.php:1.2
--- phpruntests/src/taskScheduler/rtTaskScheduler.php:1.1 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/taskScheduler/rtTaskScheduler.php Sat Jun 27 13:29:32 2009
@@ -41,7 +41,7 @@
}
-public static function getInstance(array $taskList=NULL,
$processCount=NUL, $useMsgQ=false)
+public static function getInstance(array $taskList=NULL,
$processCount=NULL, $useMsgQ=false)
{
// TODO: remove this statement and check this by runtime-config
if (extension_loaded('pcntl')) {
--
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) / php.ini-development php.ini-production
bjori Sat Jun 27 13:29:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: - Remove outdated version information - Remove no-longer-existing windows dll (there could be more..) - List missing INI directives (need to add descriptions to them and sort them correctly..) http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.9r2=1.1.2.10diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.9 php-src/php.ini-development:1.1.2.10 --- php-src/php.ini-development:1.1.2.9 Mon May 4 15:20:38 2009 +++ php-src/php.ini-development Sat Jun 27 13:29:53 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is . @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1346,7 +1345,7 @@ ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. ; -; As of PHP 4.0.1, you can define the path as: +; The path can be defined as: ; ; session.save_path = N;/path ; @@ -1758,6 +1757,45 @@ ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +;soap.wsdl_cache_limit= +;dba.default_handler= +;pdo_odbc.db2_instance_name= +;mcrypt.algorithms_dir= +;mcrypt.modes_dir= +;ibase.allow_persistent= +;ibase.max_persistent= +;ibase.max_links= +;ibase.default_db= +;ibase.default_user= +;ibase.default_password= +;ibase.default_charset= +;ibase.timestampformat= +;ibase.dateformat= +;ibase.timeformat= +;mysqli.max_persistent= +;mysqli.allow_persistent= +;mysqli.allow_local_infile= +;mysqli.cache_size= +;mbstring.script_encoding= +;mbstring.http_output_conv_mimetypes= +;pdo_mysql.default_socket= +;pdo_mysql.debug= +;pdo_mysql.cache_size= +;com.code_page= +;mysql.allow_local_infile= +;mysql.cache_size= +;mysqlnd.collect_statistics= +;mysqlnd.collect_memory_statistics= +;mysqlnd.debug= +;mysqlnd.net_cmd_buffer_size= +;mysqlnd.net_read_buffer_size= +;mysqlnd.log_mask= +;odbc.default_cursortype= +;session.encode_sources= +;ldap.max_links= +;sybct.login_timeout= +;sybct.hostname= +;sybct.deadlock_retry_count= ; Local Variables: ; tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.9r2=1.1.2.10diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.9 php-src/php.ini-production:1.1.2.10 --- php-src/php.ini-production:1.1.2.9 Mon May 4 15:20:38 2009 +++ php-src/php.ini-production Sat Jun 27 13:29:53 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is . @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1346,7 +1345,7 @@ ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. ; -; As of PHP 4.0.1, you can define the path as: +; The path can be defined as: ; ; session.save_path = N;/path ; @@ -1758,6 +1757,45 @@ ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +;soap.wsdl_cache_limit= +;dba.default_handler= +;pdo_odbc.db2_instance_name= +;mcrypt.algorithms_dir= +;mcrypt.modes_dir= +;ibase.allow_persistent= +;ibase.max_persistent= +;ibase.max_links= +;ibase.default_db= +;ibase.default_user= +;ibase.default_password= +;ibase.default_charset= +;ibase.timestampformat= +;ibase.dateformat= +;ibase.timeformat= +;mysqli.max_persistent= +;mysqli.allow_persistent= +;mysqli.allow_local_infile= +;mysqli.cache_size= +;mbstring.script_encoding= +;mbstring.http_output_conv_mimetypes= +;pdo_mysql.default_socket= +;pdo_mysql.debug= +;pdo_mysql.cache_size= +;com.code_page= +;mysql.allow_local_infile= +;mysql.cache_size= +;mysqlnd.collect_statistics=
[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
bjori Sat Jun 27 13:33:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Group the open_basedir entries http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.33r2=1.1.2.3.2.1.2.34diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.33 php-src/UPGRADING:1.1.2.3.2.1.2.34 --- php-src/UPGRADING:1.1.2.3.2.1.2.33 Sat Jun 27 13:23:03 2009 +++ php-src/UPGRADING Sat Jun 27 13:33:20 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.33 2009/06/27 13:23:03 bjori Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.34 2009/06/27 13:33:20 bjori Exp $ UPGRADE NOTES - PHP 5.3 @@ -319,14 +319,14 @@ - It is now possible to use alphanumeric or variable indices in INI option arrays. +- open_basedir is now PHP_INI_ALL + - Runtime tightening of open_basedir restrictions is now possible. - The default value of session.use_only_cookies has changed to 1. - The default value of oci8.default_prefetch has been changed from 10 to 100. -- open_basedir is now PHP_INI_ALL - - A new directive, request_order, controls the behavior of $_REQUEST independently of variables_order. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Sat Jun 27 13:53:54 2009 UTC
Modified files:
/phpruntests/src/testrunrtPhpTestRun.php
Log:
remove comments from outputwriter
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.12r2=1.13diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.12
phpruntests/src/testrun/rtPhpTestRun.php:1.13
--- phpruntests/src/testrun/rtPhpTestRun.php:1.12 Fri Jun 26 00:07:24 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpSat Jun 27 13:53:54 2009
@@ -73,7 +73,7 @@
foreach ($subDirectories as $subDirectory) {
$testGroup = new rtPhpTestGroup($runConfiguration,
$subDirectory);
$testGroup-runGroup($runConfiguration);
- // $testGroup-writeGroup();
+ $testGroup-writeGroup();
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main php_ini.c
mkoppanen Sat Jun 27 15:22:06 2009 UTC
Modified files:
/php-srcNEWS
/php-src/main php_ini.c
Log:
[DOC]
Support multiple paths (separated by path_separator) in
config-file-scan-dir/PHP_INI_SCAN_DIR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2182r2=1.2183diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2182 php-src/NEWS:1.2183
--- php-src/NEWS:1.2182 Tue May 19 09:47:06 2009
+++ php-src/NEWSSat Jun 27 15:22:06 2009
@@ -6,6 +6,8 @@
- Changed allow_url_fopen and allow_url_include php.ini directives to allow
per-wrapper enable/disable and runtime tightening. (Sara)
+- Changed config-file-scan-dir/PHP_INI_SCAN_DIR to allow multiple paths (Mikko)
+
- Removed undocumented and incomplete support for strings in list() operator.
(Dmitry)
- Removed old legacy:
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.173r2=1.174diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.173 php-src/main/php_ini.c:1.174
--- php-src/main/php_ini.c:1.173Mon May 18 21:28:42 2009
+++ php-src/main/php_ini.c Sat Jun 27 15:22:06 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.173 2009/05/18 21:28:42 derick Exp $ */
+/* $Id: php_ini.c,v 1.174 2009/06/27 15:22:06 mkoppanen Exp $ */
#include php.h
#include ext/standard/info.h
@@ -349,7 +349,8 @@
char *open_basedir;
int free_ini_search_path = 0;
zend_file_handle fh;
-
+ static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
+
if (zend_hash_init(configuration_hash, 0, NULL, (dtor_func_t)
config_zval_dtor, 1) == FAILURE) {
return FAILURE;
}
@@ -372,7 +373,6 @@
char *default_location;
char *env_location;
char *binary_location;
- static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0
};
#ifdef PHP_WIN32
char *reg_location;
#endif
@@ -608,72 +608,83 @@
/* Scan and parse any .ini files found in scan path if path not empty.
*/
if (!sapi_module.php_ini_ignore php_ini_scanned_path_len) {
- struct dirent **namelist;
int ndir, i;
struct stat sb;
char ini_file[MAXPATHLEN];
- char *p;
+ char *p, *last, *path_copy, *ini_path = NULL;
zend_file_handle fh;
zend_llist scanned_ini_list;
zend_llist_element *element;
int l, total_l = 0;
- /* Reset active ini section */
- RESET_ACTIVE_INI_HASH();
-
- if ((ndir = php_scandir(php_ini_scanned_path, namelist, 0,
php_alphasort)) 0) {
- zend_llist_init(scanned_ini_list, sizeof(char *),
(llist_dtor_func_t) free_estring, 1);
- memset(fh, 0, sizeof(fh));
-
- for (i = 0; i ndir; i++) {
-
- /* check for any file with .ini extension */
- if (!(p = strrchr(namelist[i]-d_name, '.')) ||
(p strcmp(p, .ini))) {
- free(namelist[i]);
- continue;
- }
- if
(IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
- snprintf(ini_file, MAXPATHLEN, %s%s,
php_ini_scanned_path, namelist[i]-d_name);
- } else {
- snprintf(ini_file, MAXPATHLEN,
%s%c%s, php_ini_scanned_path, DEFAULT_SLASH, namelist[i]-d_name);
- }
- if (VCWD_STAT(ini_file, sb) == 0) {
- if (S_ISREG(sb.st_mode)) {
- if ((fh.handle.fp =
VCWD_FOPEN(ini_file, r))) {
- fh.filename = ini_file;
- fh.type =
ZEND_HANDLE_FP;
-
- if
(zend_parse_ini_file(fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)
php_ini_parser_cb, configuration_hash TSRMLS_CC) == SUCCESS) {
- /* Here, add it
to the list of ini files read */
- l =
strlen(ini_file);
- total_l += l +
2;
- p =
estrndup(ini_file, l);
-
zend_llist_add_element(scanned_ini_list, p);
+ /* List of found ini files */
+ zend_llist_init(scanned_ini_list, sizeof(char
[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskTestGroup.php
g2 Sat Jun 27 17:47:55 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskTestGroup.php
Log:
phpruntests - removed out-commented line (write output)
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskTestGroup.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskTestGroup.php
diff -u phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.1
phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.2
--- phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.1 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/taskScheduler/rtTaskTestGroup.php Sat Jun 27 17:47:54 2009
@@ -27,7 +27,7 @@
{
$testGroup = new rtPhpTestGroup($this-runConfiguration,
$this-subDirectory);
$testGroup-runGroup($this-runConfiguration);
- // $testGroup-writeGroup();
+ $testGroup-writeGroup();
return true;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
pajoye Sat Jun 27 21:20:25 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- fix regression introduced by the fix for #48518 (Ilia, Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.173r2=1.174diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.173 php-src/ext/curl/interface.c:1.174
--- php-src/ext/curl/interface.c:1.173 Mon Jun 15 12:38:57 2009
+++ php-src/ext/curl/interface.cSat Jun 27 21:20:25 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.173 2009/06/15 12:38:57 iliaa Exp $ */
+/* $Id: interface.c,v 1.174 2009/06/27 21:20:25 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -2118,6 +2118,14 @@
RETURN_STRINGL(ch-handlers-write-buf.c,
ch-handlers-write-buf.len, 1);
}
+ /* flush the file handle, so any remaining data is synched to disk */
+ if (ch-handlers-write-method == PHP_CURL_FILE
ch-handlers-write-fp) {
+ fflush(ch-handlers-write-fp);
+ }
+ if (ch-handlers-write_header-method == PHP_CURL_FILE
ch-handlers-write_header-fp) {
+ fflush(ch-handlers-write_header-fp);
+ }
+
if (ch-handlers-write-method == PHP_CURL_RETURN) {
RETURN_EMPTY_STRING();
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTaskScheduler.php rtTaskSchedulerFile.php /tests rtTaskSchedulerTest.php
g2 Sat Jun 27 23:57:46 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskScheduler.php
rtTaskSchedulerFile.php
/phpruntests/tests rtTaskSchedulerTest.php
Log:
phpruntests - minor bugfix task-scheduler
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskScheduler.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskScheduler.php
diff -u phpruntests/src/taskScheduler/rtTaskScheduler.php:1.2
phpruntests/src/taskScheduler/rtTaskScheduler.php:1.3
--- phpruntests/src/taskScheduler/rtTaskScheduler.php:1.2 Sat Jun 27
13:29:32 2009
+++ phpruntests/src/taskScheduler/rtTaskScheduler.php Sat Jun 27 23:57:46 2009
@@ -107,24 +107,21 @@
$task = $this-taskList[$i];
if ($task-run() === true) {
- $task-setState(task::PASS);
+ $task-setState(rtTask::PASS);
$this-countPass++;
} else {
- $task-setState(task::FAIL);
+ $task-setState(rtTask::FAIL);
$this-countFail++;
}
$this-memStore[] = memory_get_usage(true);
-
- print .;
- flush();
-
+
$this-taskList[$i] = $task;
}
$error = microtime(true);
- $this-time = round($error-$s,5);
+ $this-time = round($e-$s,5);
return;
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskSchedulerFile.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskSchedulerFile.php
diff -u phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.1
phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.2
--- phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.1 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/taskScheduler/rtTaskSchedulerFile.php Sat Jun 27
23:57:46 2009
@@ -151,8 +151,6 @@
if ($this-groupTasks == true) {
- $c = 0;
-
foreach ($this-taskList as $key = $list) {
for ($i=0; $isizeof($list); $i++) {
@@ -165,7 +163,13 @@
for ($i=0; $isizeof($this-taskList); $i++) {
- $taskStr[$i%$this-processCount] .= $i.';';
+ $cid = $i%$this-processCount;
+
+ if (!isset($taskStr[$cid])) {
+ $taskStr[$cid] = '';
+ }
+
+ $taskStr[$cid] .= $i.';';
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/tests/rtTaskSchedulerTest.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/tests/rtTaskSchedulerTest.php
diff -u phpruntests/tests/rtTaskSchedulerTest.php:1.1
phpruntests/tests/rtTaskSchedulerTest.php:1.2
--- phpruntests/tests/rtTaskSchedulerTest.php:1.1 Fri Jun 26 00:07:24 2009
+++ phpruntests/tests/rtTaskSchedulerTest.php Sat Jun 27 23:57:46 2009
@@ -7,10 +7,11 @@
{
public function testResult()
{
-// create 10 tasks with random numbers
$taskList = array();
$expected = array();
+ $results = array();
+ // create 10 tasks with random numbers
for ($i=0; $i10; $i++) {
$n = rand(0,9);
$expected[$i] = $n+1;
@@ -24,8 +25,6 @@
$scheduler-run();
// get the results from the manupilated task-list
- $results = array();
-
foreach ($scheduler-getTaskList() as $task) {
$results[] = $task-getNumber();
}
@@ -61,5 +60,4 @@
}
}
-
-?
+?
\ 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: php-src /ext/pdo_dblib dblib_driver.c
felipe Sun Jun 28 02:02:09 2009 UTC
Modified files:
/php-src/ext/pdo_dblib dblib_driver.c
Log:
- Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException
SQLSTATE[] (null))
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.19r2=1.20diff_format=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.19
php-src/ext/pdo_dblib/dblib_driver.c:1.20
--- php-src/ext/pdo_dblib/dblib_driver.c:1.19 Thu Mar 19 22:15:03 2009
+++ php-src/ext/pdo_dblib/dblib_driver.cSun Jun 28 02:02:09 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dblib_driver.c,v 1.19 2009/03/19 22:15:03 sfox Exp $ */
+/* $Id: dblib_driver.c,v 1.20 2009/06/28 02:02:09 felipe Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -230,9 +230,11 @@
goto cleanup;
}
+#if PHP_DBLIB_IS_MSSQL
if (DBSETOPT(H-link, DBTEXTLIMIT, 2147483647) == FAIL) {
goto cleanup;
}
+#endif
if (vars[3].optval FAIL == dbuse(H-link, vars[3].optval)) {
goto cleanup;
--
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/pdo_dblib dblib_driver.c
felipe Sun Jun 28 02:09:51 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_dblib dblib_driver.c
/php-srcNEWS
Log:
- MFH: Fixed bug #48539 (pdo_dblib fails to connect, throws empty
PDOException SQLSTATE[] (null))
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.9.2.2.2.5r2=1.9.2.2.2.6diff_format=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5
php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.6
--- php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5Fri Mar 20 22:14:17 2009
+++ php-src/ext/pdo_dblib/dblib_driver.cSun Jun 28 02:09:50 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dblib_driver.c,v 1.9.2.2.2.5 2009/03/20 22:14:17 sfox Exp $ */
+/* $Id: dblib_driver.c,v 1.9.2.2.2.6 2009/06/28 02:09:50 felipe Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -230,9 +230,11 @@
goto cleanup;
}
+#if PHP_DBLIB_IS_MSSQL
if (DBSETOPT(H-link, DBTEXTLIMIT, 2147483647) == FAIL) {
goto cleanup;
}
+#endif
if (vars[3].optval FAIL == dbuse(H-link, vars[3].optval)) {
goto cleanup;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1570r2=1.2027.2.547.2.1571diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1570 php-src/NEWS:1.2027.2.547.2.1571
--- php-src/NEWS:1.2027.2.547.2.1570Sun Jun 28 01:16:36 2009
+++ php-src/NEWSSun Jun 28 02:09:50 2009
@@ -11,6 +11,8 @@
- Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
- Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
with new lines) (Takeshi Abe)
+- Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException
+ SQLSTATE[] (null)). (Felipe)
- Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
TMPDIR). (Ilia)
- Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings parse_str_basic1.phpt parse_str_basic3.phpt parse_str_basic4.phpt
felipe Sun Jun 28 02:36:19 2009 UTC
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings parse_str_basic1.phpt
parse_str_basic3.phpt
parse_str_basic4.phpt
Log:
- Fixed bug #48658 (Change in behaviour of parse_str on php 6.0)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.701r2=1.702diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.701 php-src/ext/standard/string.c:1.702
--- php-src/ext/standard/string.c:1.701 Mon May 25 14:32:15 2009
+++ php-src/ext/standard/string.c Sun Jun 28 02:36:19 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.701 2009/05/25 14:32:15 felipe Exp $ */
+/* $Id: string.c,v 1.702 2009/06/28 02:36:19 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6199,7 +6199,7 @@
int enc_string_len;
zval *result = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|a,
enc_string, enc_string_len, result) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|z,
enc_string, enc_string_len, result) == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic1.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.1
php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic1.phpt:1.1Tue Jun
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic1.phptSun Jun 28
02:36:19 2009
@@ -1,8 +1,5 @@
--TEST--
Test parse_str() function : basic functionality
---XFAIL--
-Bug 48658: Test currently fails as parse_str() api insists that the optional
reult array
-is pre-defined.
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic3.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic3.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.1
php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic3.phpt:1.1Tue Jun
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic3.phptSun Jun 28
02:36:19 2009
@@ -1,8 +1,5 @@
--TEST--
Test parse_str() function : Basic functionality
---XFAIL--
-Bug 48658: Test currently fails as parse_str() api insists that the optional
reult array
-is pre-defined. php.net bugzilla
--FILE--
?php
/* Prototype : void parse_str ( string $str [, array $arr ] )
@@ -163,9 +160,9 @@
array(1) {
[uarr]=
array(2) {
-[first]=
+[ufirst]=
unicode(3) sid
-[forth]=
+[uforth]=
unicode(4) bill
}
}
@@ -191,19 +188,19 @@
Test string with single quotes characters
NULL
unicode(4) Bill
-unicode(9) O\'Reilly
+unicode(8) O'Reilly
Test string with backslash characters
NULL
-unicode(7) 10\\2=5
+unicode(6) 10\2=5
Test string with double quotes data
NULL
-unicode(32) A string with \quoted\ strings
+unicode(30) A string with quoted strings
Test string with nulls
NULL
-unicode(37) A string with containing \0\0\0 nulls
+unicode(34) A string with containing
Test string with 2-dim array with numeric keys
NULL
@@ -245,7 +242,7 @@
array(2) {
[uone]=
array(1) {
- [four]=
+ [ufour]=
unicode(3) sid
}
[uthree]=
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic4.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/parse_str_basic4.phpt
diff -u php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.1
php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.2
--- php-src/ext/standard/tests/strings/parse_str_basic4.phpt:1.1Tue Jun
23 22:39:42 2009
+++ php-src/ext/standard/tests/strings/parse_str_basic4.phptSun Jun 28
02:36:19 2009
@@ -1,8 +1,5 @@
--TEST--
Test parse_str() function : test with badly formed strings
---XFAIL--
-Bug 48658: Test currently fails as parse_str() api insists that the optional
reult array
-is pre-defined. php.net bugzilla
--FILE--
?php
/* Prototype : void parse_str ( string $str [, array $arr ] )
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
