[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Oct 6 01:31:30 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2829r2=1.2830diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2829 php-src/ChangeLog:1.2830 --- php-src/ChangeLog:1.2829Fri Oct 5 01:31:39 2007 +++ php-src/ChangeLog Sat Oct 6 01:31:29 2007 @@ -1,3 +1,585 @@ +2007-10-05 Andrey Hristov [EMAIL PROTECTED] + +* ext/mysqlnd/mysqlnd_alloc.c + ext/mysqlnd/mysqlnd_alloc.c + ext/mysqlnd/mysqlnd_charset.c + ext/mysqlnd/mysqlnd_charset.h + ext/mysqlnd/mysqlnd_debug.c + ext/mysqlnd/mysqlnd_debug.h + ext/mysqlnd/mysqlnd_enum_n_def.h + ext/mysqlnd/mysqlnd_libmysql_compat.h + ext/mysqlnd/mysqlnd_loaddata.c + ext/mysqlnd/mysqlnd_palloc.c + ext/mysqlnd/mysqlnd_palloc.h + ext/mysqlnd/mysqlnd_portability.h + ext/mysqlnd/mysqlnd_priv.h + ext/mysqlnd/mysqlnd_ps.c + ext/mysqlnd/mysqlnd_ps_codec.c + ext/mysqlnd/mysqlnd_qcache.c + ext/mysqlnd/mysqlnd_result.c + ext/mysqlnd/mysqlnd_result.h + ext/mysqlnd/mysqlnd_result_meta.c + ext/mysqlnd/mysqlnd_result_meta.h + ext/mysqlnd/mysqlnd_statistics.c + ext/mysqlnd/mysqlnd_statistics.h + ext/mysqlnd/mysqlnd_structs.h + ext/mysqlnd/mysqlnd_wireprotocol.c + ext/mysqlnd/mysqlnd_wireprotocol.h + ext/mysqlnd/php_mysqlnd.h: + + file mysqlnd_alloc.c was initially added on branch PHP_5_3. + +* (PHP_5_3) + ext/mysql/config.m4 + ext/mysql/config.w32 + ext/mysql/mysql_mysqlnd.h + ext/mysql/php_mysql.c + ext/mysql/php_mysql.h + ext/mysqli/config.m4 + ext/mysqli/config.w32 + ext/mysqli/mysqli.c + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_driver.c + ext/mysqli/mysqli_embedded.c + ext/mysqli/mysqli_exception.c + ext/mysqli/mysqli_fe.c + ext/mysqli/mysqli_libmysql.h + ext/mysqli/mysqli_mysqlnd.h + ext/mysqli/mysqli_nonapi.c + ext/mysqli/mysqli_prop.c + ext/mysqli/mysqli_repl.c + ext/mysqli/mysqli_report.c + ext/mysqli/mysqli_warning.c + ext/mysqli/php_mysqli.h + ext/mysqli/php_mysqli_structs.h + ext/mysqlnd/.cvsignore + ext/mysqlnd/CREDITS + ext/mysqlnd/config-win.h + ext/mysqlnd/config.w32 + ext/mysqlnd/config9.m4 + ext/mysqlnd/mysqlnd.c + ext/mysqlnd/mysqlnd.h: + Import mysqlnd + Patch ext/mysql and ext/mysqli to support mysqlnd + +2007-10-05 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/strings/setlocale_basic1.phpt + ext/standard/tests/strings/setlocale_basic1.phpt + ext/standard/tests/strings/setlocale_basic2.phpt + ext/standard/tests/strings/setlocale_basic2.phpt + ext/standard/tests/strings/setlocale_basic3.phpt + ext/standard/tests/strings/setlocale_basic3.phpt + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/setlocale_variation1.phpt + ext/standard/tests/strings/setlocale_variation1.phpt + ext/standard/tests/strings/setlocale_variation2.phpt + ext/standard/tests/strings/setlocale_variation2.phpt + ext/standard/tests/strings/setlocale_variation3.phpt + ext/standard/tests/strings/setlocale_variation3.phpt + ext/standard/tests/strings/setlocale_variation4.phpt + ext/standard/tests/strings/setlocale_variation4.phpt + ext/standard/tests/strings/setlocale_variation5.phpt + ext/standard/tests/strings/setlocale_variation5.phpt: + New testcases for setlocale() function + +* ext/standard/tests/strings/setlocale_basic1.phpt + ext/standard/tests/strings/setlocale_basic1.phpt + ext/standard/tests/strings/setlocale_basic1.phpt + ext/standard/tests/strings/setlocale_basic2.phpt + ext/standard/tests/strings/setlocale_basic2.phpt + ext/standard/tests/strings/setlocale_basic2.phpt + ext/standard/tests/strings/setlocale_basic3.phpt + ext/standard/tests/strings/setlocale_basic3.phpt + ext/standard/tests/strings/setlocale_basic3.phpt + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/setlocale_variation1.phpt + ext/standard/tests/strings/setlocale_variation1.phpt + ext/standard/tests/strings/setlocale_variation1.phpt + ext/standard/tests/strings/setlocale_variation2.phpt + ext/standard/tests/strings/setlocale_variation2.phpt + ext/standard/tests/strings/setlocale_variation2.phpt + ext/standard/tests/strings/setlocale_variation3.phpt + ext/standard/tests/strings/setlocale_variation3.phpt + ext/standard/tests/strings/setlocale_variation3.phpt + ext/standard/tests/strings/setlocale_variation4.phpt +
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
dsp Fri Oct 5 09:38:54 2007 UTC
Modified files:
/php-src/ext/splspl_directory.c
Log:
WS/Indent fix.
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.137r2=1.138diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.137
php-src/ext/spl/spl_directory.c:1.138
--- php-src/ext/spl/spl_directory.c:1.137 Wed Oct 3 10:31:03 2007
+++ php-src/ext/spl/spl_directory.c Fri Oct 5 09:38:54 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.137 2007/10/03 10:31:03 dsp Exp $ */
+/* $Id: spl_directory.c,v 1.138 2007/10/05 09:38:54 dsp Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -378,8 +378,7 @@
if (!file_path.v || !file_path_len) {
#if defined(PHP_WIN32)
zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
Cannot create SplFileInfo for empty path);
- if (file_path.v !use_copy)
- {
+ if (file_path.v !use_copy) {
efree(file_path.v);
}
#else
@@ -2156,29 +2155,29 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sss, delim,
d_len, enclo, e_len, esc, esc_len) == SUCCESS) {
switch(ZEND_NUM_ARGS())
{
- case 3:
- if (esc_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, escape must be a character);
- RETURN_FALSE;
- }
- escape = esc[0];
-
- case 2:
- if (e_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, enclosure must be a character);
- RETURN_FALSE;
- }
- enclosure = enclo[0];
- /* no break */
- case 1:
- if (d_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, delimiter must be a character);
- RETURN_FALSE;
- }
- delimiter = delim[0];
- /* no break */
- case 0:
- break;
+ case 3:
+ if (esc_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
escape must be a character);
+ RETURN_FALSE;
+ }
+ escape = esc[0];
+
+ case 2:
+ if (e_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
enclosure must be a character);
+ RETURN_FALSE;
+ }
+ enclosure = enclo[0];
+ /* no break */
+ case 1:
+ if (d_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
delimiter must be a character);
+ RETURN_FALSE;
+ }
+ delimiter = delim[0];
+ /* no break */
+ case 0:
+ break;
}
spl_filesystem_file_read_csv(intern, delimiter, enclosure,
escape, return_value TSRMLS_CC);
}
@@ -2197,29 +2196,29 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sss, delim,
d_len, enclo, e_len, esc, esc_len) == SUCCESS) {
switch(ZEND_NUM_ARGS())
{
-case 3:
- if (esc_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, escape must be a character);
- RETURN_FALSE;
- }
- escape = esc[0];
-/* no break */
- case 2:
- if (e_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, enclosure must be a character);
- RETURN_FALSE;
- }
- enclosure = enclo[0];
- /* no break */
- case 1:
- if (d_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, delimiter must be a character);
- RETURN_FALSE;
- }
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c
dsp Fri Oct 5 09:37:17 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c
Log:
WS/Indent fix
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.2r2=1.45.2.27.2.23.2.3diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.2
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.3
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.2 Wed Oct 3 10:44:32 2007
+++ php-src/ext/spl/spl_directory.c Fri Oct 5 09:37:17 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.2 2007/10/03 10:44:32 dsp Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.3 2007/10/05 09:37:17 dsp Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -323,8 +323,7 @@
if (!file_path || !file_path_len) {
#if defined(PHP_WIN32)
zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
Cannot create SplFileInfo for empty path);
- if (file_path !use_copy)
- {
+ if (file_path !use_copy) {
efree(file_path);
}
return NULL;
@@ -1955,29 +1954,29 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sss, delim,
d_len, enclo, e_len, esc, esc_len) == SUCCESS) {
switch(ZEND_NUM_ARGS())
{
- case 3:
- if (esc_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, escape must be a character);
- RETURN_FALSE;
- }
- escape = esc[0];
-/* no break */
- case 2:
- if (e_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, enclosure must be a character);
- RETURN_FALSE;
- }
- enclosure = enclo[0];
- /* no break */
- case 1:
- if (d_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, delimiter must be a character);
- RETURN_FALSE;
- }
- delimiter = delim[0];
- /* no break */
- case 0:
- break;
+ case 3:
+ if (esc_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
escape must be a character);
+ RETURN_FALSE;
+ }
+ escape = esc[0];
+ /* no break */
+ case 2:
+ if (e_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
enclosure must be a character);
+ RETURN_FALSE;
+ }
+ enclosure = enclo[0];
+ /* no break */
+ case 1:
+ if (d_len != 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
delimiter must be a character);
+ RETURN_FALSE;
+ }
+ delimiter = delim[0];
+ /* no break */
+ case 0:
+ break;
}
spl_filesystem_file_read_csv(intern, delimiter, enclosure,
escape, return_value TSRMLS_CC);
}
@@ -1996,29 +1995,29 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |sss, delim,
d_len, enclo, e_len, esc, esc_len) == SUCCESS) {
switch(ZEND_NUM_ARGS())
{
-case 3:
- if (esc_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, escape must be a character);
- RETURN_FALSE;
- }
- escape = esc[0];
-/* no break */
- case 2:
- if (e_len != 1) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, enclosure must be a character);
- RETURN_FALSE;
- }
- enclosure = enclo[0];
- /* no break */
- case 1:
- if (d_len != 1) {
- php_error_docref(NULL
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c
dsp Fri Oct 5 11:43:09 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c
Log:
WS fix. Space instead of tab.
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.3r2=1.45.2.27.2.23.2.4diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.3
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.4
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.3 Fri Oct 5 09:37:17 2007
+++ php-src/ext/spl/spl_directory.c Fri Oct 5 11:43:09 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.3 2007/10/05 09:37:17 dsp Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.4 2007/10/05 11:43:09 dsp Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -323,7 +323,7 @@
if (!file_path || !file_path_len) {
#if defined(PHP_WIN32)
zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
Cannot create SplFileInfo for empty path);
- if (file_path !use_copy) {
+ if (file_path !use_copy) {
efree(file_path);
}
return NULL;
--
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) / configure.in
janiFri Oct 5 12:34:48 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: - Sync with configure.in from HEAD (the CGI stuff is as ini options nowadays) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.2r2=1.579.2.52.2.77.2.3diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.2 php-src/configure.in:1.579.2.52.2.77.2.3 --- php-src/configure.in:1.579.2.52.2.77.2.2Mon Oct 1 12:40:53 2007 +++ php-src/configure.inFri Oct 5 12:34:48 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.2 2007/10/01 12:40:53 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.3 2007/10/05 12:34:48 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1296,12 +1296,12 @@ PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) -PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c getopt.c php_sprintf.c \ +PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \ safe_mode.c fopen_wrappers.c alloca.c php_scandir.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ network.c php_open_temporary_file.c php_logos.c \ - output.c ) + output.c getopt.c) PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c) @@ -1435,21 +1435,6 @@ echo | and make the changes described there and try again. | fi - # Warn about CGI version with no extra security options. - if test $PHP_SAPI = cgi; then -if test $PHP_FORCE_CGI_REDIRECT = no test $PHP_DISCARD_PATH = no; then - echo ++ - echo |*** WARNING *** | - echo | | - echo | You will be compiling the CGI version of PHP without any | - echo | redirection checking. By putting this cgi binary somewhere in | - echo | your web space, users may be able to circumvent existing .htaccess | - echo | security by loading files directly through the parser. See | - echo | http://www.php.net/manual/security.php for more details. | -fi - fi - - if test -n $DEBUG_LOG; then rm -f config.cache cat X -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
nlopess Fri Oct 5 14:49:40 2007 UTC Modified files: /php-srcconfigure.in Log: MFB: allow lcov 1.6 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.641r2=1.642diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.641 php-src/configure.in:1.642 --- php-src/configure.in:1.641 Mon Oct 1 12:32:39 2007 +++ php-src/configure.inFri Oct 5 14:49:40 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.641 2007/10/01 12:32:39 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.642 2007/10/05 14:49:40 nlopess Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -643,7 +643,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list=1.5 + ltp_version_list=1.5 1.6 AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) -- 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) / configure.in
nlopess Fri Oct 5 14:48:32 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in Log: lcov 1.6 also works correctly http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.3r2=1.579.2.52.2.77.2.4diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.3 php-src/configure.in:1.579.2.52.2.77.2.4 --- php-src/configure.in:1.579.2.52.2.77.2.3Fri Oct 5 12:34:48 2007 +++ php-src/configure.inFri Oct 5 14:48:32 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.3 2007/10/05 12:34:48 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.4 2007/10/05 14:48:32 nlopess Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -646,7 +646,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list=1.5 + ltp_version_list=1.5 1.6 AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file lstat_stat_basic.phpt
janiFri Oct 5 14:57:18 2007 UTC Modified files: /php-src/ext/standard/tests/filelstat_stat_basic.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_basic.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_basic.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.3 php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.4 --- php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.3 Mon Jun 25 09:02:07 2007 +++ php-src/ext/standard/tests/file/lstat_stat_basic.phpt Fri Oct 5 14:57:18 2007 @@ -24,6 +24,7 @@ // creating dir $dirname = $file_path/lstat_stat_basic; [EMAIL PROTECTED]($dirname); mkdir($dirname); // stat of the dir created $dir_stat = stat($dirname); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file lstat_stat_basic.phpt
janiFri Oct 5 14:57:28 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filelstat_stat_basic.phpt Log: MFH: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_basic.phpt?r1=1.1.2.4r2=1.1.2.4.2.1diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_basic.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4 php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4.2.1 --- php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4 Mon Jun 25 09:01:53 2007 +++ php-src/ext/standard/tests/file/lstat_stat_basic.phpt Fri Oct 5 14:57:28 2007 @@ -24,6 +24,7 @@ // creating dir $dirname = $file_path/lstat_stat_basic; [EMAIL PROTECTED]($dirname); mkdir($dirname); // stat of the dir created $dir_stat = stat($dirname); -- 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) / configure.in
nlopess Fri Oct 5 14:51:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in Log: allow lcov 1.6 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77r2=1.579.2.52.2.78diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77 php-src/configure.in:1.579.2.52.2.78 --- php-src/configure.in:1.579.2.52.2.77Thu Aug 30 07:40:13 2007 +++ php-src/configure.inFri Oct 5 14:51:36 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77 2007/08/30 07:40:13 sebastian Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.78 2007/10/05 14:51:36 nlopess Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -646,7 +646,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list=1.5 + ltp_version_list=1.5 1.6 AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file lstat_stat_basic.phpt
janiFri Oct 5 14:57:51 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filelstat_stat_basic.phpt Log: MFH: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/lstat_stat_basic.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/ext/standard/tests/file/lstat_stat_basic.phpt diff -u php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4 php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.5 --- php-src/ext/standard/tests/file/lstat_stat_basic.phpt:1.1.2.4 Mon Jun 25 09:01:53 2007 +++ php-src/ext/standard/tests/file/lstat_stat_basic.phpt Fri Oct 5 14:57:51 2007 @@ -24,6 +24,7 @@ // creating dir $dirname = $file_path/lstat_stat_basic; [EMAIL PROTECTED]($dirname); mkdir($dirname); // stat of the dir created $dir_stat = stat($dirname); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi config.w32 /sapi/cli config.w32
rrichards Fri Oct 5 16:00:31 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi config.w32
/php-src/sapi/cli config.w32
Log:
MFH: fix win build
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config.w32?r1=1.2.4.1.2.2.2.2r2=1.2.4.1.2.2.2.3diff_format=u
Index: php-src/sapi/cgi/config.w32
diff -u php-src/sapi/cgi/config.w32:1.2.4.1.2.2.2.2
php-src/sapi/cgi/config.w32:1.2.4.1.2.2.2.3
--- php-src/sapi/cgi/config.w32:1.2.4.1.2.2.2.2 Mon Oct 1 12:40:54 2007
+++ php-src/sapi/cgi/config.w32 Fri Oct 5 16:00:30 2007
@@ -1,10 +1,10 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2.4.1.2.2.2.2 2007/10/01 12:40:54 jani Exp $
+// $Id: config.w32,v 1.2.4.1.2.2.2.3 2007/10/05 16:00:30 rrichards Exp $
ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
if (PHP_CGI == yes) {
ADD_FLAG(LDFLAGS_CGI, /stack:8388608);
- SAPI('cgi', 'cgi_main.c ..\\..\\main\\getopt.c fastcgi.c',
'php-cgi.exe');
+ SAPI('cgi', 'cgi_main.c fastcgi.c', 'php-cgi.exe');
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
}
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/config.w32?r1=1.4.4.1.2.1r2=1.4.4.1.2.2diff_format=u
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.4.4.1.2.1
php-src/sapi/cli/config.w32:1.4.4.1.2.2
--- php-src/sapi/cli/config.w32:1.4.4.1.2.1 Mon Oct 1 12:40:54 2007
+++ php-src/sapi/cli/config.w32 Fri Oct 5 16:00:30 2007
@@ -1,12 +1,12 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.4.4.1.2.1 2007/10/01 12:40:54 jani Exp $
+// $Id: config.w32,v 1.4.4.1.2.2 2007/10/05 16:00:30 rrichards Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
if (PHP_CLI == yes) {
- SAPI('cli', '..\\..\\main\\getopt.c php_cli.c php_cli_readline.c',
'php.exe');
+ SAPI('cli', 'php_cli.c php_cli_readline.c', 'php.exe');
if (PHP_CRT_DEBUG == yes) {
ADD_FLAG(CFLAGS_CLI, /D PHP_WIN32_DEBUG_HEAP);
}
@@ -14,7 +14,7 @@
}
if (PHP_CLI_WIN32 == yes) {
- SAPI('cli_win32', '..\\..\\main\\getopt.c cli_win32.c
php_cli_readline.c', 'php-win.exe');
+ SAPI('cli_win32', 'cli_win32.c php_cli_readline.c', 'php-win.exe');
ADD_FLAG(LDFLAGS_CLI_WIN32, /stack:8388608);
}
--
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_WITH_DRCP) /ext/oci8 package2.xml
sixdFri Oct 5 16:47:37 2007 UTC Modified files: (Branch: PHP_5_2_WITH_DRCP) /php-src/ext/oci8 package2.xml Log: Add DRCP FAN http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/package2.xml?r1=1.1.2.8r2=1.1.2.8.4.1diff_format=u Index: php-src/ext/oci8/package2.xml diff -u php-src/ext/oci8/package2.xml:1.1.2.8 php-src/ext/oci8/package2.xml:1.1.2.8.4.1 --- php-src/ext/oci8/package2.xml:1.1.2.8 Fri Aug 31 22:26:13 2007 +++ php-src/ext/oci8/package2.xml Fri Oct 5 16:47:37 2007 @@ -33,31 +33,18 @@ email[EMAIL PROTECTED]/email activeyes/active /lead - date2007-09-01/date - time15:00:00/time + date2007-10-05/date + time10:00:00/time version - release1.2.4/release - api1.2.4/api + release1.3.0/release + api1.3.0/api /version stability - releasestable/release - apistable/api + releasebeta/release + apibeta/api /stability license uri=http://www.php.net/license;PHP/license - notesAdded Oracle 11g support. -Fixed PECL bug #10194 (crash in Oracle client when memory limit reached in the callback). -Fixed bug #42173 (oci_field_type fixes for INTERVAL and TIMESTAMP types). -Fixed bug #42134 (oci_error() returns false after oci_new_collection() fails). -Fixed bug #41917 (oci_field_precision and oci_field_scale datatypes fixed). -Fixed bug #41711 (Null temporary lobs not supported). -Fixed bug #41594 (Statement cache is flushed too frequently). -Fixed bug #40415 (oci_fetch_all and nested cursors, allocate descriptors dynamically) -Fixed segfault on rebinding and re-executing a statement with LOBs. -Fixed compile failure in ZTS mode when collections support is missing. -Allowed statement cache size to be set for non-persistent connections. -Improved oci_password_change() to close persistent connections on shutdown (to update hashed connection details). -Changed oci_pconnect() to behave like oci_connect() when SYSDBA and SYSOPER privileges are used. -Various minor improvements. + notesAdded DRCP and FAN support. /notes contents dir name=/ @@ -294,6 +281,31 @@ configureoption default=autodetect name=with-oci8 prompt=Please provide the path to ORACLE_HOME dir. Use apos;instantclient,/path/to/instant/client/libapos; if youapos;re compiling against Oracle Instant Client / /extsrcrelease changelog + release + version + release1.2.4/release + api1.2.4/api + /version + stability + releasestable/release + apistable/api + /stability + license uri=http://www.php.net/license;PHP/license + notesFixed PECL bug #10194 (crash in Oracle client when memory limit reached in the callback). +Fixed bug #42173 (oci_field_type fixes for INTERVAL and TIMESTAMP types). +Fixed bug #42134 (oci_error() returns false after oci_new_collection() fails). +Fixed bug #41917 (oci_field_precision and oci_field_scale datatypes fixed). +Fixed bug #41711 (Null temporary lobs not supported). +Fixed bug #41594 (Statement cache is flushed too frequently). +Fixed bug #40415 (oci_fetch_all and nested cursors, allocate descriptors dynamically) +Fixed segfault on rebinding and re-executing a statement with LOBs. +Fixed compile failure in ZTS mode when collections support is missing. +Allowed statement cache size to be set for non-persistent connections. +Improved oci_password_change() to close persistent connections on shutdown (to update hashed connection details). +Changed oci_pconnect() to behave like oci_connect() when SYSDBA and SYSOPER privileges are used. +Various minor improvements. + /notes + /release release version release1.2.3/release @@ -312,6 +324,8 @@ Fixed PECL bug #8816 (issue in php_oci_statement_fetch with more than one piecewise column). Various minor improvements. /notes + /release + release version release1.2.2/release api1.2.2/api -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 README oci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phpt password.phpt password_2.phpt password_new.phpt password_old.phpt
Are you sure you committed in right module now? I'm guessing you were supposed to do this in pecl/ ?? Otherwise I don't understand why you created another branch in php-src.. --Jani On Fri, 2007-10-05 at 16:46 +, Christopher Jones wrote: sixd Fri Oct 5 16:46:35 2007 UTC Modified files: (Branch: PHP_5_2_WITH_DRCP) /php-src/ext/oci8 oci8.c oci8_interface.c php_oci8_int.h README /php-src/ext/oci8/tests debug.phpt password_old.phpt password_2.phpt password.phpt password_new.phpt Log: Add DRCP FAN -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Patches/Donations: http://pecl.php.net/~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_2) /ext/standard/tests/strings vsprintf_basic1.phpt vsprintf_basic2.phpt vsprintf_basic3.phpt vsprintf_basic4.phpt vsprintf_basic5.phpt vsprintf_basic6.phpt vsprintf_basic
kraghubaFri Oct 5 18:07:28 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings vsprintf_variation1.phpt vsprintf_variation3.phpt vsprintf_error.phpt vsprintf_variation5.phpt vsprintf_variation7.phpt vsprintf_basic2.phpt vsprintf_variation9.phpt vsprintf_basic4.phpt vsprintf_basic6.phpt vsprintf_basic8.phpt vsprintf_variation11.phpt vsprintf_variation13.phpt vsprintf_variation15.phpt vsprintf_variation17.phpt vsprintf_variation19.phpt vsprintf_variation2.phpt vsprintf_variation4.phpt vsprintf_variation6.phpt vsprintf_basic1.phpt vsprintf_variation8.phpt vsprintf_basic3.phpt vsprintf_basic5.phpt vsprintf_basic7.phpt vsprintf_basic9.phpt vsprintf_variation10.phpt vsprintf_variation12.phpt vsprintf_variation14.phpt vsprintf_variation16.phpt vsprintf_variation18.phpt Log: New testcases for vsprintf() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation1.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation3.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_error.phpt +++ php-src/ext/standard/tests/strings/vsprintf_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation5.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation7.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_basic2.phpt +++ php-src/ext/standard/tests/strings/vsprintf_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation9.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_basic4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_basic4.phpt +++ php-src/ext/standard/tests/strings/vsprintf_basic4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_basic6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_basic6.phpt +++ php-src/ext/standard/tests/strings/vsprintf_basic6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_basic8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_basic8.phpt +++ php-src/ext/standard/tests/strings/vsprintf_basic8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation11.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation11.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation13.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/vsprintf_variation13.phpt +++ php-src/ext/standard/tests/strings/vsprintf_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation15.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_split_basic.phpt str_split_error.phpt str_split_variation1.phpt str_split_variation2.phpt str_split_variation3.phpt str_split_variation4
kraghubaFri Oct 5 18:16:34 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings str_split_variation5.phpt str_split_variation6.phpt str_split_variation7.phpt str_split_error.phpt str_split_basic.phpt str_split_variation1.phpt str_split_variation2.phpt str_split_variation3.phpt str_split_variation4.phpt Log: New testcases for str_split() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation5.phpt +++ php-src/ext/standard/tests/strings/str_split_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation6.phpt +++ php-src/ext/standard/tests/strings/str_split_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation7.phpt +++ php-src/ext/standard/tests/strings/str_split_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_error.phpt +++ php-src/ext/standard/tests/strings/str_split_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_basic.phpt +++ php-src/ext/standard/tests/strings/str_split_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation1.phpt +++ php-src/ext/standard/tests/strings/str_split_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation2.phpt +++ php-src/ext/standard/tests/strings/str_split_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation3.phpt +++ php-src/ext/standard/tests/strings/str_split_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation4.phpt +++ php-src/ext/standard/tests/strings/str_split_variation4.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings str_split_basic.phpt str_split_error.phpt str_split_variation1.phpt str_split_variation2.phpt str_split_variation3.phpt str_split_variation4
kraghubaFri Oct 5 18:18:18 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings str_split_variation4.phpt str_split_variation5.phpt str_split_variation6.phpt str_split_variation7.phpt str_split_error.phpt str_split_basic.phpt str_split_variation1.phpt str_split_variation2.phpt str_split_variation3.phpt Log: New testcases for str_split() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation4.phpt +++ php-src/ext/standard/tests/strings/str_split_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation5.phpt +++ php-src/ext/standard/tests/strings/str_split_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation6.phpt +++ php-src/ext/standard/tests/strings/str_split_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation7.phpt +++ php-src/ext/standard/tests/strings/str_split_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_error.phpt +++ php-src/ext/standard/tests/strings/str_split_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_basic.phpt +++ php-src/ext/standard/tests/strings/str_split_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation1.phpt +++ php-src/ext/standard/tests/strings/str_split_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation2.phpt +++ php-src/ext/standard/tests/strings/str_split_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/str_split_variation3.phpt +++ php-src/ext/standard/tests/strings/str_split_variation3.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings str_split_basic.phpt str_split_error.phpt str_split_variation1.phpt str_split_variation2.phpt str_split_variation3.phpt str_split_variation4.phpt str
kraghubaFri Oct 5 18:20:57 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings str_split_variation1.phpt
str_split_basic.phpt
str_split_variation2.phpt
str_split_variation3.phpt
str_split_variation4.phpt
str_split_variation5.phpt
str_split_variation6.phpt
str_split_variation7.phpt
str_split_error.phpt
Log:
New testcases for str_split() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/str_split_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/strings/str_split_variation1.phpt:1.2
--- /dev/null Fri Oct 5 18:20:57 2007
+++ php-src/ext/standard/tests/strings/str_split_variation1.phptFri Oct
5 18:20:57 2007
@@ -0,0 +1,388 @@
+--TEST--
+Test str_split() function : usage variations - unexpected values for 'str'
argument(Bug#42866)
+--FILE--
+?php
+/* Prototype : array str_split( $str [, int $split_length])
+ * Description: Convert a string to an array. If split_length is
+specified, break the string down into chunks each
+split_length characters long.
+ * Source code: ext/standard/string.c
+ * Alias to functions: none
+*/
+
+echo *** Testing str_split() : unexpected values for 'str' ***\n;
+
+// Initialise function arguments
+$split_length = 3;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+//defining class for object variable
+class MyClass
+{
+ public function __toString()
+ {
+return object;
+ }
+}
+
+//resource variable
+$fp = fopen(__FILE__, 'r');
+
+//different values for 'str' argument
+$values = array(
+
+ // int data
+ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float data
+ 10.5,
+ -10.5,
+ 10.5e10,
+ 10.6E-10,
+ .5,
+
+ // array data
+ array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' = 'red', 'item' = 'pen'),
+
+ // null data
+ NULL,
+ null,
+
+ // boolean data
+ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // empty data
+ ,
+ '',
+
+ // object data
+ new MyClass(),
+
+ // undefined data
+ @$undefined_var,
+
+ // unset data
+ @$unset_var,
+
+ //resource data
+ $fp
+);
+
+// loop through each element of $values for 'str' argument
+for($count = 0; $count count($values); $count++) {
+ echo -- Iteration .($count+1). --\n;
+ var_dump( str_split($values[$count], $split_length) );
+}
+
+//closing resource
+fclose($fp);
+
+echo Done;
+?
+--EXPECTF--
+*** Testing str_split() : unexpected values for 'str' ***
+-- Iteration 1 --
+array(1) {
+ [0]=
+ string(1) 0
+}
+-- Iteration 2 --
+array(1) {
+ [0]=
+ string(1) 1
+}
+-- Iteration 3 --
+array(2) {
+ [0]=
+ string(3) 123
+ [1]=
+ string(2) 45
+}
+-- Iteration 4 --
+array(2) {
+ [0]=
+ string(3) -23
+ [1]=
+ string(2) 45
+}
+-- Iteration 5 --
+array(2) {
+ [0]=
+ string(3) 10.
+ [1]=
+ string(1) 5
+}
+-- Iteration 6 --
+array(2) {
+ [0]=
+ string(3) -10
+ [1]=
+ string(2) .5
+}
+-- Iteration 7 --
+array(4) {
+ [0]=
+ string(3) 105
+ [1]=
+ string(3) 000
+ [2]=
+ string(3) 000
+ [3]=
+ string(3) 000
+}
+-- Iteration 8 --
+array(3) {
+ [0]=
+ string(3) 1.0
+ [1]=
+ string(3) 6E-
+ [2]=
+ string(1) 9
+}
+-- Iteration 9 --
+array(1) {
+ [0]=
+ string(3) 0.5
+}
+-- Iteration 10 --
+
+Warning: str_split() expects parameter 1 to be string (Unicode or binary),
array given in %s on line %d
+NULL
+-- Iteration 11 --
+
+Warning: str_split() expects parameter 1 to be string (Unicode or binary),
array given in %s on line %d
+NULL
+-- Iteration 12 --
+
+Warning: str_split() expects parameter 1 to be string (Unicode or binary),
array given in %s on line %d
+NULL
+-- Iteration 13 --
+
+Warning: str_split() expects parameter 1 to be string (Unicode or binary),
array given in %s on line %d
+NULL
+-- Iteration 14 --
+
+Warning: str_split() expects parameter 1 to be string (Unicode or binary),
array given in %s on line %d
+NULL
+-- Iteration 15 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 16 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 17 --
+array(1) {
+ [0]=
+ string(1) 1
+}
+-- Iteration 18 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 19 --
+array(1) {
+ [0]=
+ string(1) 1
+}
+-- Iteration 20 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 21 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 22 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 23 --
+array(2) {
+ [0]=
+ string(3) obj
+ [1]=
+ string(3) ect
+}
+-- Iteration 24 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 25 --
+array(1) {
+ [0]=
+ string(0)
+}
+-- Iteration 26 --
+
+Warning: str_split() expects
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings strrpos_basic1.phpt strrpos_basic2.phpt strrpos_error.phpt strrpos_variation1.phpt strrpos_variation10.phpt strrpos_variation11.phpt strrpos
kraghubaFri Oct 5 18:31:50 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strrpos_variation10.phpt strrpos_variation11.phpt strrpos_variation12.phpt strrpos_variation13.phpt strrpos_variation14.phpt strrpos_variation15.phpt strrpos_variation1.phpt strrpos_variation2.phpt strrpos_variation3.phpt strrpos_variation4.phpt strrpos_variation5.phpt strrpos_variation6.phpt strrpos_basic1.phpt strrpos_variation7.phpt strrpos_basic2.phpt strrpos_error.phpt strrpos_variation8.phpt strrpos_variation9.phpt Log: New testcases for strrpos() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation10.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation10.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation11.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation11.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation12.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation12.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation13.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation13.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation14.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation14.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation14.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation15.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation15.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation1.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation2.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation3.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation4.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation5.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation6.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_basic1.phpt +++ php-src/ext/standard/tests/strings/strrpos_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation7.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_basic2.phpt +++ php-src/ext/standard/tests/strings/strrpos_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_error.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings nl2br_error.phpt nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt
kraghubaFri Oct 5 18:46:02 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt nl2br_error.phpt Log: New testcases for nl2br() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation1.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation2.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation3.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation4.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation5.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_error.phpt +++ php-src/ext/standard/tests/strings/nl2br_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings nl2br_error.phpt nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt
kraghubaFri Oct 5 18:47:47 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings nl2br_error.phpt
nl2br_variation1.phpt
nl2br_variation2.phpt
nl2br_variation3.phpt
nl2br_variation4.phpt
nl2br_variation5.phpt
Log:
New testcases for nl2br() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_error.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/nl2br_error.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/nl2br_error.phpt:1.2
--- /dev/null Fri Oct 5 18:47:47 2007
+++ php-src/ext/standard/tests/strings/nl2br_error.phpt Fri Oct 5 18:47:47 2007
@@ -0,0 +1,33 @@
+--TEST--
+Test nl2br() function : error conditions
+--FILE--
+?php
+/* Prototype : string nl2br(string $str)
+ * Description: Inserts HTML line breaks before all newlines in a string.
+ * Source code: ext/standard/string.c
+*/
+
+echo *** Testing nl2br() : error conditions ***;
+
+// Zero arguments
+echo \n-- Testing nl2br() function with Zero arguments --;
+var_dump( nl2br() );
+
+// Test nl2br with one more than the expected number of arguments
+echo \n-- Testing nl2br() function with more than expected no. of arguments
--;
+$str = 'string_val';
+$extra_arg = 10;
+var_dump( nl2br($str, $extra_arg) );
+
+echo Done;
+?
+--EXPECTF--
+*** Testing nl2br() : error conditions ***
+-- Testing nl2br() function with Zero arguments --
+Warning: nl2br() expects exactly 1 parameter, 0 given in %s on line %d
+NULL
+
+-- Testing nl2br() function with more than expected no. of arguments --
+Warning: nl2br() expects exactly 1 parameter, 2 given in %s on line %d
+NULL
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/nl2br_variation1.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/nl2br_variation1.phpt:1.2
--- /dev/null Fri Oct 5 18:47:47 2007
+++ php-src/ext/standard/tests/strings/nl2br_variation1.phptFri Oct 5
18:47:47 2007
@@ -0,0 +1,113 @@
+--TEST--
+Test nl2br() function : usage variations - double quoted strings for 'str'
argument
+--FILE--
+?php
+/* Prototype : string nl2br(string $str);
+ * Description: Inserts HTML line breaks before all newlines in a string.
+ * Source code: ext/standard/string.c
+*/
+
+/* Test nl2br() function by passing double quoted strings containing various
+ * combinations of new line chars to 'str' argument
+*/
+
+echo *** Testing nl2br() : usage variations ***\n;
+
+$strings = array(
+ //new line chars embedded in strings
+ bHello\nWorld, //binary input
+ \nHello\nWorld\n,
+ Hello\rWorld,
+ \rHello\rWorld\r,
+ Hello\r\nWorld,
+ \r\nHello\r\nWorld\r\n,
+
+ //one blank line
+
+,
+
+ //two blank lines
+
+
+,
+
+ //inserted new line in a string
+ Hello
+World
+);
+
+//loop through $strings array to test nl2br() function with each element
+$count = 1;
+foreach( $strings as $str ){
+ echo -- Iteration $count --\n;
+ var_dump(nl2br($str) );
+ $count ++ ;
+}
+echo Done;
+?
+--EXPECTF--
+*** Testing nl2br() : usage variations ***
+-- Iteration 1 --
+string(17) Hellobr /
+World
+-- Iteration 2 --
+string(31) br /
+Hellobr /
+Worldbr /
+
+-- Iteration 3 --
+string(17) Hellobr /World
+-- Iteration 4 --
+string(31) br /Hellobr /Worldbr /
+-- Iteration 5 --
+string(18) Hellobr /
+World
+-- Iteration 6 --
+string(34) br /
+Hellobr /
+Worldbr /
+
+-- Iteration 7 --
+string(7) br /
+
+-- Iteration 8 --
+string(14) br /
+br /
+
+-- Iteration 9 --
+string(17) Hellobr /
+World
+Done
+--UEXPECTF--
+*** Testing nl2br() : usage variations ***
+-- Iteration 1 --
+string(17) Hellobr /
+World
+-- Iteration 2 --
+unicode(31) br /
+Hellobr /
+Worldbr /
+
+-- Iteration 3 --
+unicode(17) Hellobr /World
+-- Iteration 4 --
+unicode(31) br /Hellobr /Worldbr /
+-- Iteration 5 --
+unicode(18) Hellobr /
+World
+-- Iteration 6 --
+unicode(34) br /
+Hellobr /
+Worldbr /
+
+-- Iteration 7 --
+unicode(7) br /
+
+-- Iteration 8 --
+unicode(14) br /
+br /
+
+-- Iteration 9 --
+unicode(17) Hellobr /
+World
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/nl2br_variation2.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/nl2br_variation2.phpt:1.2
--- /dev/null Fri Oct 5 18:47:47 2007
+++ php-src/ext/standard/tests/strings/nl2br_variation2.phptFri Oct 5
18:47:47 2007
@@ -0,0 +1,95 @@
+--TEST--
+Test nl2br() function : usage variations - single quoted strings for 'str'
argument
+--FILE--
+?php
+/* Prototype : string nl2br(string $str);
+ * Description: Inserts HTML line breaks before all newlines in a string.
+ * Source code: ext/standard/string.c
+*/
+
+/* Test nl2br() function
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings nl2br_error.phpt nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt
kraghubaFri Oct 5 18:44:34 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings nl2br_variation1.phpt nl2br_variation2.phpt nl2br_variation3.phpt nl2br_variation4.phpt nl2br_variation5.phpt nl2br_error.phpt Log: New testcases for nl2br() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation1.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation2.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation3.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation4.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_variation5.phpt +++ php-src/ext/standard/tests/strings/nl2br_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/nl2br_error.phpt +++ php-src/ext/standard/tests/strings/nl2br_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings strrpos_basic1.phpt strrpos_basic2.phpt strrpos_error.phpt strrpos_variation1.phpt strrpos_variation10.phpt strrpos_variation11.phpt strrpos
kraghubaFri Oct 5 18:33:24 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings strrpos_variation10.phpt strrpos_variation11.phpt strrpos_variation12.phpt strrpos_variation13.phpt strrpos_variation14.phpt strrpos_variation15.phpt strrpos_variation1.phpt strrpos_variation2.phpt strrpos_variation3.phpt strrpos_variation4.phpt strrpos_variation5.phpt strrpos_error.phpt strrpos_variation6.phpt strrpos_basic1.phpt strrpos_variation7.phpt strrpos_basic2.phpt strrpos_variation8.phpt strrpos_variation9.phpt Log: New testcases for strrpos() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation10.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation10.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation11.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation11.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation12.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation12.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation13.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation13.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation14.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation14.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation14.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation15.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation15.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation1.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation2.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation3.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation4.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation5.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_error.phpt +++ php-src/ext/standard/tests/strings/strrpos_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation6.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_basic1.phpt +++ php-src/ext/standard/tests/strings/strrpos_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/strrpos_variation7.phpt +++ php-src/ext/standard/tests/strings/strrpos_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_basic2.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_error.phpt setlocale_variation1.phpt setlocale_variation2.phpt s
kraghubaFri Oct 5 19:32:28 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings setlocale_variation4.phpt setlocale_variation5.phpt setlocale_basic1.phpt setlocale_error.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_variation1.phpt setlocale_variation2.phpt setlocale_variation3.phpt Log: New testcases for setlocale() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation4.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation5.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic1.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_error.phpt +++ php-src/ext/standard/tests/strings/setlocale_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic2.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic3.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation1.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation2.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation3.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation3.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_error.phpt setlocale_variation1.phpt setlocale_variation2.phpt setlocale_
kraghubaFri Oct 5 19:35:45 2007 UTC
Modified files:
/php-src/ext/standard/tests/strings setlocale_variation1.phpt
setlocale_variation2.phpt
setlocale_variation3.phpt
setlocale_variation4.phpt
setlocale_variation5.phpt
setlocale_basic1.phpt
setlocale_basic2.phpt
setlocale_basic3.phpt
setlocale_error.phpt
Log:
New testcases for setlocale() function
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/setlocale_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/strings/setlocale_variation1.phpt:1.2
--- /dev/null Fri Oct 5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation1.phptFri Oct
5 19:35:45 2007
@@ -0,0 +1,93 @@
+--TEST--
+Test setlocale() function : usage variations - passing multiple valid/invlaid
locales as argument
+--SKIPIF--
+?php
+if (substr(PHP_OS, 0, 3) == 'WIN')
+ die('skip Not valid for windows');
+if(ini_get(unicode.semantics) == 1)
+ die('skip do not run when unicode on');
+?
+--FILE--
+?php
+/* Prototype : string setlocale (int $category , string $locale [,string $..]
)
+ : string setlocale(int $category , array $locale);
+ * Description: Sets locale information.Returns the new current locale , or
FALSE
+if locale functinality is not implemented in this platform.
+ * Source code: ext/standard/string.c
+*/
+
+/* Test the setlocale() when multiple valid/invalid locales are provided as
argument */
+
+/* Prototype : array list_system_locales( void )
+ Description: To get the currently installed locle in this platform
+ Arguments : Nil
+ Returns: set of locale as array
+*/
+function list_system_locales() {
+ // start the buffering of next command to internal output buffer
+ ob_start();
+
+ // run the command 'locale -a' to fetch all locales available in the system
+ system('locale -a');
+
+ // get the contents from the internal output buffer
+ $all_locales = ob_get_contents();
+
+ // fflush and end the output buffering to internal output buffer
+ ob_end_clean();
+
+ $system_locales = explode(\n, $all_locales);
+
+ // return all the locale found in the system
+ return $system_locales;
+}
+
+/* Collect existing system locales and get 2 valid locales that can be use to
+ pass as argument to setlocale(), pass 2 invalid arguments along with two
valid argumentsss */
+echo *** Testing setlocale() by passing multiple valid/invalid locales as
argument ***\n;
+
+//set of currency symbol according to above list of locales
+$currency_symbol = array(
+ en_US.utf8 = USD,
+ ko_KR.utf8 = KRW,
+ zh_CN.utf8 = CNY
+);
+
+// gather all the locales installed in the system
+$all_system_locales = list_system_locales();
+
+// Now check for three locales that is present in the system and use that as
argument to setlocale()
+if( in_array(en_US.utf8,$all_system_locales) ||
+in_array(Ko_KR.utf8,$all_system_locales) ||
+in_array(zh_CN.utf8,$all_system_locales) ) {
+ echo -- Testing setlocale() by giving 'category' as LC_ALL multiple
locales(en_US.invalid, en_US.utf8, Ko_KR.utf8, KO_KR.invalid, zh_CN.utf8) --\n;
+
+ // call setlocale()
+ $new_locale = setlocale(LC_ALL, en_US.invalid, en_US.utf8, Ko_KR.utf8,
KO_KR.invalid, zh_CN.utf8);
+
+ // dump the name of the new locale set by setlocale()
+ var_dump($new_locale);
+
+ // check that new locale setting is effective
+ // use localeconv() to get the details of currently set locale
+ $locale_info = localeconv();
+ $new_currency = trim($locale_info['int_curr_symbol']);
+
+ echo Checking currency settings in the new locale, expected:
.$currency_symbol[$new_locale]., Found: .$new_currency.\n;
+ echo Test ;
+ if( trim($currency_symbol[$new_locale]) == $new_currency) {
+echo PASSED.\n;
+ } else {
+echo FAILED.\n;
+ }
+}
+
+echo Done\n;
+?
+--EXPECTF--
+*** Testing setlocale() by passing multiple valid/invalid locales as argument
***
+-- Testing setlocale() by giving 'category' as LC_ALL multiple
locales(en_US.invalid, en_US.utf8, Ko_KR.utf8, KO_KR.invalid, zh_CN.utf8) --
+string(%d) %s
+Checking currency settings in the new locale, expected: %s, Found: %s
+Test PASSED.
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/strings/setlocale_variation2.phpt
diff -u /dev/null
php-src/ext/standard/tests/strings/setlocale_variation2.phpt:1.2
--- /dev/null Fri Oct 5 19:35:45 2007
+++ php-src/ext/standard/tests/strings/setlocale_variation2.phptFri Oct
5
Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 README oci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phpt password.phpt password_2.phpt password_new.phpt password_old.phpt
On 05.10.2007 21:23, Jani Taskinen wrote: Are you sure you committed in right module now? I'm guessing you were supposed to do this in pecl/ ?? Otherwise I don't understand why you created another branch in php-src.. Good question, yeah. Especially taking into account that this is 5_2 branch and I see this patch for the first time.. Please revert. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_error.phpt setlocale_variation1.phpt setlocale_variation2.phpt s
kraghubaFri Oct 5 19:30:50 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings setlocale_variation5.phpt setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_error.phpt setlocale_variation1.phpt setlocale_variation2.phpt setlocale_variation3.phpt setlocale_variation4.phpt Log: New testcases for setlocale() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation5.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic1.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic2.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic3.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_error.phpt +++ php-src/ext/standard/tests/strings/setlocale_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation1.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation2.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation3.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation4.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation4.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt
Weird, I'm pretty sure I created the branch for Chris in PECL. This is intentionally in a branch so that people can play around with it but without risking the stable branch. Chris, did you checkout pecl/oci8 or php-src/ext/oci8 before you commited? Andi -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Friday, October 05, 2007 10:23 AM To: Christopher Jones Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt Are you sure you committed in right module now? I'm guessing you were supposed to do this in pecl/ ?? Otherwise I don't understand why you created another branch in php- src.. --Jani On Fri, 2007-10-05 at 16:46 +, Christopher Jones wrote: sixdFri Oct 5 16:46:35 2007 UTC Modified files: (Branch: PHP_5_2_WITH_DRCP) /php-src/ext/oci8 oci8.c oci8_interface.c php_oci8_int.h README /php-src/ext/oci8/tests debug.phpt password_old.phpt password_2.phpt password.phpt password_new.phpt Log: Add DRCP FAN -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Patches/Donations: http://pecl.php.net/~jani/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt
Is ext/oci8 a symlinked pecl extension..? :) So the confusion on my part was just that I didn't know this fact. (yet another reason why the symlinking in repository is bad..) --Jani Andi Gutmans kirjoitti: Weird, I'm pretty sure I created the branch for Chris in PECL. This is intentionally in a branch so that people can play around with it but without risking the stable branch. Chris, did you checkout pecl/oci8 or php-src/ext/oci8 before you commited? Andi -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Friday, October 05, 2007 10:23 AM To: Christopher Jones Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt Are you sure you committed in right module now? I'm guessing you were supposed to do this in pecl/ ?? Otherwise I don't understand why you created another branch in php- src.. --Jani On Fri, 2007-10-05 at 16:46 +, Christopher Jones wrote: sixdFri Oct 5 16:46:35 2007 UTC Modified files: (Branch: PHP_5_2_WITH_DRCP) /php-src/ext/oci8 oci8.c oci8_interface.c php_oci8_int.h README /php-src/ext/oci8/tests debug.phpt password_old.phpt password_2.phpt password.phpt password_new.phpt Log: Add DRCP FAN -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Patches/Donations: http://pecl.php.net/~jani/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt
Yeah I also got confused for a sec :) -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Friday, October 05, 2007 4:38 PM To: Andi Gutmans Cc: Christopher Jones; php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt Is ext/oci8 a symlinked pecl extension..? :) So the confusion on my part was just that I didn't know this fact. (yet another reason why the symlinking in repository is bad..) --Jani Andi Gutmans kirjoitti: Weird, I'm pretty sure I created the branch for Chris in PECL. This is intentionally in a branch so that people can play around with it but without risking the stable branch. Chris, did you checkout pecl/oci8 or php-src/ext/oci8 before you commited? Andi -Original Message- From: Jani Taskinen [mailto:[EMAIL PROTECTED] Sent: Friday, October 05, 2007 10:23 AM To: Christopher Jones Cc: php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2_WITH_DRCP) /ext/oci8 READMEoci8.c oci8_interface.c php_oci8_int.h /ext/oci8/tests debug.phptpassword.phpt password_2.phpt password_new.phpt password_old.phpt Are you sure you committed in right module now? I'm guessing you were supposed to do this in pecl/ ?? Otherwise I don't understand why you created another branch in php- src.. --Jani On Fri, 2007-10-05 at 16:46 +, Christopher Jones wrote: sixd Fri Oct 5 16:46:35 2007 UTC Modified files: (Branch: PHP_5_2_WITH_DRCP) /php-src/ext/oci8 oci8.c oci8_interface.c php_oci8_int.h README /php-src/ext/oci8/tests debug.phpt password_old.phpt password_2.phpt password.phpt password_new.phpt Log: Add DRCP FAN -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Patches/Donations: http://pecl.php.net/~jani/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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
janiSat Oct 6 01:42:40 2007 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
- Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to allow
setting network timeout
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.176r2=1.177diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.176 php-src/ext/ldap/ldap.c:1.177
--- php-src/ext/ldap/ldap.c:1.176 Thu Sep 27 18:28:39 2007
+++ php-src/ext/ldap/ldap.c Sat Oct 6 01:42:40 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.176 2007/09/27 18:28:39 dmitry Exp $ */
+/* $Id: ldap.c,v 1.177 2007/10/06 01:42:40 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -258,6 +258,9 @@
REGISTER_LONG_CONSTANT(LDAP_OPT_DEREF, LDAP_OPT_DEREF,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_SIZELIMIT, LDAP_OPT_SIZELIMIT,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_TIMELIMIT, LDAP_OPT_TIMELIMIT,
CONST_PERSISTENT | CONST_CS);
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT | CONST_CS);
+#endif
REGISTER_LONG_CONSTANT(LDAP_OPT_PROTOCOL_VERSION,
LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_ERROR_NUMBER, LDAP_OPT_ERROR_NUMBER,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_REFERRALS, LDAP_OPT_REFERRALS,
CONST_PERSISTENT | CONST_CS);
@@ -322,7 +325,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.176
2007/09/27 18:28:39 dmitry Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.177
2007/10/06 01:42:40 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1714,12 +1717,29 @@
#endif
{
int val;
+
if (ldap_get_option(ld-link, opt, val)) {
RETURN_FALSE;
}
zval_dtor(*retval);
ZVAL_LONG(*retval, val);
} break;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ case LDAP_OPT_NETWORK_TIMEOUT:
+ {
+ struct timeval *timeout;
+
+ if (ldap_get_option(ld-link, opt, (void *) timeout)) {
+ if (timeout) {
+ ldap_memfree(timeout);
+ }
+ RETURN_FALSE;
+ }
+ zval_dtor(*retval);
+ ZVAL_LONG(*retval, timeout-tv_sec);
+ ldap_memfree(timeout);
+ } break;
+#endif
/* options with string value */
case LDAP_OPT_ERROR_STRING:
#ifdef LDAP_OPT_HOST_NAME
@@ -1795,12 +1815,26 @@
#endif
{
int val;
+
convert_to_long_ex(newval);
val = Z_LVAL_PP(newval);
if (ldap_set_option(ldap, opt, val)) {
RETURN_FALSE;
}
} break;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ case LDAP_OPT_NETWORK_TIMEOUT:
+ {
+ struct timeval timeout;
+
+ convert_to_long_ex(newval);
+ timeout.tv_sec = Z_LVAL_PP(newval);
+ timeout.tv_usec = 0;
+ if (ldap_set_option(ldap, opt, (void *) timeout)) {
+ RETURN_FALSE;
+ }
+ } break;
+#endif
/* options with string value */
case LDAP_OPT_ERROR_STRING:
#ifdef LDAP_OPT_HOST_NAME
--
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/ldap ldap.c
janiSat Oct 6 01:43:26 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ldap ldap.c
Log:
MFH: - Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to allow
setting network timeout (FR#42837)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.1r2=1.161.2.3.2.11.2.2diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.1
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.2
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.1 Thu Sep 27 18:00:39 2007
+++ php-src/ext/ldap/ldap.c Sat Oct 6 01:43:26 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.1 2007/09/27 18:00:39 dmitry Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.2 2007/10/06 01:43:26 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -258,6 +258,9 @@
REGISTER_LONG_CONSTANT(LDAP_OPT_DEREF, LDAP_OPT_DEREF,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_SIZELIMIT, LDAP_OPT_SIZELIMIT,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_TIMELIMIT, LDAP_OPT_TIMELIMIT,
CONST_PERSISTENT | CONST_CS);
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT | CONST_CS);
+#endif
REGISTER_LONG_CONSTANT(LDAP_OPT_PROTOCOL_VERSION,
LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_ERROR_NUMBER, LDAP_OPT_ERROR_NUMBER,
CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_REFERRALS, LDAP_OPT_REFERRALS,
CONST_PERSISTENT | CONST_CS);
@@ -322,7 +325,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.161.2.3.2.11.2.1 2007/09/27 18:00:39 dmitry Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.11.2.2 2007/10/06 01:43:26 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1716,12 +1719,29 @@
#endif
{
int val;
+
if (ldap_get_option(ld-link, opt, val)) {
RETURN_FALSE;
}
zval_dtor(*retval);
ZVAL_LONG(*retval, val);
} break;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ case LDAP_OPT_NETWORK_TIMEOUT:
+ {
+ struct timeval *timeout;
+
+ if (ldap_get_option(ld-link, opt, (void *) timeout)) {
+ if (timeout) {
+ ldap_memfree(timeout);
+ }
+ RETURN_FALSE;
+ }
+ zval_dtor(*retval);
+ ZVAL_LONG(*retval, timeout-tv_sec);
+ ldap_memfree(timeout);
+ } break;
+#endif
/* options with string value */
case LDAP_OPT_ERROR_STRING:
#ifdef LDAP_OPT_HOST_NAME
@@ -1797,12 +1817,26 @@
#endif
{
int val;
+
convert_to_long_ex(newval);
val = Z_LVAL_PP(newval);
if (ldap_set_option(ldap, opt, val)) {
RETURN_FALSE;
}
} break;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ case LDAP_OPT_NETWORK_TIMEOUT:
+ {
+ struct timeval timeout;
+
+ convert_to_long_ex(newval);
+ timeout.tv_sec = Z_LVAL_PP(newval);
+ timeout.tv_usec = 0;
+ if (ldap_set_option(ldap, opt, (void *) timeout)) {
+ RETURN_FALSE;
+ }
+ } break;
+#endif
/* options with string value */
case LDAP_OPT_ERROR_STRING:
#ifdef LDAP_OPT_HOST_NAME
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
janiSat Oct 6 01:46:25 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN [DOC] Note: ldap_[get|set]_option() manual pages needs an entry for [DOC] LDAP_OPT_NETWORK_TIMEOUT http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.21r2=1.2027.2.547.2.965.2.22diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.21 php-src/NEWS:1.2027.2.547.2.965.2.22 --- php-src/NEWS:1.2027.2.547.2.965.2.21Wed Oct 3 10:44:32 2007 +++ php-src/NEWSSat Oct 6 01:46:24 2007 @@ -1,7 +1,9 @@ PHPNEWS ||| ?? ??? 20??, PHP 5.3.0 -- Added optional escape character parameter to fgetcsv. (David Soria Parra) +- Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to allow + setting network timeout (FR #42837). (Jani) +- Added optional escape character parameter to fgetcsv(). (David Soria Parra) - Added xsl-setProfiling() for profiling stylesheets. (Christian) - Added long-option feature to getopt() and made getopt() available also on win32 systems by adding a common getopt implementation into core. -- 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
janiSat Oct 6 02:13:32 2007 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
- Add support for LDAP_X_OPT_CONNECT_TIMEOUT (Netscape LDAP SDK equivalent
for LDAP_OPT_NETWORK_TIMEOUT)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.177r2=1.178diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.177 php-src/ext/ldap/ldap.c:1.178
--- php-src/ext/ldap/ldap.c:1.177 Sat Oct 6 01:42:40 2007
+++ php-src/ext/ldap/ldap.c Sat Oct 6 02:13:31 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.177 2007/10/06 01:42:40 jani Exp $ */
+/* $Id: ldap.c,v 1.178 2007/10/06 02:13:31 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -260,6 +260,8 @@
REGISTER_LONG_CONSTANT(LDAP_OPT_TIMELIMIT, LDAP_OPT_TIMELIMIT,
CONST_PERSISTENT | CONST_CS);
#ifdef LDAP_OPT_NETWORK_TIMEOUT
REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT | CONST_CS);
+#elif defined (LDAP_X_OPT_CONNECT_TIMEOUT)
+ REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_X_OPT_CONNECT_TIMEOUT, CONST_PERSISTENT | CONST_CS);
#endif
REGISTER_LONG_CONSTANT(LDAP_OPT_PROTOCOL_VERSION,
LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_ERROR_NUMBER, LDAP_OPT_ERROR_NUMBER,
CONST_PERSISTENT | CONST_CS);
@@ -325,7 +327,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.177
2007/10/06 01:42:40 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.178
2007/10/06 02:13:31 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1724,20 +1726,30 @@
zval_dtor(*retval);
ZVAL_LONG(*retval, val);
} break;
-#ifdef LDAP_OPT_NETWORK_TIMEOUT
+#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT)
case LDAP_OPT_NETWORK_TIMEOUT:
{
+# ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval *timeout;
-
- if (ldap_get_option(ld-link, opt, (void *) timeout)) {
+
+ if (ldap_get_option(ld-link, LDAP_OPT_NETWORK_TIMEOUT,
(void *) timeout)) {
if (timeout) {
ldap_memfree(timeout);
}
RETURN_FALSE;
- }
+ }
zval_dtor(*retval);
ZVAL_LONG(*retval, timeout-tv_sec);
ldap_memfree(timeout);
+# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
+ int timeout;
+
+ if (ldap_get_option(ld-link,
LDAP_X_OPT_CONNECT_TIMEOUT, timeout)) {
+ RETURN_FALSE;
+ }
+ zval_dtor(*retval);
+ ZVAL_LONG(*retval, (timeout / 1000));
+# endif
} break;
#endif
/* options with string value */
@@ -1822,17 +1834,27 @@
RETURN_FALSE;
}
} break;
-#ifdef LDAP_OPT_NETWORK_TIMEOUT
+#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT)
case LDAP_OPT_NETWORK_TIMEOUT:
{
+# ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval timeout;
-
+
convert_to_long_ex(newval);
timeout.tv_sec = Z_LVAL_PP(newval);
timeout.tv_usec = 0;
- if (ldap_set_option(ldap, opt, (void *) timeout)) {
+ if (ldap_set_option(ldap, LDAP_OPT_NETWORK_TIMEOUT,
(void *) timeout)) {
RETURN_FALSE;
}
+# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
+ int timeout;
+
+ convert_to_long_ex(newval);
+ timeou = 1000 * Z_LVAL_PP(newval); /* Convert to
milliseconds */
+ if (ldap_set_option(ldap, LDAP_X_OPT_CONNECT_TIMEOUT,
timeout)) {
+ RETURN_FALSE;
+ }
+# endif
} break;
#endif
/* options with string value */
--
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/ldap ldap.c
janiSat Oct 6 02:13:50 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ldap ldap.c
Log:
MFH:- Add support for LDAP_X_OPT_CONNECT_TIMEOUT (Netscape LDAP SDK
equivalent for LDAP_OPT_NETWORK_TIMEOUT)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.2r2=1.161.2.3.2.11.2.3diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.2
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.3
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.2 Sat Oct 6 01:43:26 2007
+++ php-src/ext/ldap/ldap.c Sat Oct 6 02:13:50 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.2 2007/10/06 01:43:26 jani Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.3 2007/10/06 02:13:50 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -260,6 +260,8 @@
REGISTER_LONG_CONSTANT(LDAP_OPT_TIMELIMIT, LDAP_OPT_TIMELIMIT,
CONST_PERSISTENT | CONST_CS);
#ifdef LDAP_OPT_NETWORK_TIMEOUT
REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_OPT_NETWORK_TIMEOUT, CONST_PERSISTENT | CONST_CS);
+#elif defined (LDAP_X_OPT_CONNECT_TIMEOUT)
+ REGISTER_LONG_CONSTANT(LDAP_OPT_NETWORK_TIMEOUT,
LDAP_X_OPT_CONNECT_TIMEOUT, CONST_PERSISTENT | CONST_CS);
#endif
REGISTER_LONG_CONSTANT(LDAP_OPT_PROTOCOL_VERSION,
LDAP_OPT_PROTOCOL_VERSION, CONST_PERSISTENT | CONST_CS);
REGISTER_LONG_CONSTANT(LDAP_OPT_ERROR_NUMBER, LDAP_OPT_ERROR_NUMBER,
CONST_PERSISTENT | CONST_CS);
@@ -325,7 +327,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.161.2.3.2.11.2.2 2007/10/06 01:43:26 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.11.2.3 2007/10/06 02:13:50 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1726,20 +1728,30 @@
zval_dtor(*retval);
ZVAL_LONG(*retval, val);
} break;
-#ifdef LDAP_OPT_NETWORK_TIMEOUT
+#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT)
case LDAP_OPT_NETWORK_TIMEOUT:
{
+# ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval *timeout;
-
- if (ldap_get_option(ld-link, opt, (void *) timeout)) {
+
+ if (ldap_get_option(ld-link, LDAP_OPT_NETWORK_TIMEOUT,
(void *) timeout)) {
if (timeout) {
ldap_memfree(timeout);
}
RETURN_FALSE;
- }
+ }
zval_dtor(*retval);
ZVAL_LONG(*retval, timeout-tv_sec);
ldap_memfree(timeout);
+# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
+ int timeout;
+
+ if (ldap_get_option(ld-link,
LDAP_X_OPT_CONNECT_TIMEOUT, timeout)) {
+ RETURN_FALSE;
+ }
+ zval_dtor(*retval);
+ ZVAL_LONG(*retval, (timeout / 1000));
+# endif
} break;
#endif
/* options with string value */
@@ -1824,17 +1836,27 @@
RETURN_FALSE;
}
} break;
-#ifdef LDAP_OPT_NETWORK_TIMEOUT
+#if defined(LDAP_OPT_NETWORK_TIMEOUT) || defined(LDAP_X_OPT_CONNECT_TIMEOUT)
case LDAP_OPT_NETWORK_TIMEOUT:
{
+# ifdef LDAP_OPT_NETWORK_TIMEOUT
struct timeval timeout;
-
+
convert_to_long_ex(newval);
timeout.tv_sec = Z_LVAL_PP(newval);
timeout.tv_usec = 0;
- if (ldap_set_option(ldap, opt, (void *) timeout)) {
+ if (ldap_set_option(ldap, LDAP_OPT_NETWORK_TIMEOUT,
(void *) timeout)) {
RETURN_FALSE;
}
+# elif defined(LDAP_X_OPT_CONNECT_TIMEOUT)
+ int timeout;
+
+ convert_to_long_ex(newval);
+ timeou = 1000 * Z_LVAL_PP(newval); /* Convert to
milliseconds */
+ if (ldap_set_option(ldap, LDAP_X_OPT_CONNECT_TIMEOUT,
timeout)) {
+ RETURN_FALSE;
+ }
+# endif
} break;
#endif
/* options with string value */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
