[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 007.phpt
helly Wed Oct 29 07:06:53 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests007.phpt
Log:
Add simplexml array handlers that allow to explicitly work with attributes.
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.75 php-src/ext/simplexml/simplexml.c:1.76
--- php-src/ext/simplexml/simplexml.c:1.75 Sun Oct 26 20:12:53 2003
+++ php-src/ext/simplexml/simplexml.c Wed Oct 29 07:06:51 2003
@@ -13,10 +13,11 @@
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Author: Sterling Hughes [EMAIL PROTECTED] |
+ | Marcus Boerger [EMAIL PROTECTED] |
+--+
*/
-/* $Id: simplexml.c,v 1.75 2003/10/27 01:12:53 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.76 2003/10/29 12:06:51 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -115,10 +116,10 @@
}
/* }}} */
-/* {{{ sxe_property_read()
+/* {{{ sxe_prop_dim_read()
*/
static zval *
-sxe_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+sxe_prop_dim_read(zval *object, zval *member, zend_bool elements, zend_bool attribs,
zend_bool silent TSRMLS_DC)
{
zval *return_value;
zval *value = NULL;
@@ -139,54 +140,58 @@
GET_NODE(sxe, node);
if (node) {
- attr = node-properties;
- while (attr) {
- if (!xmlStrcmp(attr-name, name)) {
- APPEND_PREV_ELEMENT(counter, value);
-
- MAKE_STD_ZVAL(value);
- contents = xmlNodeListGetString((xmlDocPtr)
sxe-document-ptr, attr-children, 1);
- ZVAL_STRING(value, contents, 1);
- if (contents) {
- xmlFree(contents);
+ if (attribs) {
+ attr = node-properties;
+ while (attr) {
+ if (!xmlStrcmp(attr-name, name)) {
+ APPEND_PREV_ELEMENT(counter, value);
+
+ MAKE_STD_ZVAL(value);
+ contents = xmlNodeListGetString((xmlDocPtr)
sxe-document-ptr, attr-children, 1);
+ ZVAL_STRING(value, contents, 1);
+ if (contents) {
+ xmlFree(contents);
+ }
+ APPEND_CUR_ELEMENT(counter, value);
}
- APPEND_CUR_ELEMENT(counter, value);
+ attr = attr-next;
}
- attr = attr-next;
}
- if (!sxe-node) {
- php_libxml_increment_node_ptr((php_libxml_node_object *)sxe,
node, NULL TSRMLS_CC);
- }
- node = node-children;
-
- while (node) {
- SKIP_TEXT(node);
-
- do if (node-ns) {
- if (node-parent-ns) {
- if (!xmlStrcmp(node-ns-href,
node-parent-ns-href)) {
- break;
- }
- }
+ if (elements) {
+ if (!sxe-node) {
+ php_libxml_increment_node_ptr((php_libxml_node_object
*)sxe, node, NULL TSRMLS_CC);
+ }
+ node = node-children;
+
+ while (node) {
+ SKIP_TEXT(node);
- if (match_ns(sxe, node, name)) {
+ do if (node-ns) {
+ if (node-parent-ns) {
+ if (!xmlStrcmp(node-ns-href,
node-parent-ns-href)) {
+ break;
+ }
+ }
+
+ if (match_ns(sxe, node, name)) {
+ MAKE_STD_ZVAL(value);
+ _node_as_zval(sxe, node-parent, value
TSRMLS_CC);
+ APPEND_CUR_ELEMENT(counter, value);
+
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS configure.in /main php_version.h
iliaa Wed Oct 29 08:18:15 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in /php-src/main php_version.h Log: Go with RC3 release. Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.446 php-src/NEWS:1.1247.2.447 --- php-src/NEWS:1.1247.2.446 Fri Oct 24 18:44:41 2003 +++ php-src/NEWSWed Oct 29 08:18:10 2003 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? Oct 2003, Version 4.3.4RC3 +29 Oct 2003, Version 4.3.4RC3 - Fixed bug #25955 (Compile failure on MacOSX 10.3 Panther). (Marko, Dan) - Fixed bug #25922 (Crash in error handler when 5th argument is modified). (Ilia) Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.83 php-src/configure.in:1.396.2.84 --- php-src/configure.in:1.396.2.83 Fri Oct 24 13:51:03 2003 +++ php-src/configure.inWed Oct 29 08:18:10 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.83 2003/10/24 17:51:03 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.84 2003/10/29 13:18:10 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=4 -EXTRA_VERSION=RC3-dev +EXTRA_VERSION=RC3 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.34 php-src/main/php_version.h:1.66.2.35 --- php-src/main/php_version.h:1.66.2.34Mon Oct 20 12:58:56 2003 +++ php-src/main/php_version.h Wed Oct 29 08:18:12 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION RC3-dev -#define PHP_VERSION 4.3.4RC3-dev +#define PHP_EXTRA_VERSION RC3 +#define PHP_VERSION 4.3.4RC3 -- 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) / configure.in /main php_version.h
iliaa Wed Oct 29 09:03:30 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcconfigure.in /php-src/main php_version.h Log: Back to dev. Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.84 php-src/configure.in:1.396.2.85 --- php-src/configure.in:1.396.2.84 Wed Oct 29 08:18:10 2003 +++ php-src/configure.inWed Oct 29 09:03:28 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.84 2003/10/29 13:18:10 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.85 2003/10/29 14:03:28 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=4 -EXTRA_VERSION=RC3 +EXTRA_VERSION=RC4-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.35 php-src/main/php_version.h:1.66.2.36 --- php-src/main/php_version.h:1.66.2.35Wed Oct 29 08:18:12 2003 +++ php-src/main/php_version.h Wed Oct 29 09:03:29 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION RC3 -#define PHP_VERSION 4.3.4RC3 +#define PHP_EXTRA_VERSION RC4-dev +#define PHP_VERSION 4.3.4RC4-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Wed Oct 29 10:29:16 2003 EDT Modified files: /CVSROOTavail Log: smarty karma for boots Index: CVSROOT/avail diff -u CVSROOT/avail:1.771 CVSROOT/avail:1.772 --- CVSROOT/avail:1.771 Thu Oct 23 05:52:36 2003 +++ CVSROOT/avail Wed Oct 29 10:29:15 2003 @@ -83,7 +83,7 @@ # The Smarty Group has access to the Smarty code -avail|mohrt,cellog,messju,andreas|smarty +avail|mohrt,cellog,messju,andreas,boots|smarty # The Smarty Web Group has access to the Smarty website. -- 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/mbstring mbstring.c
fmk Wed Oct 29 12:37:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Adding missing TSRMLS_CC to fix zts build
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.32
php-src/ext/mbstring/mbstring.c:1.142.2.33
--- php-src/ext/mbstring/mbstring.c:1.142.2.32 Sun Oct 26 02:47:42 2003
+++ php-src/ext/mbstring/mbstring.c Wed Oct 29 12:37:10 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.32 2003/10/26 07:47:42 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.33 2003/10/29 17:37:10 fmk Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1357,7 +1357,7 @@
size = 0;
switch (Z_TYPE_PP(arg1)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg1, list, size, 0)) {
+ if (!php_mb_parse_encoding_array(*arg1, list, size, 0
TSRMLS_CC)) {
if (list) {
efree(list);
}
@@ -2832,7 +2832,7 @@
if (ZEND_NUM_ARGS() = 2 Z_STRVAL_PP(arg_list)) {
switch (Z_TYPE_PP(arg_list)) {
case IS_ARRAY:
- if (!php_mb_parse_encoding_array(*arg_list, list, size, 0)) {
+ if (!php_mb_parse_encoding_array(*arg_list, list, size, 0
TSRMLS_CC)) {
if (list) {
efree(list);
size = 0;
@@ -3135,7 +3135,7 @@
elistsz = 0;
switch (Z_TYPE_PP(args[1])) {
case IS_ARRAY:
- php_mb_parse_encoding_array(*args[1], elist, elistsz, 0);
+ php_mb_parse_encoding_array(*args[1], elist, elistsz, 0 TSRMLS_CC);
break;
default:
convert_to_string_ex(args[1]);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests 007.phpt
moriyoshi Wed Oct 29 12:58:41 2003 EDT Modified files: /php-src/ext/simplexml/tests007.phpt Log: Update test for an additional check to ensure the variable used for an index would not be modified during deference. Index: php-src/ext/simplexml/tests/007.phpt diff -u php-src/ext/simplexml/tests/007.phpt:1.2 php-src/ext/simplexml/tests/007.phpt:1.3 --- php-src/ext/simplexml/tests/007.phpt:1.2Wed Oct 29 07:06:52 2003 +++ php-src/ext/simplexml/tests/007.phptWed Oct 29 12:58:40 2003 @@ -23,7 +23,11 @@ var_dump($sxe['id']); unset($sxe-elem1['attr1']); var_dump($sxe-elem1['attr1']); - +echo ===Misc.===\n; +$a = 4; +var_dump($a); +$dummy = $sxe-elem1[$a]; +var_dump($a); ? ===Done=== --EXPECT-- @@ -39,4 +43,7 @@ ===Unset=== NULL NULL +===Misc.=== +int(4) +int(4) ===Done=== -- 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/standard dir.c
moriyoshi Wed Oct 29 13:46:40 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard dir.c
Log:
A possible fix for bug #26026.
# Actually a revisit of the patch on 1.112, mysteriously backed out on 1.119.
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.11 php-src/ext/standard/dir.c:1.109.2.12
--- php-src/ext/standard/dir.c:1.109.2.11 Fri Sep 19 22:52:45 2003
+++ php-src/ext/standard/dir.c Wed Oct 29 13:46:40 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.109.2.11 2003/09/20 02:52:45 iliaa Exp $ */
+/* $Id: dir.c,v 1.109.2.12 2003/10/29 18:46:40 moriyoshi Exp $ */
/* {{{ includes/startup/misc */
@@ -398,7 +398,7 @@
#ifndef GLOB_NOMATCH
/* now catch the FreeBSD style of no matches */
- if (!globbuf.gl_pathc) {
+ if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
moriyoshi Wed Oct 29 13:48:38 2003 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
MFB(r-1.109.2.12): A possible fix for bug #26026
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.129 php-src/ext/standard/dir.c:1.130
--- php-src/ext/standard/dir.c:1.129Fri Sep 26 04:09:55 2003
+++ php-src/ext/standard/dir.c Wed Oct 29 13:48:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.129 2003/09/26 08:09:55 hholzgra Exp $ */
+/* $Id: dir.c,v 1.130 2003/10/29 18:48:37 moriyoshi Exp $ */
/* {{{ includes/startup/misc */
@@ -401,7 +401,7 @@
#ifndef GLOB_NOMATCH
/* now catch the FreeBSD style of no matches */
- if (!globbuf.gl_pathc) {
+ if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return;
}
--
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 bug26003.phpt test3.csv
moriyoshi Wed Oct 29 14:45:39 2003 EDT
Added files:
/php-src/ext/standard/tests/filebug26003.phpt test3.csv
Log:
Add test case for bug #26003
Index: php-src/ext/standard/tests/file/bug26003.phpt
+++ php-src/ext/standard/tests/file/bug26003.phpt
--TEST--
Bug #26003 (fgetcsv() is not binary-safe)
--FILE--
?php
$fp = fopen(dirname(__FILE__).'/test3.csv', 'r');
var_dump(fgetcsv($fp, 4096));
?
--EXPECT--
array(2) {
[0]=
string(3) abc
[1]=
string(3) de
}
Index: php-src/ext/standard/tests/file/test3.csv
+++ php-src/ext/standard/tests/file/test3.csv
abc,de
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Wed Oct 29 15:07:49 2003 EDT Modified files: /CVSROOTavail Log: pecl/valkyrie karma for xnoguer Index: CVSROOT/avail diff -u CVSROOT/avail:1.772 CVSROOT/avail:1.773 --- CVSROOT/avail:1.772 Wed Oct 29 10:29:15 2003 +++ CVSROOT/avail Wed Oct 29 15:07:38 2003 @@ -188,6 +188,7 @@ avail|djg|pear/File_Ogg avail|mg|pecl/lzf avail|mg|pecl/tcpwrap +avail|xnoguer|pecl/valkyrie # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli config.m4 mysqli_api.c mysqli_nonapi.c php_mysqli.h
georg Wed Oct 29 15:48:48 2003 EDT
Modified files:
/php-src/ext/mysqli config.m4 mysqli_api.c mysqli_nonapi.c
php_mysqli.h
Log:
added support for embedded MySQL Server
some prototype fixes
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.7 php-src/ext/mysqli/config.m4:1.8
--- php-src/ext/mysqli/config.m4:1.7Mon May 19 19:43:41 2003
+++ php-src/ext/mysqli/config.m4Wed Oct 29 15:48:47 2003
@@ -1,12 +1,16 @@
dnl
-dnl $Id: config.m4,v 1.7 2003/05/19 23:43:41 sniper Exp $
+dnl $Id: config.m4,v 1.8 2003/10/29 20:48:47 georg Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
[ --with-mysqli[=FILE]Include MySQLi support. FILE is the optional
pathname to mysql_config.])
-if test $PHP_MYSQLI != no; then
+PHP_ARG_WITH(embedded_mysqli, for embedded MySQLi support,
+[ --with-embedded-mysqli[=FILE]Include embedded MySQLi support. FILE is the
optional
+ pathname to mysql_config.])
+
+if test $PHP_MYSQLI != no '-o' $PHP_EMBEDDED_MYSQLI != no; then
if test $PHP_MYSQL = yes; then
AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together with
--with-mysqli.])
@@ -15,12 +19,23 @@
if test $PHP_MYSQLI = yes; then
MYSQL_CONFIG=`$php_shtool path mysql_config`
else
-MYSQL_CONFIG=$PHP_MYSQLI
+ if test $PHP_MYSQLI != no; then
+ MYSQL_CONFIG=$PHP_MYSQLI
+else
+ MYSQL_CONFIG=$PHP_EMBEDDED_MYSQLI
+fi
+ fi
+
+ if test $PHP_MYSQLI != no; then
+MYSQL_LIB_CFG='--libs'
+ else
+ AC_DEFINE([HAVE_EMBEDDED_MYSQLI],[1], [embedded MySQL support enabled])
+MYSQL_LIB_CFG='--libmysqld-libs'
fi
- if test -x $MYSQL_CONFIG $MYSQL_CONFIG --libs /dev/null 21; then
+ if test -x $MYSQL_CONFIG $MYSQL_CONFIG $MYSQL_LIB_CFG /dev/null 21; then
MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | sed -e s/'//g`
-MYSQLI_LIBLINE=`$MYSQL_CONFIG --libs | sed -e s/'//g`
+MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | sed -e s/'//g`
else
AC_MSG_RESULT([mysql_config not found])
AC_MSG_ERROR([Please reinstall the mysql distribution])
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.46 php-src/ext/mysqli/mysqli_api.c:1.47
--- php-src/ext/mysqli/mysqli_api.c:1.46Thu Sep 25 07:19:25 2003
+++ php-src/ext/mysqli/mysqli_api.c Wed Oct 29 15:48:47 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.46 2003/09/25 11:19:25 georg Exp $
+ $Id: mysqli_api.c,v 1.47 2003/10/29 20:48:47 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1614,6 +1614,41 @@
}
/* }}} */
+#ifdef HAVE_EMBEDDED_MYSQLI
+/* {{{ proto bool mysqli_server_init(void)
+ initialize embedded server */
+PHP_FUNCTION(mysqli_server_init)
+{
+ zval*server;
+ zval*groups;
+
+ if (MyG(embedded)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Embedded server already
initialized.);
+ RETURN_FALSE;
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |aa, server, groups)
== FAILURE) {
+ return;
+ }
+
+ if (mysql_server_init(0, NULL, NULL)) {
+ RETURN_FALSE;
+ }
+ MyG(embedded) = 1;
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void mysqli_server_end(void)
+*/
+PHP_FUNCTION(mysqli_server_end)
+{
+ mysql_server_end();
+}
+/* }}} */
+#endif
+
+
/* {{{ proto bool mysqli_slave_query(object link, string query)
Enforce execution of a query on a slave in a master/slave setup */
PHP_FUNCTION(mysqli_slave_query)
@@ -1832,7 +1867,7 @@
}
/* }}} */
-/* {{{ proto resource mysqli_stmt_store_result(stmt)
+/* {{{ proto object mysqli_stmt_store_result(stmt)
*/
PHP_FUNCTION(mysqli_stmt_store_result)
{
@@ -1871,7 +1906,7 @@
#endif
/* }}} */
-/* {{{ proto resource mysqli_store_result(object link)
+/* {{{ proto object mysqli_store_result(object link)
Buffer result set on client */
PHP_FUNCTION(mysqli_store_result)
{
@@ -1921,7 +1956,7 @@
/* }}} */
-/* {{{ proto resource mysqli_use_result(object link)
+/* {{{ proto object mysqli_use_result(object link)
Directly retrieve query results - do not buffer results on client side */
PHP_FUNCTION(mysqli_use_result)
{
@@ -1945,7 +1980,7 @@
}
/* }}} */
-/* {{{ proto resource mysqli_warning_count (object link)
+/* {{{ proto int mysqli_warning_count (object link)
Return number of warnings from the last query for the given link */
PHP_FUNCTION(mysqli_warning_count)
{
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.17 php-src/ext/mysqli/mysqli_nonapi.c:1.18
--- php-src/ext/mysqli/mysqli_nonapi.c:1.17 Tue Sep 16 15:45:22 2003
+++ php-src/ext/mysqli/mysqli_nonapi.c Wed Oct
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c
georg Wed Oct 29 15:52:25 2003 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: added functions for embedded server Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.19 php-src/ext/mysqli/mysqli_fe.c:1.20 --- php-src/ext/mysqli/mysqli_fe.c:1.19 Thu Sep 25 07:19:25 2003 +++ php-src/ext/mysqli/mysqli_fe.c Wed Oct 29 15:52:25 2003 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.19 2003/09/25 11:19:25 georg Exp $ + $Id: mysqli_fe.c,v 1.20 2003/10/29 20:52:25 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -64,6 +64,9 @@ PHP_FE(mysqli_disable_reads_from_master,NULL) PHP_FE(mysqli_disable_rpl_parse,NULL) PHP_FE(mysqli_dump_debug_info, NULL) +#ifdef HAVE_EMBEDDED_MYSQLI + PHP_FE(mysqli_embedded_connect, NULL) +#endif PHP_FE(mysqli_enable_reads_from_master, NULL) PHP_FE(mysqli_enable_rpl_parse, NULL) PHP_FE(mysqli_errno, NULL) @@ -115,9 +118,12 @@ PHP_FE(mysqli_select_db, NULL) PHP_FE(mysqli_send_long_data, NULL) PHP_FE(mysqli_send_query, NULL) +#ifdef HAVE_EMBEDDED_MYSQLI + PHP_FE(mysqli_server_end, NULL) + PHP_FE(mysqli_server_init, NULL) +#endif PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL) PHP_FE(mysqli_slave_query, NULL) - #if MYSQL_VERSION_ID = 40101 PHP_FE(mysqli_sqlstate, NULL) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
kalowskyWed Oct 29 16:32:29 2003 EDT Modified files: /php-srcNEWS Log: Added in NEWS entries for the Panther updates Index: php-src/NEWS diff -u php-src/NEWS:1.1482 php-src/NEWS:1.1483 --- php-src/NEWS:1.1482 Tue Oct 28 14:04:38 2003 +++ php-src/NEWSWed Oct 29 16:32:28 2003 @@ -170,3 +170,5 @@ - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi) - Fixed bug #21600 (Assign by reference function call changes variable contents). (Zeev) +- Fixed bug #25955 (Mac OS X Panther compile error). (kalowsky, markonen) +- Added IPv6 support for Panther. (kalowsky, markonen) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
moriyoshi Wed Oct 29 16:50:16 2003 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
This check's always necessary.
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.130 php-src/ext/standard/dir.c:1.131
--- php-src/ext/standard/dir.c:1.130Wed Oct 29 13:48:37 2003
+++ php-src/ext/standard/dir.c Wed Oct 29 16:50:15 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.130 2003/10/29 18:48:37 moriyoshi Exp $ */
+/* $Id: dir.c,v 1.131 2003/10/29 21:50:15 moriyoshi Exp $ */
/* {{{ includes/startup/misc */
@@ -399,13 +399,11 @@
RETURN_FALSE;
}
-#ifndef GLOB_NOMATCH
/* now catch the FreeBSD style of no matches */
if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return;
}
-#endif
/* we assume that any glob pattern will match files from one directory only
so checking the dirname of the first match should be sufficient */
--
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/standard dir.c
moriyoshi Wed Oct 29 16:51:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard dir.c
Log:
MFH(r-1.131): This check's always necessary.
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.109.2.12 php-src/ext/standard/dir.c:1.109.2.13
--- php-src/ext/standard/dir.c:1.109.2.12 Wed Oct 29 13:46:40 2003
+++ php-src/ext/standard/dir.c Wed Oct 29 16:51:22 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.109.2.12 2003/10/29 18:46:40 moriyoshi Exp $ */
+/* $Id: dir.c,v 1.109.2.13 2003/10/29 21:51:22 moriyoshi Exp $ */
/* {{{ includes/startup/misc */
@@ -396,13 +396,11 @@
RETURN_FALSE;
}
-#ifndef GLOB_NOMATCH
/* now catch the FreeBSD style of no matches */
if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
array_init(return_value);
return;
}
-#endif
/* we assume that any glob pattern will match files from one directory only
so checking the dirname of the first match should be sufficient */
--
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) / NEWS
moriyoshi Wed Oct 29 16:56:17 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.447 php-src/NEWS:1.1247.2.448 --- php-src/NEWS:1.1247.2.447 Wed Oct 29 08:18:10 2003 +++ php-src/NEWSWed Oct 29 16:56:16 2003 @@ -1,5 +1,9 @@ PHP 4 NEWS ||| +?? Nov 2003, Version 4.3.4RC4 +- Fixed bug #26025 (Segfault on glob() without GLOB_NOCHECK or GLOB_NOMAGIC). + (Moriyoshi) + 29 Oct 2003, Version 4.3.4RC3 - Fixed bug #25955 (Compile failure on MacOSX 10.3 Panther). (Marko, Dan) - Fixed bug #25922 (Crash in error handler when 5th argument is modified). -- 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) / NEWS
moriyoshi Wed Oct 29 16:58:34 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: A bit pickier about platform. Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.448 php-src/NEWS:1.1247.2.449 --- php-src/NEWS:1.1247.2.448 Wed Oct 29 16:56:16 2003 +++ php-src/NEWSWed Oct 29 16:58:33 2003 @@ -1,8 +1,8 @@ PHP 4 NEWS ||| ?? Nov 2003, Version 4.3.4RC4 -- Fixed bug #26025 (Segfault on glob() without GLOB_NOCHECK or GLOB_NOMAGIC). - (Moriyoshi) +- Fixed bug #26025 (Segfault on glob() without GLOB_NOCHECK or GLOB_NOMAGIC + under *BSD platforms). (Moriyoshi) 29 Oct 2003, Version 4.3.4RC3 - Fixed bug #25955 (Compile failure on MacOSX 10.3 Panther). (Marko, Dan) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
moriyoshi Wed Oct 29 17:18:25 2003 EDT Modified files: /php-srcNEWS Log: Add BFN entry to HEAD, as this bug is not likely to be fixed in 4.3.x. Index: php-src/NEWS diff -u php-src/NEWS:1.1483 php-src/NEWS:1.1484 --- php-src/NEWS:1.1483 Wed Oct 29 16:32:28 2003 +++ php-src/NEWSWed Oct 29 17:18:24 2003 @@ -45,6 +45,7 @@ - Fixed support for ![CDATA[]] fields within XML documents in ext/xml. (Sterling) - Fixed visibility of __construct and __clone. (Marcus) +- Fixed bug #26003 (fgetcsv() not binary-safe on null bytes). (Moriyoshi) - Fixed bug #25756 (SimpleXML's validate_schema_file() broken). (Moriyoshi) - Fixed bug #25581 (getimagesize() returns incorrect values on bitmap (os2) files). (Marcus) -- 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 Wed Oct 29 17:25:58 2003 EDT
Modified files:
/php-src/ext/standard file.c
Log:
Some clean-ups
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.364 php-src/ext/standard/file.c:1.365
--- php-src/ext/standard/file.c:1.364 Mon Oct 27 17:45:58 2003
+++ php-src/ext/standard/file.c Wed Oct 29 17:25:57 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.364 2003/10/27 22:45:58 moriyoshi Exp $ */
+/* $Id: file.c,v 1.365 2003/10/29 22:25:57 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1978,7 +1978,6 @@
state = 1;
} else if (*bptr ==
enclosure) {
state = 2;
- } else {
}
bptr++;
break;
@@ -1998,7 +1997,6 @@
tptr += (bptr -
hunk_begin);
hunk_begin = bptr;
break;
- /* break is missing
intentionally */
default:
bptr += inc_len;
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c php_string.h string.c
iliaa Wed Oct 29 19:49:34 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard string.c php_string.h basic_functions.c
Log:
Added substr_compare().
Index: php-src/NEWS
diff -u php-src/NEWS:1.1484 php-src/NEWS:1.1485
--- php-src/NEWS:1.1484 Wed Oct 29 17:18:24 2003
+++ php-src/NEWSWed Oct 29 19:49:32 2003
@@ -34,6 +34,7 @@
. array_diff_uassoc(). (Andrey)
. convert_uuencode(). (Ilia)
. convert_uudecode(). (Ilia)
+ . substr_compare(). (Ilia)
. pcntl_wait(). (GeorgeS)
- Added resume_pos context option to ftp://; wrapper. (Sara)
- Added optional parameter to OCIWriteTemporaryLob() to specify the type of LOB
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.399 php-src/ext/standard/string.c:1.400
--- php-src/ext/standard/string.c:1.399 Sun Sep 28 22:23:40 2003
+++ php-src/ext/standard/string.c Wed Oct 29 19:49:33 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.399 2003/09/29 02:23:40 moriyoshi Exp $ */
+/* $Id: string.c,v 1.400 2003/10/30 00:49:33 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4658,6 +4658,35 @@
RETURN_STRINGL(p, (haystack + haystack_len - p), 1);
} else {
RETURN_FALSE;
+ }
+}
+/* }}} */
+
+/* {{{ proto int substr_compare(string main_str, string str, int offset [, int length
[, bool case_sensitivity]])
+ Binary safe optionally case insensitive comparison of 2 strings from an offset, up
to length characters */
+PHP_FUNCTION(substr_compare)
+{
+ char *s1, *s2;
+ int s1_len, s2_len;
+ long offset, len=0;
+ zend_bool cs=0;
+ uint cmp_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ssl|lb, s1, s1_len,
s2, s2_len, offset, len, cs) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (len offset = s1_len) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, The start position cannot
exceed initial string length.);
+ RETURN_FALSE;
+ }
+
+ cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset)));
+
+ if (!cs) {
+ RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2,
s2_len, cmp_len));
+ } else {
+ RETURN_LONG(zend_binary_strncasecmp(s1 + offset, (s1_len - offset),
s2, s2_len, cmp_len));
}
}
/* }}} */
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.79 php-src/ext/standard/php_string.h:1.80
--- php-src/ext/standard/php_string.h:1.79 Thu Jul 24 21:03:39 2003
+++ php-src/ext/standard/php_string.h Wed Oct 29 19:49:33 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.79 2003/07/25 01:03:39 pollita Exp $ */
+/* $Id: php_string.h,v 1.80 2003/10/30 00:49:33 iliaa Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -89,6 +89,7 @@
PHP_FUNCTION(str_word_count);
PHP_FUNCTION(str_split);
PHP_FUNCTION(strpbrk);
+PHP_FUNCTION(substr_compare);
#ifdef HAVE_STRCOLL
PHP_FUNCTION(strcoll);
#endif
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.636
php-src/ext/standard/basic_functions.c:1.637
--- php-src/ext/standard/basic_functions.c:1.636Mon Oct 27 23:02:11 2003
+++ php-src/ext/standard/basic_functions.c Wed Oct 29 19:49:33 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.636 2003/10/28 04:02:11 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.637 2003/10/30 00:49:33 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -374,6 +374,7 @@
PHP_FE(str_word_count,
NULL)
PHP_FE(str_split,
NULL)
PHP_FE(strpbrk,
NULL)
+ PHP_FE(substr_compare,
NULL)
#ifdef HAVE_STRCOLL
PHP_FE(strcoll,
NULL)
--
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/mbstring mbstring.c
thetaphiWed Oct 29 20:05:26 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
Log:
Fix ZTS build #2
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.33
php-src/ext/mbstring/mbstring.c:1.142.2.34
--- php-src/ext/mbstring/mbstring.c:1.142.2.33 Wed Oct 29 12:37:10 2003
+++ php-src/ext/mbstring/mbstring.c Wed Oct 29 20:05:25 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.33 2003/10/29 17:37:10 fmk Exp $ */
+/* $Id: mbstring.c,v 1.142.2.34 2003/10/30 01:05:25 thetaphi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -1887,7 +1887,7 @@
convd = mbfl_buffer_converter_new(from_encoding, to_encoding, 0);
if (convd != NULL) {
mbfl_buffer_converter_illegal_mode(convd,
MBSTRG(current_filter_illegal_mode));
- mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar) TSRMLS_CC);
+ mbfl_buffer_converter_illegal_substchar(convd,
MBSTRG(current_filter_illegal_substchar));
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to create
converter);
}
@@ -3841,7 +3841,7 @@
string.no_language = MBSTRG(current_language);
string.val = (char*)arg_string;
string.len = arg_length;
- encoding = mbfl_identify_encoding_no(string, elist, size TSRMLS_CC);
+ encoding = mbfl_identify_encoding_no(string, elist, size);
if (encoding != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify) = encoding;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Wed Oct 29 20:08:44 2003 EDT Modified files: /php-srcNEWS Log: Remove bogus entry Index: php-src/NEWS diff -u php-src/NEWS:1.1485 php-src/NEWS:1.1486 --- php-src/NEWS:1.1485 Wed Oct 29 19:49:32 2003 +++ php-src/NEWSWed Oct 29 20:08:43 2003 @@ -172,5 +172,4 @@ - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi) - Fixed bug #21600 (Assign by reference function call changes variable contents). (Zeev) -- Fixed bug #25955 (Mac OS X Panther compile error). (kalowsky, markonen) - Added IPv6 support for Panther. (kalowsky, markonen) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Wed Oct 29 20:12:41 2003 EDT Modified files: /php-srcNEWS Log: fixes are fixes.. Index: php-src/NEWS diff -u php-src/NEWS:1.1486 php-src/NEWS:1.1487 --- php-src/NEWS:1.1486 Wed Oct 29 20:08:43 2003 +++ php-src/NEWSWed Oct 29 20:12:40 2003 @@ -41,6 +41,7 @@ (Patch by Novicky Marek [EMAIL PROTECTED]). (Thies) - Added reflection API. (Andrei, George, Timm) - Changed length parameter in fgetcsv() to be optional. (Moriyoshi) +- Fixed IPv6 support in MacOSX Panther. (Dan, Marko) - Fixed fgetcsv() to correctly handle international (non-ascii) characters. (Moriyoshi) - Fixed support for ![CDATA[]] fields within XML documents in ext/xml. @@ -172,4 +173,3 @@ - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi) - Fixed bug #21600 (Assign by reference function call changes variable contents). (Zeev) -- Added IPv6 support for Panther. (kalowsky, markonen) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
