[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Oct 4 20:32:03 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1407 php-src/ChangeLog:1.1408 --- php-src/ChangeLog:1.1407Fri Oct 3 20:32:36 2003 +++ php-src/ChangeLog Sat Oct 4 20:32:02 2003 @@ -1,3 +1,75 @@ +2003-10-04 Moriyoshi Koizumi [EMAIL PROTECTED] + +* NEWS: + NFN + +* ext/standard/file.c: + Change fgetcsv() so that the second parameter is also optional. + +2003-10-04 Tomas V.V.Cox [EMAIL PROTECTED] + +* pear/PEAR/Installer.php: + Better fix #61 + +* pear/PEAR/Installer.php: + Fix: #61 [NEW]: error with pear install in pear 1.3b1 + by outputting a full error message plus some help + +* pear/package-PEAR.xml: + notes++ + Bug #25413 Add local installed packages to list-all +(thanks to Christian DickMann) + +* pear/PEAR/Command/Remote.php: + Bug #25413 Add local installed packages to list-all + (thanks to Christian DickMann) + +2003-10-04 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/standard/config.m4: + Fix autoconf(2.13) build + +2003-10-04 Sergey Kartashoff [EMAIL PROTECTED] + +* (PHP_4_3) + ext/mnogosearch/README: + - README in mnogosearch extension is updated + +* ext/mnogosearch/README: + - Updated README for mnogosearch extension + +2003-10-04 Greg Beaver [EMAIL PROTECTED] + +* pear/PEAR/Installer.php: + fix warning in rare case (file doesn't exist in package.xml) + +2003-10-04 Moriyoshi Koizumi [EMAIL PROTECTED] + +* NEWS: + New feature news. + +* ext/standard/basic_functions.h + ext/standard/config.m4 + ext/standard/file.c + main/config.w32.h: + Fix fgetcsv() to correctly support international characters + +2003-10-04 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + ext/ncurses/config.m4 + ext/ncurses/php_ncurses.h: + MFH: - Fixed bug #25752 (ext/ncurses: ncurses.h instead of curses.h with + BSD). + +* ext/ncurses/config.m4 + ext/ncurses/php_ncurses.h: + - Fixed bug #25752 (ext/ncurses: ncurses.h instead of curses.h with BSD). + +* ext/ncurses/config.m4: + ws + 2003-10-03 Moriyoshi Koizumi [EMAIL PROTECTED] * NEWS
[PHP-CVS] cvs: php-src /ext/mnogosearch README
gluke Sat Oct 4 04:27:35 2003 EDT Modified files: /php-src/ext/mnogosearchREADME Log: - Updated README for mnogosearch extension Index: php-src/ext/mnogosearch/README diff -u php-src/ext/mnogosearch/README:1.9 php-src/ext/mnogosearch/README:1.10 --- php-src/ext/mnogosearch/README:1.9 Sat Jun 29 06:42:52 2002 +++ php-src/ext/mnogosearch/README Sat Oct 4 04:27:34 2003 @@ -1,5 +1,5 @@ $Source: /usr/repository/php-src/ext/mnogosearch/README,v $ -$Id: README,v 1.9 2002/06/29 10:42:52 gluke Exp $ +$Id: README,v 1.10 2003/10/04 08:27:34 gluke Exp $ mnoGoSearch extension module for PHP4. @@ -9,3 +9,16 @@ in the php distribution. You should use native mysql library. To do this you should compile php with specefying mysql-dir (for example --with-mysql=/usr, not --with-mysql). + +To compile PHP with CVS versions of mnogosearch (not with official releases) +you must open configure script of mnogosearch in your editor. Find +line like the following: + +VERSION=x.x.x-`date +%d%m%Y` + +where x.x.x is the mnogosearch version number like 3.2.16 or so. +Then just remove -`date +%d%m%Y`. After that this line should be +VERSION=x.x.x + +After complete you should reconfigure, recompile, reinstall mnogosearch and +php. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mnogosearch README
gluke Sat Oct 4 05:43:46 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mnogosearchREADME Log: - README in mnogosearch extension is updated Index: php-src/ext/mnogosearch/README diff -u php-src/ext/mnogosearch/README:1.9 php-src/ext/mnogosearch/README:1.9.4.1 --- php-src/ext/mnogosearch/README:1.9 Sat Jun 29 06:42:52 2002 +++ php-src/ext/mnogosearch/README Sat Oct 4 05:43:45 2003 @@ -1,5 +1,5 @@ $Source: /usr/repository/php-src/ext/mnogosearch/README,v $ -$Id: README,v 1.9 2002/06/29 10:42:52 gluke Exp $ +$Id: README,v 1.9.4.1 2003/10/04 09:43:45 gluke Exp $ mnoGoSearch extension module for PHP4. @@ -9,3 +9,16 @@ in the php distribution. You should use native mysql library. To do this you should compile php with specefying mysql-dir (for example --with-mysql=/usr, not --with-mysql). + +To compile PHP with CVS versions of mnogosearch (not with official releases) +you must open configure script of mnogosearch in your editor. Find +line like the following: + +VERSION=x.x.x-`date +%d%m%Y` + +where x.x.x is the mnogosearch version number like 3.2.16 or so. +Then just remove -`date +%d%m%Y`. After that this line should be +VERSION=x.x.x + +After complete you should reconfigure, recompile, reinstall mnogosearch and +php. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard config.m4
moriyoshi Sat Oct 4 08:23:12 2003 EDT
Modified files:
/php-src/ext/standard config.m4
Log:
Fix autoconf(2.13) build
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.65 php-src/ext/standard/config.m4:1.66
--- php-src/ext/standard/config.m4:1.65 Fri Oct 3 22:51:19 2003
+++ php-src/ext/standard/config.m4 Sat Oct 4 08:23:11 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.65 2003/10/04 02:51:19 moriyoshi Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.66 2003/10/04 12:23:11 moriyoshi Exp $ -*- sh -*-
divert(3)dnl
@@ -297,18 +297,36 @@
PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
dnl already done PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
-AC_CHECK_HEADERS([wchar.h])
-AC_CHECK_FUNCS([mblen])
-AC_CHECK_FUNCS([mbrlen mbsinit],,,[
+dnl
+dnl Check for i18n capabilities
+dnl
+AC_DEFUN([PHP_CHECK_I18N_FUNCS],[
+ AC_CHECK_HEADERS([wchar.h])
+ AC_CHECK_FUNCS([mblen])
+ AC_CHECK_FUNCS([mbrlen mbsinit],,,[
#ifdef HAVE_WCHAR_H
# include wchar.h
#endif
-])
-AC_CHECK_TYPES([mbstate_t],,,[
+ ])
+ AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],[
+AC_TRY_COMPILE([
#ifdef HAVE_WCHAR_H
# include wchar.h
#endif
+],[
+int __tmp__() { mbstate_t a; }
+],[
+ ac_cv_type_mbstate_t=yes
+],[
+ ac_cv_type_mbstate_t=no
+])
+ ])
+ if test $ac_cv_type_mbstate_t = yes; then
+AC_DEFINE([HAVE_MBSTATE_T], 1, [Define if your system has mbstate_t in wchar.h])
+ fi
])
+
+PHP_CHECK_I18N_FUNCS
PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c
crypt.c \
cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c
filestat.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
moriyoshi Sat Oct 4 17:06:31 2003 EDT
Modified files:
/php-src/ext/standard file.c
Log:
Change fgetcsv() so that the second parameter is also optional.
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.360 php-src/ext/standard/file.c:1.361
--- php-src/ext/standard/file.c:1.360 Fri Oct 3 22:51:19 2003
+++ php-src/ext/standard/file.c Sat Oct 4 17:06:29 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.360 2003/10/04 02:51:19 moriyoshi Exp $ */
+/* $Id: file.c,v 1.361 2003/10/04 21:06:29 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1750,7 +1750,7 @@
return ptr - cnt;
}
-/* {{{ proto array fgetcsv(resource fp, int length [, string delimiter [, string
enclosure]])
+/* {{{ proto array fgetcsv(resource fp [,int length [, string delimiter [, string
enclosure]]])
Get line from file pointer and parse for CSV fields */
PHP_FUNCTION(fgetcsv)
{
@@ -1760,75 +1760,69 @@
const char escape_char = '\\';
/* first section exactly as php_fgetss */
- zval **fd, **bytes, **p_delim, **p_enclosure;
- long len;
+ long len = 0;
size_t buf_len, temp_len, line_end_len;
char *buf;
php_stream *stream;
- switch(ZEND_NUM_ARGS()) {
- case 2:
- if (zend_get_parameters_ex(2, fd, bytes) == FAILURE) {
- WRONG_PARAM_COUNT;
+ {
+ zval *fd, **len_zv = NULL;
+ char *delimiter_str = NULL;
+ int delimiter_str_len = 0;
+ char *enclosure_str = NULL;
+ int enclosure_str_len = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|Zss,
+ fd, len_zv, delimiter_str,
delimiter_str_len,
+ enclosure_str, enclosure_str_len) ==
FAILURE) {
+ return;
+ }
+
+ if (delimiter_str != NULL) {
+ /* Make sure that there is at least one character in string */
+ if (delimiter_str_len 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, delimiter
must be a character);
+ RETURN_FALSE;
}
- break;
- case 3:
- if (zend_get_parameters_ex(3, fd, bytes, p_delim) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ /* use first character from string */
+ delimiter = delimiter_str[0];
+ }
+
+ if (enclosure_str != NULL) {
+ if (enclosure_str_len 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, enclosure
must be a character);
+ RETURN_FALSE;
}
- break;
+ /* use first character from string */
+ enclosure = enclosure_str[0];
+ }
- case 4:
- if (zend_get_parameters_ex(4, fd, bytes, p_delim,
p_enclosure) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (len_zv != NULL Z_TYPE_PP(len_zv) != IS_NULL) {
+ convert_to_long_ex(len_zv);
+ len = Z_LVAL_PP(len_zv);
+ if (len 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Length
parameter may not be negative);
+ RETURN_FALSE;
}
- break;
+ } else {
+ len = -1;
+ }
- default:
- WRONG_PARAM_COUNT;
- /* NOTREACHED */
- break;
+ php_stream_from_zval(stream, fd);
}
- if (ZEND_NUM_ARGS() = 3) {
- convert_to_string_ex(p_delim);
- /* Make sure that there is at least one character in string */
- if (Z_STRLEN_PP(p_delim) 1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, delimiter must be
a character);
+ if (len 0) {
+ if ((buf = php_stream_get_line(stream, NULL, 0, buf_len)) == NULL) {
RETURN_FALSE;
}
- /* use first character from string */
- delimiter = Z_STRVAL_PP(p_delim)[0];
- }
-
- if (ZEND_NUM_ARGS() = 4) {
- convert_to_string_ex(p_enclosure);
- /* Make sure that there is at least one character in string */
- if (Z_STRLEN_PP(p_enclosure) 1) {
- php_error_docref(NULL TSRMLS_CC,
[PHP-CVS] cvs: php-src / NEWS
moriyoshi Sat Oct 4 17:09:42 2003 EDT Modified files: /php-srcNEWS Log: NFN Index: php-src/NEWS diff -u php-src/NEWS:1.1470 php-src/NEWS:1.1471 --- php-src/NEWS:1.1470 Fri Oct 3 23:18:48 2003 +++ php-src/NEWSSat Oct 4 17:09:38 2003 @@ -28,6 +28,8 @@ . snmp_read_mib(). (Jani) . http_build_query(). (Sara) . ftp_alloc(). (Sara) +- Changed fgetcsv() in order for the second parameter to be optional. + (Moriyoshi) - Added resume_pos context option to ftp://; wrapper. (Sara) - Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB (Patch by Novicky Marek [EMAIL PROTECTED]). (Thies) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
