[PHP-CVS] cvs: phpruntests /src/testcase/output rtTestOutputWriterCSV.php
zoe Sun Jun 28 09:46:49 2009 UTC
Added files:
/phpruntests/src/testcase/outputrtTestOutputWriterCSV.php
Log:
csv writer for output checking
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterCSV.php?view=markuprev=1.1
Index: phpruntests/src/testcase/output/rtTestOutputWriterCSV.php
+++ phpruntests/src/testcase/output/rtTestOutputWriterCSV.php
?php
/**
* rtTestOutputWriterCSV
*
* Write minimal testoutput and status a CSV
*
* @category Testing
* @packageRUNTESTS
* @author Zoe Slattery z...@php.net
* @author Stefan Priebsch sprieb...@php.net
* @copyright 2009 The PHP Group
* @licensehttp://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
*
*/
class rtTestOutputWriterCSV extends rtTestOutputWriter
{
protected $testOutput = array();
public function __construct(array $testResults)
{
$this-init($testResults);
}
/**
*
*
* @param array of rtTestResults
*
*/
public function init (array $testResults)
{
foreach ($testResults as $testResult) {
$outputString = $testResult-getName();
$testStatus = $testResult-getStatus();
foreach($testStatus-getTestStateNames() as $name) {
if($testStatus-getValue($name)) {
$outputString .= , . strtoupper($name);
}
}
$this-testOutput[] = $outputString;
}
}
public function write($testDirectory = null)
{
sort($this-testOutput);
foreach ($this-testOutput as $line) {
echo $line .\n;
}
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtClassMap.php
zoe Sun Jun 28 09:47:37 2009 UTC Modified files: /phpruntests/srcrtClassMap.php Log: class map with csv writer http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.14r2=1.15diff_format=u Index: phpruntests/src/rtClassMap.php diff -u phpruntests/src/rtClassMap.php:1.14 phpruntests/src/rtClassMap.php:1.15 --- phpruntests/src/rtClassMap.php:1.14 Fri Jun 26 00:07:24 2009 +++ phpruntests/src/rtClassMap.php Sun Jun 28 09:47:37 2009 @@ -55,7 +55,9 @@ 'rtTaskSchedulerFile' = 'taskScheduler/rtTaskSchedulerFile.php', 'rtTaskSchedulerMsgQ' = 'taskScheduler/rtTaskSchedulerMsgQ.php', 'rtTaskTestGroup' = 'taskScheduler/rtTaskTestGroup.php', +'rtCodeRunnerException'= 'testcase/exceptions/rtCodeRunnerException.php', 'rtPhpRunnerException' = 'testcase/exceptions/rtPhpRunnerException.php', +'rtTestOutputWriterCSV'= 'testcase/output/rtTestOutputWriterCSV.php', 'rtTestOutputWriterList' = 'testcase/output/rtTestOutputWriterList.php', 'rtTestOutputWriterXML'= 'testcase/output/rtTestOutputWriterXML.php', 'rtHasMandatorySections' = 'testcase/preconditions/rtHasMandatorySections.php', -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestOutputWriter.php
zoe Sun Jun 28 09:48:54 2009 UTC
Modified files:
/phpruntests/src/testcase rtTestOutputWriter.php
Log:
additional csv option
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestOutputWriter.php?r1=1.4r2=1.5diff_format=u
Index: phpruntests/src/testcase/rtTestOutputWriter.php
diff -u phpruntests/src/testcase/rtTestOutputWriter.php:1.4
phpruntests/src/testcase/rtTestOutputWriter.php:1.5
--- phpruntests/src/testcase/rtTestOutputWriter.php:1.4 Mon May 25 12:46:57 2009
+++ phpruntests/src/testcase/rtTestOutputWriter.php Sun Jun 28 09:48:54 2009
@@ -26,7 +26,10 @@
}
if ($outputType == 'xml') {
-return new rtTestOutputWriterXML($testresults);
+return new rtTestOutputWriterXML($testResults);
+}
+if ($outputType == 'csv') {
+return new rtTestOutputWriterCSV($testResults);
}
}
--
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/curl interface.c
pajoye Sun Jun 28 09:50:14 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
- MFH: fix regression introduced by the fix for #48518 (Ilia, Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.57r2=1.62.2.14.2.27.2.58diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.58
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.57Mon Jun 15 12:37:37 2009
+++ php-src/ext/curl/interface.cSun Jun 28 09:50:14 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.57 2009/06/15 12:37:37 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.58 2009/06/28 09:50:14 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -2052,6 +2052,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: php-src(PHP_5_2) /ext/curl interface.c
pajoye Sun Jun 28 10:00:28 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
- MFH: fix regression introduced by the fix for #48518 (Ilia, Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.57r2=1.62.2.14.2.58diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.57
php-src/ext/curl/interface.c:1.62.2.14.2.58
--- php-src/ext/curl/interface.c:1.62.2.14.2.57 Mon Jun 15 12:38:11 2009
+++ php-src/ext/curl/interface.cSun Jun 28 10:00:28 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.57 2009/06/15 12:38:11 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.58 2009/06/28 10:00:28 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1829,6 +1829,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: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_wireprotocol.c
pajoye Sun Jun 28 12:04:44 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.32r2=1.4.2.33diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.32
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.32 Thu Jun 25 19:03:52 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Sun Jun 28 12:04:44 2009
@@ -25,6 +25,7 @@
#include mysqlnd_statistics.h
#include mysqlnd_palloc.h
#include mysqlnd_debug.h
+#include mysqlnd/mysqlnd_block_alloc.h
#include ext/standard/sha1.h
#include php_network.h
#include zend_ini.h
@@ -1473,7 +1474,7 @@
end_field = (current_field = start_field = fields) + field_count;
for (i = 0; current_field end_field; current_field++, i++) {
/* Don't reverse the order. It is significant!*/
- void *obj;
+ void *obj = NULL;
zend_bool allocated = TRUE;
zend_uchar *this_field_len_pos = p;
/* php_mysqlnd_net_field_length() call should be after
*this_field_len_pos = p; */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/configuration rtCommandLineOptions.php /src/taskScheduler rtTaskTestGroup.php /src/testgroup rtPhpTestGroup.php /src/testrun rtPhpTestRun.php
zoe Sun Jun 28 12:25:00 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskTestGroup.php
/phpruntests/src/testrunrtPhpTestRun.php
/phpruntests/src/testgroup rtPhpTestGroup.php
/phpruntests/src/configuration rtCommandLineOptions.php
Log:
add option for different types of output
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskTestGroup.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskTestGroup.php
diff -u phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.2
phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.3
--- phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.2 Sat Jun 27
17:47:54 2009
+++ phpruntests/src/taskScheduler/rtTaskTestGroup.php Sun Jun 28 12:25:00 2009
@@ -27,7 +27,12 @@
{
$testGroup = new rtPhpTestGroup($this-runConfiguration,
$this-subDirectory);
$testGroup-runGroup($this-runConfiguration);
- $testGroup-writeGroup();
+
+ $outType = 'list';
+if ($this-runConfiguration-hasCommandLineOption('o')) {
+ $outType =
$this-runConfiguration-getCommandLineOption('o');
+}
+ $testGroup-writeGroup($outType);
return true;
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.13r2=1.14diff_format=u
Index: phpruntests/src/testrun/rtPhpTestRun.php
diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.13
phpruntests/src/testrun/rtPhpTestRun.php:1.14
--- phpruntests/src/testrun/rtPhpTestRun.php:1.13 Sat Jun 27 13:53:54 2009
+++ phpruntests/src/testrun/rtPhpTestRun.phpSun Jun 28 12:25:00 2009
@@ -36,6 +36,12 @@
// $preConditionList-check($this-commandLine,
$this-environmentVariables);
$preConditionList-check($runConfiguration);
+
+//Set the type of output. Defaults to 'list' - comatible with old
version
+$this-outType = 'list';
+if ($runConfiguration-hasCommandLineOption('o')) {
+ $this-outType =
$runConfiguration-getCommandLineOption('o');
+}
if ($runConfiguration-getSetting('TestDirectories') != null) {
@@ -73,7 +79,7 @@
foreach ($subDirectories as $subDirectory) {
$testGroup = new rtPhpTestGroup($runConfiguration,
$subDirectory);
$testGroup-runGroup($runConfiguration);
- $testGroup-writeGroup();
+ $testGroup-writeGroup($this-outType);
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testgroup/rtPhpTestGroup.php?r1=1.9r2=1.10diff_format=u
Index: phpruntests/src/testgroup/rtPhpTestGroup.php
diff -u phpruntests/src/testgroup/rtPhpTestGroup.php:1.9
phpruntests/src/testgroup/rtPhpTestGroup.php:1.10
--- phpruntests/src/testgroup/rtPhpTestGroup.php:1.9Sun Jun 14 13:52:21 2009
+++ phpruntests/src/testgroup/rtPhpTestGroup.phpSun Jun 28 12:25:00 2009
@@ -70,9 +70,9 @@
}
}
-public function writeGroup()
+public function writeGroup($outType)
{
-$testOutputWriter = rtTestOutputWriter::getInstance($this-results,
'list');
+$testOutputWriter = rtTestOutputWriter::getInstance($this-results,
$outType);
$testOutputWriter-write($this-testDirectory);
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtCommandLineOptions.php?r1=1.6r2=1.7diff_format=u
Index: phpruntests/src/configuration/rtCommandLineOptions.php
diff -u phpruntests/src/configuration/rtCommandLineOptions.php:1.6
phpruntests/src/configuration/rtCommandLineOptions.php:1.7
--- phpruntests/src/configuration/rtCommandLineOptions.php:1.6 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/configuration/rtCommandLineOptions.php Sun Jun 28
12:25:00 2009
@@ -39,6 +39,7 @@
'd',
'p',
's',
+'o', //new for output type (list, xml, csv...)
'z', //parallel - run out of obvious letters
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_wireprotocol.c
pajoye Sun Jun 28 12:41:51 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_wireprotocol.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.33
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.34
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.33 Tue Jun 16 09:15:09 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Sun Jun 28 12:41:51 2009
@@ -25,6 +25,7 @@
#include mysqlnd_statistics.h
#include mysqlnd_palloc.h
#include mysqlnd_debug.h
+#include mysqlnd/mysqlnd_block_alloc.h
#include ext/standard/sha1.h
#include php_network.h
#include zend_ini.h
@@ -1473,7 +1474,7 @@
end_field = (current_field = start_field = fields) + field_count;
for (i = 0; current_field end_field; current_field++, i++) {
/* Don't reverse the order. It is significant!*/
- void *obj;
+ void *obj = NULL;
zend_bool allocated = TRUE;
zend_uchar *this_field_len_pos = p;
/* php_mysqlnd_net_field_length() call should be after
*this_field_len_pos = p; */
--
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 Sun Jun 28 14:15:33 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: FN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1571r2=1.2027.2.547.2.1572diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1571 php-src/NEWS:1.2027.2.547.2.1572 --- php-src/NEWS:1.2027.2.547.2.1571Sun Jun 28 02:09:50 2009 +++ php-src/NEWSSun Jun 28 14:15:32 2009 @@ -1,6 +1,9 @@ PHP NEWS ||| ?? ??? 2009, PHP 5.2.11 +- Fixed regerssion in curl that prevented flush of data to output defined as + a file handle. (Ilia) + - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted). (peter at lvp-media dot com, Felipe) - Fixed bug #48661 (phpize is broken with non-bash shells). (Jani) -- 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) / UPGRADING
sixdSun Jun 28 14:31:12 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Record new ini param http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.34r2=1.1.2.3.2.1.2.35diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.34 php-src/UPGRADING:1.1.2.3.2.1.2.35 --- php-src/UPGRADING:1.1.2.3.2.1.2.34 Sat Jun 27 13:33:20 2009 +++ php-src/UPGRADING Sun Jun 28 14:31:12 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.34 2009/06/27 13:33:20 bjori Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.35 2009/06/28 14:31:12 sixd Exp $ UPGRADE NOTES - PHP 5.3 @@ -341,6 +341,7 @@ - mysqli.allow_local_infile - mysqli.cache_size - oci8.connection_class + - oci8.events - pdo_mysql.default_socket - pdo_mysql.debug - pdo_mysql.cache_size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
johannesSun Jun 28 15:20:22 2009 UTC Modified files: /php-srcphp.ini-development php.ini-production Log: Add missing MySQL entries http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.8r2=1.9diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.8 php-src/php.ini-development:1.9 --- php-src/php.ini-development:1.8 Mon May 4 15:20:17 2009 +++ php-src/php.ini-development Sun Jun 28 15:20:22 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific location. +; 1. SAPI module specific locamystion. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) @@ -1048,6 +1048,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1134,10 +1144,18 @@ ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1185,10 +1203,18 @@ [MySQLi] +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look @@ -1220,6 +1246,26 @@ ; Allow or prevent reconnect mysqli.reconnect = Off +[mysqlnd] +; Enable / Disable collection of general statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = On + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + [OCI8] ; Connection: Enables privileged connections using external http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.8r2=1.9diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.8 php-src/php.ini-production:1.9 --- php-src/php.ini-production:1.8 Mon May 4 15:20:17 2009 +++ php-src/php.ini-production Sun Jun 28 15:20:22 2009 @@ -1048,6 +1048,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1134,10 +1144,18 @@ ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1185,10 +1203,26 @@
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
johannesSun Jun 28 15:21:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add missing MySQL entries http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.10 php-src/php.ini-development:1.1.2.11 --- php-src/php.ini-development:1.1.2.10Sat Jun 27 13:29:53 2009 +++ php-src/php.ini-development Sun Jun 28 15:21:19 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific location. +; 1. SAPI module specific locamystion. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) @@ -1047,6 +1047,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1133,10 +1143,18 @@ ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1184,10 +1202,18 @@ [MySQLi] +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look @@ -1219,6 +1245,26 @@ ; Allow or prevent reconnect mysqli.reconnect = Off +[mysqlnd] +; Enable / Disable collection of general statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_statistics +mysqlnd.collect_statistics = On + +; Enable / Disable collection of memory usage statstics by mysqlnd which can be +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = On + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + [OCI8] ; Connection: Enables privileged connections using external @@ -1772,24 +1818,9 @@ ;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= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.10 php-src/php.ini-production:1.1.2.11 --- php-src/php.ini-production:1.1.2.10 Sat Jun 27 13:29:53 2009 +++ php-src/php.ini-production Sun Jun 28 15:21:19 2009 @@ -1047,6 +1047,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket
[PHP-CVS] cvs: php-src / php.ini-development
johannesSun Jun 28 15:29:14 2009 UTC Modified files: /php-srcphp.ini-development Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.9r2=1.10diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.9 php-src/php.ini-development:1.10 --- php-src/php.ini-development:1.9 Sun Jun 28 15:20:22 2009 +++ php-src/php.ini-development Sun Jun 28 15:29:14 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific locamystion. +; 1. SAPI module specific location. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) -- 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
johannesSun Jun 28 15:29:24 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development Log: MFH: fix typo http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.11r2=1.1.2.12diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.11 php-src/php.ini-development:1.1.2.12 --- php-src/php.ini-development:1.1.2.11Sun Jun 28 15:21:19 2009 +++ php-src/php.ini-development Sun Jun 28 15:29:24 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific locamystion. +; 1. SAPI module specific location. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) -- 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
janiSun Jun 28 15:40:00 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - Typo, removed BOM (this file was supposed to be just ascii..right? :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1572r2=1.2027.2.547.2.1573diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1572 php-src/NEWS:1.2027.2.547.2.1573 --- php-src/NEWS:1.2027.2.547.2.1572Sun Jun 28 14:15:32 2009 +++ php-src/NEWSSun Jun 28 15:40:00 2009 @@ -1,8 +1,8 @@ -PHP NEWS +PHPNEWS ||| ?? ??? 2009, PHP 5.2.11 -- Fixed regerssion in curl that prevented flush of data to output defined as - a file handle. (Ilia) +- Fixed regression in cURL extension that prevented flush of data to output + defined as a file handle. (Ilia) - Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted). (peter at lvp-media dot com, Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiSun Jun 28 15:41:25 2009 UTC Modified files: /php-srcNEWS Log: - dot dot dot.. :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2183r2=1.2184diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2183 php-src/NEWS:1.2184 --- php-src/NEWS:1.2183 Sat Jun 27 15:22:06 2009 +++ php-src/NEWSSun Jun 28 15:41:25 2009 @@ -6,7 +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) +- Changed --with-config-file-scan-dir / PHP_INI_SCAN_DIR to allow multiple + paths. (Mikko) - Removed undocumented and incomplete support for strings in list() operator. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
johannesSun Jun 28 15:55:20 2009 UTC Modified files: /php-srcphp.ini-development php.ini-production Log: - Add two ini settings http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.10r2=1.11diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.10 php-src/php.ini-development:1.11 --- php-src/php.ini-development:1.10Sun Jun 28 15:29:14 2009 +++ php-src/php.ini-development Sun Jun 28 15:55:19 2009 @@ -1800,10 +1800,17 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + ; Local Variables: ; tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.9r2=1.10diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.9 php-src/php.ini-production:1.10 --- php-src/php.ini-production:1.9 Sun Jun 28 15:20:22 2009 +++ php-src/php.ini-production Sun Jun 28 15:55:19 2009 @@ -1808,10 +1808,16 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 ; Local Variables: ; tab-width: 4 -- 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
johannesSun Jun 28 15:56:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add two ini settings and remove ini setting which is commented out in code http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.12r2=1.1.2.13diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.12 php-src/php.ini-development:1.1.2.13 --- php-src/php.ini-development:1.1.2.12Sun Jun 28 15:29:24 2009 +++ php-src/php.ini-development Sun Jun 28 15:56:19 2009 @@ -1799,11 +1799,18 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 -;soap.wsdl_cache_limit= +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + + ;dba.default_handler= ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= @@ -1822,8 +1829,6 @@ ;mbstring.http_output_conv_mimetypes= ;com.code_page= ;odbc.default_cursortype= -;session.encode_sources= -;ldap.max_links= ;sybct.login_timeout= ;sybct.hostname= ;sybct.deadlock_retry_count= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.11r2=1.1.2.12diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.11 php-src/php.ini-production:1.1.2.12 --- php-src/php.ini-production:1.1.2.11 Sun Jun 28 15:21:19 2009 +++ php-src/php.ini-production Sun Jun 28 15:56:19 2009 @@ -1807,11 +1807,18 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 -;soap.wsdl_cache_limit= +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + + ;dba.default_handler= ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= @@ -1830,8 +1837,6 @@ ;mbstring.http_output_conv_mimetypes= ;com.code_page= ;odbc.default_cursortype= -;session.encode_sources= -;ldap.max_links= ;sybct.login_timeout= ;sybct.hostname= ;sybct.deadlock_retry_count= -- 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) / UPGRADING
johannesSun Jun 28 16:14:30 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Drop debug switches from UPGRADING, they need --enable-debug and aren't ment for users http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.35r2=1.1.2.3.2.1.2.36diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.35 php-src/UPGRADING:1.1.2.3.2.1.2.36 --- php-src/UPGRADING:1.1.2.3.2.1.2.35 Sun Jun 28 14:31:12 2009 +++ php-src/UPGRADING Sun Jun 28 16:14:30 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.35 2009/06/28 14:31:12 sixd Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.36 2009/06/28 16:14:30 johannes Exp $ UPGRADE NOTES - PHP 5.3 @@ -343,7 +343,6 @@ - oci8.connection_class - oci8.events - pdo_mysql.default_socket - - pdo_mysql.debug - pdo_mysql.cache_size - sqlite3.extension_dir - mysql.default_socket @@ -351,7 +350,6 @@ - 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
johannesSun Jun 28 16:40:22 2009 UTC Modified files: /php-srcphp.ini-development php.ini-production Log: Add ibase settings http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.11r2=1.12diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.11 php-src/php.ini-development:1.12 --- php-src/php.ini-development:1.11Sun Jun 28 15:55:19 2009 +++ php-src/php.ini-development Sun Jun 28 16:40:22 2009 @@ -1143,6 +1143,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.10r2=1.11diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.10 php-src/php.ini-production:1.11 --- php-src/php.ini-production:1.10 Sun Jun 28 15:55:19 2009 +++ php-src/php.ini-production Sun Jun 28 16:40:22 2009 @@ -1143,6 +1143,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile -- 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
johannesSun Jun 28 16:41:17 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add ibase settings http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.13r2=1.1.2.14diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.13 php-src/php.ini-development:1.1.2.14 --- php-src/php.ini-development:1.1.2.13Sun Jun 28 15:56:19 2009 +++ php-src/php.ini-development Sun Jun 28 16:41:17 2009 @@ -1142,6 +1142,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile @@ -1815,16 +1846,6 @@ ;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= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= ;com.code_page= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.12r2=1.1.2.13diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.12 php-src/php.ini-production:1.1.2.13 --- php-src/php.ini-production:1.1.2.12 Sun Jun 28 15:56:19 2009 +++ php-src/php.ini-production Sun Jun 28 16:41:17 2009 @@ -1142,6 +1142,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile @@ -1823,16 +1854,6 @@ ;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= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= ;com.code_page= -- 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
johannesSun Jun 28 17:56:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH Add missing ini entries (Mikko) http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.14r2=1.1.2.15diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.14 php-src/php.ini-development:1.1.2.15 --- php-src/php.ini-development:1.1.2.14Sun Jun 28 16:41:17 2009 +++ php-src/php.ini-development Sun Jun 28 17:56:18 2009 @@ -1047,6 +1047,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1113,6 +1115,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1404,6 +1410,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1717,6 +1735,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ; http://php.net/mbstring.language @@ -1774,6 +1796,10 @@ ; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) ;mbstring.http_output_conv_mimetype= +; Allows to set script encoding. Only affects if PHP is compiled with --enable-zend-multibyte +; Default: +;mbstring.script_encoding= + [gd] ; Tell the jpeg decode to ignore warnings and try to create ; a gd image. The warning will then be displayed as notices @@ -1841,18 +1867,19 @@ ; Sets the maximum number of open links or -1 for unlimited. ldap.max_links = -1 +[mcrypt] +; For more information about mcrypt settings see http://php.net/mcrypt-module-open -;dba.default_handler= -;pdo_odbc.db2_instance_name= +; Directory where to load mcrypt algorithms +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) ;mcrypt.algorithms_dir= + +; Directory where to load mcrypt modes +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) ;mcrypt.modes_dir= -;mbstring.script_encoding= -;mbstring.http_output_conv_mimetypes= -;com.code_page= -;odbc.default_cursortype= -;sybct.login_timeout= -;sybct.hostname= -;sybct.deadlock_retry_count= + +[dba] +;dba.default_handler= ; Local Variables: ; tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.13r2=1.1.2.14diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.13 php-src/php.ini-production:1.1.2.14 --- php-src/php.ini-production:1.1.2.13 Sun Jun 28 16:41:17 2009 +++ php-src/php.ini-production Sun Jun 28 17:56:18 2009 @@ -1047,6 +1047,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1113,6 +1115,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1412,6 +1418,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1725,6 +1743,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ;
[PHP-CVS] cvs: php-src / TODO
andrei Sun Jun 28 18:00:38 2009 UTC Modified files: /php-srcTODO Log: Update http://cvs.php.net/viewvc.cgi/php-src/TODO?r1=1.158r2=1.159diff_format=u Index: php-src/TODO diff -u php-src/TODO:1.158 php-src/TODO:1.159 --- php-src/TODO:1.158 Sun Nov 20 02:27:49 2005 +++ php-src/TODOSun Jun 28 18:00:38 2009 @@ -13,6 +13,7 @@ interfaces difficult which pass const parameters to us. * Clean up object-string conversion behavior wherever possible (switch(), comparison, etc) +* Port safe-allocation functions from 5.3 (zend_alloc.[ch]) global -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
johannesSun Jun 28 17:55:36 2009 UTC Modified files: /php-srcphp.ini-development php.ini-production Log: Add missing ini entries (Mikko) http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.12r2=1.13diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.12 php-src/php.ini-development:1.13 --- php-src/php.ini-development:1.12Sun Jun 28 16:40:22 2009 +++ php-src/php.ini-development Sun Jun 28 17:55:36 2009 @@ -1048,6 +1048,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1114,6 +1116,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1405,6 +1411,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1718,6 +1736,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ; http://php.net/mbstring.language @@ -1775,6 +1797,10 @@ ; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) ;mbstring.http_output_conv_mimetype= +; Allows to set script encoding. Only affects if PHP is compiled with --enable-zend-multibyte +; Default: +;mbstring.script_encoding= + [gd] ; Tell the jpeg decode to ignore warnings and try to create ; a gd image. The warning will then be displayed as notices http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.11r2=1.12diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.11 php-src/php.ini-production:1.12 --- php-src/php.ini-production:1.11 Sun Jun 28 16:40:22 2009 +++ php-src/php.ini-production Sun Jun 28 17:55:36 2009 @@ -1048,6 +1048,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1114,6 +1116,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1413,6 +1419,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1726,6 +1744,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ; http://php.net/mbstring.language @@ -1783,6 +1805,10 @@ ; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) ;mbstring.http_output_conv_mimetype= +; Allows to set script encoding. Only affects if PHP is compiled with --enable-zend-multibyte +; Default: +;mbstring.script_encoding= + [gd] ; Tell the jpeg decode to ignore warnings and try to create ; a gd image. The warning will then be displayed as notices -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs
jmertic Sun Jun 28 18:16:36 2009 UTC Modified files: /win-installer PHPInstallerBase53NTS.wxs PHPInstallerScripts53.vbs Log: Removed any trailing references to IIS ISAPI option in 5.3 installer. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.22r2=1.23diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.22 win-installer/PHPInstallerBase53NTS.wxs:1.23 --- win-installer/PHPInstallerBase53NTS.wxs:1.22Thu Jun 25 20:51:04 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Sun Jun 28 18:16:36 2009 @@ -371,12 +371,6 @@ Level=10 ComponentRef Id=Empty/ Feature AllowAdvertise=no - Id=iis4ISAPI - Title=$(loc.Featureiis4ISAPITitle) - Description=$(loc.Featureiis4ISAPIDescription) - Level=10 -/Feature -Feature AllowAdvertise=no Id=iis4CGI Title=$(loc.Featureiis4CGITitle) Description=$(loc.Featureiis4CGIDescription) http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts53.vbs?r1=1.1r2=1.2diff_format=u Index: win-installer/PHPInstallerScripts53.vbs diff -u win-installer/PHPInstallerScripts53.vbs:1.1 win-installer/PHPInstallerScripts53.vbs:1.2 --- win-installer/PHPInstallerScripts53.vbs:1.1 Thu May 21 02:41:06 2009 +++ win-installer/PHPInstallerScripts53.vbs Sun Jun 28 18:16:36 2009 @@ -166,9 +166,6 @@ If ( Session.FeatureRequestState(iis4CGI) = 3 ) Then PHPExecutable = strPHPPath php-cgi.exe End If -If ( Session.FeatureRequestState(iis4ISAPI) = 3 ) Then -PHPExecutable = strPHPPath php5isapi.dll -End If If ( Session.FeatureRequestState(iis4FastCGI) = 3 ) Then fAddScriptMap = FALSE End If -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard metaphone.c /ext/standard/tests/strings bug48709.phpt
felipe Sun Jun 28 18:41:21 2009 UTC
Added files:
/php-src/ext/standard/tests/strings bug48709.phpt
Modified files:
/php-src/ext/standard metaphone.c
Log:
- Fixed bug #48709 (metaphone and 'wh')
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.41r2=1.42diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.41
php-src/ext/standard/metaphone.c:1.42
--- php-src/ext/standard/metaphone.c:1.41 Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/metaphone.cSun Jun 28 18:41:20 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: metaphone.c,v 1.41 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: metaphone.c,v 1.42 2009/06/28 18:41:20 felipe Exp $ */
/*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern
schw...@pobox.com
@@ -224,15 +224,14 @@
w_idx += 2;
}
break;
- /* WH becomes H,
+ /* WH becomes W,
WR becomes R
W if followed by a vowel */
case 'W':
- if (Next_Letter == 'H' ||
- Next_Letter == 'R') {
+ if (Next_Letter == 'R') {
Phonize(Next_Letter);
w_idx += 2;
- } else if (isvowel(Next_Letter)) {
+ } else if (Next_Letter == 'H' || isvowel(Next_Letter)) {
Phonize('W');
w_idx += 2;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug48709.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug48709.phpt
+++ php-src/ext/standard/tests/strings/bug48709.phpt
--TEST--
Bug #48709 (metaphone and 'wh')
--FILE--
?php
/* Initial letter exceptions */
$exceptions = array(
'kn', // Drop first letter
'gn', // ditto
'pn', // ditto
'ae', // ditto
'wr', // ditto
'x', // s
'wh', // w
'wa' // w
);
foreach ($exceptions as $letter) {
printf(%s = %s\n, $letter, metaphone($letter));
}
?
--EXPECT--
kn = N
gn = N
pn = N
ae = E
wr = R
x = S
wh = W
wa = W
--
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 metaphone.c /ext/standard/tests/strings bug48709.phpt
felipe Sun Jun 28 18:44:28 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug48709.phpt
Modified files:
/php-src/ext/standard metaphone.c
/php-srcNEWS
Log:
- MFH: Fixed bug #48709 (metaphone and 'wh')
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.8r2=1.28.2.1.2.9diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.8
php-src/ext/standard/metaphone.c:1.28.2.1.2.9
--- php-src/ext/standard/metaphone.c:1.28.2.1.2.8 Wed Dec 31 11:17:45 2008
+++ php-src/ext/standard/metaphone.cSun Jun 28 18:44:28 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: metaphone.c,v 1.28.2.1.2.8 2008/12/31 11:17:45 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.9 2009/06/28 18:44:28 felipe Exp $ */
/*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern
schw...@pobox.com
@@ -225,15 +225,14 @@
w_idx += 2;
}
break;
- /* WH becomes H,
+ /* WH becomes W,
WR becomes R
W if followed by a vowel */
case 'W':
- if (Next_Letter == 'H' ||
- Next_Letter == 'R') {
+ if (Next_Letter == 'R') {
Phonize(Next_Letter);
w_idx += 2;
- } else if (isvowel(Next_Letter)) {
+ } else if (Next_Letter == 'H' || isvowel(Next_Letter)) {
Phonize('W');
w_idx += 2;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1573r2=1.2027.2.547.2.1574diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1573 php-src/NEWS:1.2027.2.547.2.1574
--- php-src/NEWS:1.2027.2.547.2.1573Sun Jun 28 15:40:00 2009
+++ php-src/NEWSSun Jun 28 18:44:28 2009
@@ -4,6 +4,7 @@
- Fixed regression in cURL extension that prevented flush of data to output
defined as a file handle. (Ilia)
+- Fixed bug #48709 (metaphone and 'wh'). (brettz9 at yahoo dot com, Felipe)
- Fixed bug #48693 (Double declaration of __lambda_func when lambda wrongly
formatted). (peter at lvp-media dot com, Felipe)
- Fixed bug #48661 (phpize is broken with non-bash shells). (Jani)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug48709.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug48709.phpt
+++ php-src/ext/standard/tests/strings/bug48709.phpt
--TEST--
Bug #48709 (metaphone and 'wh')
--FILE--
?php
/* Initial letter exceptions */
$exceptions = array(
'kn', // Drop first letter
'gn', // ditto
'pn', // ditto
'ae', // ditto
'wr', // ditto
'x', // s
'wh', // w
'wa' // w
);
foreach ($exceptions as $letter) {
printf(%s = %s\n, $letter, metaphone($letter));
}
?
--EXPECT--
kn = N
gn = N
pn = N
ae = E
wr = R
x = S
wh = W
wa = W
--
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/mysqlnd mysqlnd_wireprotocol.c
johannesSun Jun 28 21:52:51 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlndmysqlnd_wireprotocol.c Log: Fix path http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.33r2=1.4.2.34diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33 php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.34 --- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.33 Sun Jun 28 12:04:44 2009 +++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Sun Jun 28 21:52:51 2009 @@ -25,7 +25,7 @@ #include mysqlnd_statistics.h #include mysqlnd_palloc.h #include mysqlnd_debug.h -#include mysqlnd/mysqlnd_block_alloc.h +#include mysqlnd_block_alloc.h #include ext/standard/sha1.h #include php_network.h #include zend_ini.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c /ext/ldap/tests bug48441.phpt
patrickallaert Sun Jun 28 22:38:23 2009 UTC
Modified files:
/php-src/ext/ldap ldap.c
/php-src/ext/ldap/tests bug48441.phpt
Log:
unicode support in ext/ldap
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.204r2=1.205diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.204 php-src/ext/ldap/ldap.c:1.205
--- php-src/ext/ldap/ldap.c:1.204 Thu Jun 25 14:48:53 2009
+++ php-src/ext/ldap/ldap.c Sun Jun 28 22:38:22 2009
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.204 2009/06/25 14:48:53 felipe Exp $ */
+/* $Id: ldap.c,v 1.205 2009/06/28 22:38:22 patrickallaert Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -235,7 +235,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.204
2009/06/25 14:48:53 felipe Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.205
2009/06/28 22:38:22 patrickallaert Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -286,7 +286,7 @@
}
/* }}} */
-/* {{{ proto resource ldap_connect([string host [, int port [, string wallet
[, string wallet_passwd [, int authmode])
+/* {{{ proto resource ldap_connect([string host [, int port [, string wallet
[, string wallet_passwd [, int authmode]) U
Connect to an LDAP server */
PHP_FUNCTION(ldap_connect)
{
@@ -307,7 +307,7 @@
WRONG_PARAM_COUNT;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |slssl, host,
hostlen, port, wallet, walletlen, walletpasswd, walletpasswdlen,
authmode) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |slssl,
host, hostlen, UG(utf8_conv), port, wallet, walletlen, UG(utf8_conv),
walletpasswd, walletpasswdlen, UG(utf8_conv), authmode) != SUCCESS) {
RETURN_FALSE;
}
@@ -385,7 +385,7 @@
}
/* }}} */
-/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]])
+/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]]) U
Bind to LDAP directory */
PHP_FUNCTION(ldap_bind)
{
@@ -395,7 +395,7 @@
ldap_linkdata *ld;
int rc;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|ss, link,
ldap_bind_dn, ldap_bind_dnlen, ldap_bind_pw, ldap_bind_pwlen) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|ss, link,
ldap_bind_dn, ldap_bind_dnlen, UG(utf8_conv), ldap_bind_pw,
ldap_bind_pwlen, UG(utf8_conv)) != SUCCESS) {
RETURN_FALSE;
}
@@ -495,7 +495,7 @@
}
/* }}} */
-/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string
password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [,
string sasl_authz_id [, string props]]])
+/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string
password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [,
string sasl_authz_id [, string props]]]) U
Bind to LDAP directory using SASL */
PHP_FUNCTION(ldap_sasl_bind)
{
@@ -511,7 +511,7 @@
int rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len,
authz_id_len, props_len;
php_ldap_bictx *ctx;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|sss,
link, binddn, dn_len, passwd, passwd_len, sasl_mech, mech_len,
sasl_realm, realm_len, sasl_authc_id, authc_id_len, sasl_authz_id,
authz_id_len, props, props_len) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
r|sss, link, binddn, dn_len, UG(utf8_conv), passwd,
passwd_len, UG(utf8_conv), sasl_mech, mech_len, UG(utf8_conv), sasl_realm,
realm_len, UG(utf8_conv), sasl_authc_id, authc_id_len, UG(utf8_conv),
sasl_authz_id, authz_id_len, UG(utf8_conv), props, props_len,
UG(utf8_conv)) != SUCCESS) {
RETURN_FALSE;
}
@@ -535,7 +535,7 @@
/* }}} */
#endif /* HAVE_LDAP_SASL */
-/* {{{ proto bool ldap_unbind(resource link)
+/* {{{ proto bool ldap_unbind(resource link) U
Unbind from LDAP directory */
PHP_FUNCTION(ldap_unbind)
{
@@ -612,6 +612,7 @@
int num_attribs = 0;
int i, errno;
int myargcount = ZEND_NUM_ARGS();
+ int free_base_dn = 0;
int ret = 1;
if (zend_parse_parameters(myargcount TSRMLS_CC, ZZZ|Z, link,
base_dn, filter, attrs, attrsonly,
@@ -695,6 +696,11 @@
/* If anything else than string is passed, ldap_base_dn
= NULL */
if (Z_TYPE_PP(base_dn) == IS_STRING) {
ldap_base_dn = Z_STRVAL_PP(base_dn);
+ } else if(Z_TYPE_PP(base_dn) == IS_UNICODE){
+ char *tmp =
zend_unicode_to_ascii(Z_USTRVAL_PP(base_dn), Z_USTRLEN_PP(base_dn)
[PHP-CVS] cvs: php-src /ext/ldap ldap.c
patrickallaert Sun Jun 28 22:40:38 2009 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
forgotten some credits :)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.205r2=1.206diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.205 php-src/ext/ldap/ldap.c:1.206
--- php-src/ext/ldap/ldap.c:1.205 Sun Jun 28 22:38:22 2009
+++ php-src/ext/ldap/ldap.c Sun Jun 28 22:40:38 2009
@@ -19,11 +19,12 @@
| Jani Taskinen sni...@iki.fi |
| Stig Venaasven...@uninett.no |
| Doug Goldstein car...@cardoe.com |
+ | Patrick Allaert patrickalla...@php.net|
| PHP 4.0 updates: Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: ldap.c,v 1.205 2009/06/28 22:38:22 patrickallaert Exp $ */
+/* $Id: ldap.c,v 1.206 2009/06/28 22:40:38 patrickallaert Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -235,7 +236,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.205
2009/06/28 22:38:22 patrickallaert Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.206
2009/06/28 22:40:38 patrickallaert Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Sun Jun 28 23:15:09 2009 UTC Modified files: /CVSROOTavail Log: Drizzle karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1539r2=1.1540diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1539 CVSROOT/avail:1.1540 --- CVSROOT/avail:1.1539Mon Jun 22 12:47:04 2009 +++ CVSROOT/avail Sun Jun 28 23:15:08 2009 @@ -312,6 +312,7 @@ avail|bhuisgen|pecl/htscanner avail|dams,splanquart|pecl/pdo_4d avail|jluedke|pecl/gearman +avail|jluedke|pecl/drizzle avail|vito,mkoppanen|pecl/gmagick avail|santiago|pecl/gupnp avail|patrickallaert|php-src/ext/ldap -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src cmpResults.php /src/taskScheduler rtTask.php rtTaskSchedulerFile.php rtTaskTestGroup.php /src/testcase rtTestOutputWriter.php /src/testcase/output rtTestOutputWriter
g2 Mon Jun 29 01:34:55 2009 UTC
Added files:
/phpruntests/srccmpResults.php
Modified files:
/phpruntests/src/testcase/outputrtTestOutputWriterList.php
rtTestOutputWriterCSV.php
rtTestOutputWriterXML.php
/phpruntests/src/testgroup rtPhpTestGroup.php
/phpruntests/src/testrunrtPhpTestRun.php
/phpruntests/src/taskScheduler rtTask.php rtTaskSchedulerFile.php
rtTaskTestGroup.php
/phpruntests/src/testcase rtTestOutputWriter.php
Log:
phpruntests - implemented rtTestOutputWriterXML - added cmpResults to compare
test-results
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterList.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testcase/output/rtTestOutputWriterList.php
diff -u phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.5
phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.6
--- phpruntests/src/testcase/output/rtTestOutputWriterList.php:1.5 Sun Jun
7 11:06:51 2009
+++ phpruntests/src/testcase/output/rtTestOutputWriterList.php Mon Jun 29
01:34:54 2009
@@ -46,13 +46,18 @@
}
-public function write($testDirectory = null)
+public function write($testDirectory = null, $cid = null)
{
if ($testDirectory != null) {
echo \n\nTest output for tests in . $testDirectory . \n;
}
sort($this-testOutput);
foreach ($this-testOutput as $line) {
+
+ if (!is_null($cid)) {
+ echo $cid - ;
+ }
+
echo $line .\n;
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterCSV.php?r1=1.1r2=1.2diff_format=u
Index: phpruntests/src/testcase/output/rtTestOutputWriterCSV.php
diff -u phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.1
phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.2
--- phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.1 Sun Jun
28 09:46:48 2009
+++ phpruntests/src/testcase/output/rtTestOutputWriterCSV.php Mon Jun 29
01:34:54 2009
@@ -44,11 +44,16 @@
}
-public function write($testDirectory = null)
+public function write($testDirectory = null, $cid = null)
{
sort($this-testOutput);
foreach ($this-testOutput as $line) {
-echo $line .\n;
+
+ if (!is_null($cid)) {
+ echo $cid - ;
+ }
+
+ echo $line .\n;
}
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterXML.php?r1=1.3r2=1.4diff_format=u
Index: phpruntests/src/testcase/output/rtTestOutputWriterXML.php
diff -u phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.3
phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.4
--- phpruntests/src/testcase/output/rtTestOutputWriterXML.php:1.3 Mon May
25 11:59:58 2009
+++ phpruntests/src/testcase/output/rtTestOutputWriterXML.php Mon Jun 29
01:34:54 2009
@@ -1,6 +1,6 @@
?php
/**
- * rtTestOutputWriterXML
+ * rtTestOutputWriterXML singleton
*
* Write test output as XML
*
@@ -8,6 +8,7 @@
* @packageRUNTESTS
* @author Zoe Slattery z...@php.net
* @author Stefan Priebsch sprieb...@php.net
+ * @author Georg Gradwohl g...@php.net
* @copyright 2009 The PHP Group
* @licensehttp://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
@@ -15,12 +16,92 @@
*/
class rtTestOutputWriterXML extends rtTestOutputWriter
{
-public function assemble(rtPhpTest $testCase)
+private $dom = null;
+ private $rootNode = null;
+ private $stamp = 0;
+
+ private static $instance = null;
+
+
+ private function __construct() {
+
+ $this-dom = new DOMDocument();
+ $this-rootNode = $this-dom-createElement('RUNTESTS');
+ $this-dom-appendChild($this-rootNode);
+
+ $this-stamp = round(microtime(true));
+ }
+
+private function __clone() {}
+
+
+public static function getInstance()
{
+ if (is_null(self::$instance)) {
+ self::$instance = new self;
+ }
+
+ return self::$instance;
}
-
-public function write()
+
+
+public function setTestResults(array $testResults)
{
+ $this-init($testResults);
+}
+
+
+/**
+ *
+ *
+ * @param array of rtTestResults
+ *
+ */
+public function init (array $testResults)
+{
+$dom = $this-dom;
+
+foreach ($testResults as $testResult) {
+
+ $test = $dom-createElement('testcase');
+ $test-appendChild($dom-createElement('name',
$testResult-getName()));
+
+
