[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2005-03-13 Thread changelog
changelog   Sun Mar 13 20:42:09 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.654r2=1.655ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.654 ZendEngine2/ChangeLog:1.655
--- ZendEngine2/ChangeLog:1.654 Sat Mar 12 20:36:01 2005
+++ ZendEngine2/ChangeLog   Sun Mar 13 20:42:08 2005
@@ -1,3 +1,33 @@
+2005-03-13  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* zend_stream.c
+  zend_stream.c:
+  Do not convert ZEND_HANDLE_FP to ZEND_HANDLE_STREAM but allow using
+  reader/closer
+  on it
+
+2005-03-13  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_interfaces.c:
+  - More exact signatures (even though complete correct not possible atm)
+
+2005-03-13  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* zend_builtin_functions.c
+  zend_builtin_functions.c:
+  Fix get_extension_funcs() - extension names are now lowercased, so should
+  be function arguments.
+
+2005-03-13  Marcus Boerger  [EMAIL PROTECTED]
+
+* zend_execute_API.c:
+  - Actually this is a much better error decription
+
+* zend_execute_API.c
+  tests/bug32290.phpt
+  tests/bug32290.phpt:
+  - Bugfix #32290
+
 2005-03-12  Marcus Boerger  [EMAIL PROTECTED]
 
 * zend_vm_def.h
@@ -7337,7 +7367,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.654 2005/03/13 01:36:01 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.655 2005/03/14 01:42:08 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -9061,7 +9091,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.654 2005/03/13 01:36:01 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.655 2005/03/14 01:42:08 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]
 


[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

2005-03-13 Thread Marcus Boerger
helly   Sun Mar 13 08:26:11 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  - BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.284r2=1.1760.2.285ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.284 php-src/NEWS:1.1760.2.285
--- php-src/NEWS:1.1760.2.284   Sat Mar 12 05:14:10 2005
+++ php-src/NEWSSun Mar 13 08:26:10 2005
@@ -29,6 +29,8 @@
   is passed. (Tony)
 - Fixed posix_getsid()  posix_getpgid() to return sid  pgid instead 
   of true. (Tony)   
+- Fixed bug #32290 (call_user_func_array() calls wrong class method within 
+  child class). (Marcus)
 - Fixed bug #32238 (spl_array.c: void function cannot return value). (Johannes)
 - Fixed bug #32210 (proc_get_status() sets running always to true). (Ilia)
 - Fixed bug #32160 (file truncation in copy() when source  destination are

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2005-03-13 Thread Andrey Hristov
andrey  Sun Mar 13 09:17:18 2005 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  credits to Ilia
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1852r2=1.1853ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1852 php-src/NEWS:1.1853
--- php-src/NEWS:1.1852 Sat Mar 12 09:46:41 2005
+++ php-src/NEWSSun Mar 13 09:17:17 2005
@@ -11,7 +11,7 @@
 - Added additional fifth parameter count to preg_replace_callback() and
   preg_replace() to count the number of replacements made. FR #32275. (Andrey)
 - Added additional third string parameter charlist to str_word_count() which
-  contain characters to be considered as word part. FR #31560 (Andrey)
+  contain characters to be considered as word part. FR #31560 (Andrey, Ilia)
 - Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
 - Changed mysqli_exception and sqlite_exception to use RuntimeException as 
base 
   if SPL extension is present. (Georg, Marcus)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/spl spl_array.c

2005-03-13 Thread Marcus Boerger
helly   Sun Mar 13 11:35:01 2005 EDT

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  - Fix signature definition
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.64r2=1.65ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.64 php-src/ext/spl/spl_array.c:1.65
--- php-src/ext/spl/spl_array.c:1.64Thu Mar 10 19:41:42 2005
+++ php-src/ext/spl/spl_array.c Sun Mar 13 11:35:01 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.64 2005/03/11 00:41:42 helly Exp $ */
+/* $Id: spl_array.c,v 1.65 2005/03/13 16:35:01 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -57,12 +57,12 @@
 ZEND_END_ARG_INFO();
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_array_offsetGet, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetGet, 0, 0, 1)
ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_array_offsetSet, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetSet, 0, 0, 2)
ZEND_ARG_INFO(0, index)
ZEND_ARG_INFO(0, newval)
 ZEND_END_ARG_INFO();

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c

2005-03-13 Thread Ilia Alshanetsky
iliaa   Sun Mar 13 12:03:55 2005 EDT

  Modified files:  
/php-src/ext/standard   streamsfuncs.c 
  Log:
  Fixed compiler warning.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.53r2=1.54ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.53 
php-src/ext/standard/streamsfuncs.c:1.54
--- php-src/ext/standard/streamsfuncs.c:1.53Thu Mar 10 20:52:24 2005
+++ php-src/ext/standard/streamsfuncs.c Sun Mar 13 12:03:55 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.53 2005/03/11 01:52:24 helly Exp $ */
+/* $Id: streamsfuncs.c,v 1.54 2005/03/13 17:03:55 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -48,7 +48,6 @@
 {
long domain, type, protocol;
php_stream *s1, *s2;
-   zval *zs1, *sz2;
int pair[2];
 
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lll,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in /main php_version.h

2005-03-13 Thread Zeev Suraski
zeevSun Mar 13 14:57:06 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  Prepare to roll 5.0.4RC1
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.37r2=1.514.2.38ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.37 php-src/configure.in:1.514.2.38
--- php-src/configure.in:1.514.2.37 Fri Mar 11 05:57:08 2005
+++ php-src/configure.inSun Mar 13 14:57:04 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.37 2005/03/11 10:57:08 hyanantha Exp $ -*- 
sh -*-
+dnl ## $Id: configure.in,v 1.514.2.38 2005/03/13 19:57:04 zeev Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=4
-EXTRA_VERSION=-dev
+EXTRA_VERSION=RC1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.17r2=1.97.2.18ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.17 
php-src/main/php_version.h:1.97.2.18
--- php-src/main/php_version.h:1.97.2.17Wed Dec 15 02:02:05 2004
+++ php-src/main/php_version.h  Sun Mar 13 14:57:05 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.0.4-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 5.0.4RC1

-- 
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 configure.in /main php_version.h

2005-03-13 Thread Ilia Alshanetsky
iliaa   Sun Mar 13 15:18:44 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  4.3.11RC1
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.853r2=1.1247.2.854ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.853 php-src/NEWS:1.1247.2.854
--- php-src/NEWS:1.1247.2.853   Wed Mar  9 21:04:17 2005
+++ php-src/NEWSSun Mar 13 15:18:42 2005
@@ -1,6 +1,6 @@
 PHP 4  NEWS
 |||
-?? ??? , Version 4.3.11
+13 Mar 2005, Version 4.3.11RC1
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem()
   and gmp_fact() to prevent SIGFPE. (Tony)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.152r2=1.396.2.153ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.152 php-src/configure.in:1.396.2.153
--- php-src/configure.in:1.396.2.152Thu Feb 10 17:20:27 2005
+++ php-src/configure.inSun Mar 13 15:18:43 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.152 2005/02/10 22:20:27 sniper Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.396.2.153 2005/03/13 20:18:43 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=11
-EXTRA_VERSION=-dev
+EXTRA_VERSION=RC1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.75r2=1.66.2.76ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.75 
php-src/main/php_version.h:1.66.2.76
--- php-src/main/php_version.h:1.66.2.75Wed Dec 15 10:05:11 2004
+++ php-src/main/php_version.h  Sun Mar 13 15:18:44 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 11
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 4.3.11-dev
+#define PHP_EXTRA_VERSION RC1
+#define PHP_VERSION 4.3.11RC1

-- 
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

2005-03-13 Thread Ilia Alshanetsky
iliaa   Sun Mar 13 16:54:56 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  Back to dev.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.153r2=1.396.2.154ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.153 php-src/configure.in:1.396.2.154
--- php-src/configure.in:1.396.2.153Sun Mar 13 15:18:43 2005
+++ php-src/configure.inSun Mar 13 16:54:54 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.153 2005/03/13 20:18:43 iliaa Exp $ -*- sh 
-*-
+dnl ## $Id: configure.in,v 1.396.2.154 2005/03/13 21:54:54 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=11
-EXTRA_VERSION=RC1
+EXTRA_VERSION=RC1-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.76r2=1.66.2.77ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.76 
php-src/main/php_version.h:1.66.2.77
--- php-src/main/php_version.h:1.66.2.76Sun Mar 13 15:18:44 2005
+++ php-src/main/php_version.h  Sun Mar 13 16:54:56 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 11
-#define PHP_EXTRA_VERSION RC1
-#define PHP_VERSION 4.3.11RC1
+#define PHP_EXTRA_VERSION RC1-dev
+#define PHP_VERSION 4.3.11RC1-dev

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/pdo_sqlite Makefile.frag config.m4

2005-03-13 Thread Jani Taskinen
sniper  Sun Mar 13 20:09:52 2005 EDT

  Added files: 
/php-src/ext/pdo_sqlite Makefile.frag 

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  - Move stuff that belongs in Makefile into Makefile.frag
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.15r2=1.16ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.15 
php-src/ext/pdo_sqlite/config.m4:1.16
--- php-src/ext/pdo_sqlite/config.m4:1.15   Wed Mar  9 13:21:41 2005
+++ php-src/ext/pdo_sqlite/config.m4Sun Mar 13 20:09:49 2005
@@ -1,11 +1,11 @@
-dnl $Id: config.m4,v 1.15 2005/03/09 18:21:41 wez Exp $
+dnl $Id: config.m4,v 1.16 2005/03/14 01:09:49 sniper Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
 if test $PHP_PDO != no; then
 
 PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
-[  --with-pdo-sqlite Include PDO sqlite 3 support],yes)
+[  --with-pdo-sqlite[=DIR]   Include PDO sqlite 3 support.],yes)
 
 if test $PHP_PDO_SQLITE != no; then
 
@@ -83,21 +83,14 @@
 
   PHP_ADD_BUILD_DIR($ext_builddir/sqlite)
   PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src)
+  PHP_ADD_BUILD_DIR($ext_builddir/sqlite/tool)
+  PHP_ADD_MAKEFILE_FRAGMENT
+
   AC_CHECK_SIZEOF(char *,4)
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
   PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | awk -F. 
'{printf(%d%03d%03d, $1, $2, $3)}'`
   sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$ext_srcdir/sqlite/src/sqlite.h.in  $ext_srcdir/sqlite3.h
-  if ! test -f $ext_srcdir/sqlite/src/parse.h ; then
-$CC -o $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/tool/lemon.c
-$ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/src/parse.y
- cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c 
| awk -f $ext_srcdir/sqlite/mkopcodeh.awk  $ext_srcdir/sqlite/src/opcodes.h
-sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f 
$ext_srcdir/sqlite/mkopcodec.awk  $ext_srcdir/sqlite/src/opcodes.c
-$CC -o $ext_srcdir/sqlite/tool/mkkeywordhash 
$ext_srcdir/sqlite/tool/mkkeywordhash.c
-$ext_srcdir/sqlite/tool/mkkeywordhash  
$ext_srcdir/sqlite/src/keywordhash.h
-  else
-touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.y
-  fi
 
   if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then
 echo '#include php_config.h'  $ext_srcdir/sqlite/src/config.h

http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/Makefile.frag?r=1.1p=1
Index: php-src/ext/pdo_sqlite/Makefile.frag
+++ php-src/ext/pdo_sqlite/Makefile.frag

$(builddir)/sqlite/tool/lemon: $(srcdir)/sqlite/tool/lemon.c
$(CC) $(srcdir)/sqlite/tool/lemon.c -o $@
cp $(srcdir)/sqlite/tool/lempar.c $(builddir)/sqlite/tool/

$(builddir)/sqlite/tool/mkkeywordhash: $(srcdir)/sqlite/tool/mkkeywordhash.c
$(CC) $(srcdir)/sqlite/tool/mkkeywordhash.c -o $@

$(srcdir)/sqlite/src/parse.c: $(srcdir)/sqlite/src/parse.y 
$(builddir)/sqlite/tool/lemon
$(builddir)/sqlite/tool/lemon $(srcdir)/sqlite/src/parse.y

$(srcdir)/sqlite/src/parse.h: $(srcdir)/sqlite/src/parse.c

$(srcdir)/sqlite/src/opcodes.h: $(srcdir)/sqlite/src/parse.h
cat $(srcdir)/sqlite/src/parse.h $(srcdir)/sqlite/src/vdbe.c | $(AWK) 
-f $(srcdir)/sqlite/mkopcodeh.awk  $@

$(srcdir)/sqlite/src/opcodes.c: $(srcdir)/sqlite/src/opcodes.h
sort -n +2 $(srcdir)/sqlite/src/opcodes.h | $(AWK) -f 
$(srcdir)/sqlite/mkopcodec.awk  $@

$(srcdir)/sqlite/src/keywordhash.h: $(builddir)/sqlite/tool/mkkeywordhash
$(srcdir)/sqlite/tool/mkkeywordhash  $(srcdir)/sqlite/src/keywordhash.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/xml/tests bug32001.phpt

2005-03-13 Thread Moriyoshi Koizumi
moriyoshi   Sun Mar 13 20:11:54 2005 EDT

  Modified files:  
/php-src/ext/xml/tests  bug32001.phpt 
  Log:
  - Turn off incorrect case folding to let test over.
  
  
http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug32001.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/xml/tests/bug32001.phpt
diff -u php-src/ext/xml/tests/bug32001.phpt:1.1 
php-src/ext/xml/tests/bug32001.phpt:1.2
--- php-src/ext/xml/tests/bug32001.phpt:1.1 Wed Mar  2 14:27:37 2005
+++ php-src/ext/xml/tests/bug32001.phpt Sun Mar 13 20:11:54 2005
@@ -91,6 +91,7 @@
}
 
$parser = xml_parser_create(NULL);
+   xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
xml_set_element_handler($parser, start_element, 
end_element);
xml_set_object($parser, $this);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_0) /ext/xml/tests bug32001.phpt

2005-03-13 Thread Moriyoshi Koizumi
moriyoshi   Sun Mar 13 20:14:52 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/xml/tests  bug32001.phpt 
  Log:
  - Turn off incorrect case folding to let test over.
  
  
http://cvs.php.net/diff.php/php-src/ext/xml/tests/bug32001.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/xml/tests/bug32001.phpt
diff -u php-src/ext/xml/tests/bug32001.phpt:1.1.2.2 
php-src/ext/xml/tests/bug32001.phpt:1.1.2.3
--- php-src/ext/xml/tests/bug32001.phpt:1.1.2.2 Wed Mar  2 14:28:25 2005
+++ php-src/ext/xml/tests/bug32001.phpt Sun Mar 13 20:14:52 2005
@@ -91,6 +91,7 @@
}
 
$parser = xml_parser_create(NULL);
+   xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
xml_set_element_handler($parser, start_element, 
end_element);
xml_set_object($parser, $this);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2005-03-13 Thread Jani Taskinen
sniper  Sun Mar 13 20:16:47 2005 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  *sigh*
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1853r2=1.1854ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1853 php-src/NEWS:1.1854
--- php-src/NEWS:1.1853 Sun Mar 13 09:17:17 2005
+++ php-src/NEWSSun Mar 13 20:16:43 2005
@@ -8,10 +8,6 @@
   . ext/mnogosearch (Jani, Derick)
   . ext/w32api  (Jani, Derick)
   . ext/yp  (Jani, Derick)
-- Added additional fifth parameter count to preg_replace_callback() and
-  preg_replace() to count the number of replacements made. FR #32275. (Andrey)
-- Added additional third string parameter charlist to str_word_count() which
-  contain characters to be considered as word part. FR #31560 (Andrey, Ilia)
 - Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
 - Changed mysqli_exception and sqlite_exception to use RuntimeException as 
base 
   if SPL extension is present. (Georg, Marcus)
@@ -32,6 +28,10 @@
   . added spl_autoload*() functions
   . converted several 5.0 examples into c code
   . added class File
+- Added optional fifth parameter count to preg_replace_callback() and
+  preg_replace() to count the number of replacements made. FR #32275. (Andrey)
+- Added optional third parameter charlist to str_word_count() which
+  contains characters to be considered as word part. FR #31560. (Andrey, Ilia)
 - Added interface Serializeable. (Stanislav, Marcus)
 - Added pg_field_type_oid() PostgreSQL function. (mauroi at digbang dot com)
 - Added zend_declare_property_...() and zend_update_property_...()

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite Makefile.frag config.m4

2005-03-13 Thread Wez Furlong
Please revert this; those things only need to run for maintainers and
can be quite fragile to leave it there for ordinary users.

--Wez.


On Mon, 14 Mar 2005 01:09:52 -, Jani Taskinen [EMAIL PROTECTED] wrote:
 sniper  Sun Mar 13 20:09:52 2005 EDT
 
   Added files:
 /php-src/ext/pdo_sqlite Makefile.frag
 
   Modified files:
 /php-src/ext/pdo_sqlite config.m4
   Log:
   - Move stuff that belongs in Makefile into Makefile.frag
 
 http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.15r2=1.16ty=u
 Index: php-src/ext/pdo_sqlite/config.m4
 diff -u php-src/ext/pdo_sqlite/config.m4:1.15 
 php-src/ext/pdo_sqlite/config.m4:1.16
 --- php-src/ext/pdo_sqlite/config.m4:1.15   Wed Mar  9 13:21:41 2005
 +++ php-src/ext/pdo_sqlite/config.m4Sun Mar 13 20:09:49 2005
 @@ -1,11 +1,11 @@
 -dnl $Id: config.m4,v 1.15 2005/03/09 18:21:41 wez Exp $
 +dnl $Id: config.m4,v 1.16 2005/03/14 01:09:49 sniper Exp $
  dnl config.m4 for extension pdo_sqlite
  dnl vim:et:sw=2:ts=2:
 
  if test $PHP_PDO != no; then
 
  PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
 -[  --with-pdo-sqlite Include PDO sqlite 3 support],yes)
 +[  --with-pdo-sqlite[=DIR]   Include PDO sqlite 3 support.],yes)
 
  if test $PHP_PDO_SQLITE != no; then
 
 @@ -83,21 +83,14 @@
 
PHP_ADD_BUILD_DIR($ext_builddir/sqlite)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src)
 +  PHP_ADD_BUILD_DIR($ext_builddir/sqlite/tool)
 +  PHP_ADD_MAKEFILE_FRAGMENT
 +
AC_CHECK_SIZEOF(char *,4)
AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | awk -F. 
 '{printf(%d%03d%03d, $1, $2, $3)}'`
sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
 s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
 $ext_srcdir/sqlite/src/sqlite.h.in  $ext_srcdir/sqlite3.h
 -  if ! test -f $ext_srcdir/sqlite/src/parse.h ; then
 -$CC -o $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/tool/lemon.c
 -$ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/src/parse.y
 - cat $ext_srcdir/sqlite/src/parse.h 
 $ext_srcdir/sqlite/src/vdbe.c | awk -f $ext_srcdir/sqlite/mkopcodeh.awk  
 $ext_srcdir/sqlite/src/opcodes.h
 -sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f 
 $ext_srcdir/sqlite/mkopcodec.awk  $ext_srcdir/sqlite/src/opcodes.c
 -$CC -o $ext_srcdir/sqlite/tool/mkkeywordhash 
 $ext_srcdir/sqlite/tool/mkkeywordhash.c
 -$ext_srcdir/sqlite/tool/mkkeywordhash  
 $ext_srcdir/sqlite/src/keywordhash.h
 -  else
 -touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.y
 -  fi
 
if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then
  echo '#include php_config.h'  $ext_srcdir/sqlite/src/config.h
 
 http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/Makefile.frag?r=1.1p=1
 Index: php-src/ext/pdo_sqlite/Makefile.frag
 +++ php-src/ext/pdo_sqlite/Makefile.frag
 
 $(builddir)/sqlite/tool/lemon: $(srcdir)/sqlite/tool/lemon.c
 $(CC) $(srcdir)/sqlite/tool/lemon.c -o $@
 cp $(srcdir)/sqlite/tool/lempar.c $(builddir)/sqlite/tool/
 
 $(builddir)/sqlite/tool/mkkeywordhash: $(srcdir)/sqlite/tool/mkkeywordhash.c
 $(CC) $(srcdir)/sqlite/tool/mkkeywordhash.c -o $@
 
 $(srcdir)/sqlite/src/parse.c: $(srcdir)/sqlite/src/parse.y 
 $(builddir)/sqlite/tool/lemon
 $(builddir)/sqlite/tool/lemon $(srcdir)/sqlite/src/parse.y
 
 $(srcdir)/sqlite/src/parse.h: $(srcdir)/sqlite/src/parse.c
 
 $(srcdir)/sqlite/src/opcodes.h: $(srcdir)/sqlite/src/parse.h
 cat $(srcdir)/sqlite/src/parse.h $(srcdir)/sqlite/src/vdbe.c | $(AWK) 
 -f $(srcdir)/sqlite/mkopcodeh.awk  $@
 
 $(srcdir)/sqlite/src/opcodes.c: $(srcdir)/sqlite/src/opcodes.h
 sort -n +2 $(srcdir)/sqlite/src/opcodes.h | $(AWK) -f 
 $(srcdir)/sqlite/mkopcodec.awk  $@
 
 $(srcdir)/sqlite/src/keywordhash.h: $(builddir)/sqlite/tool/mkkeywordhash
 $(srcdir)/sqlite/tool/mkkeywordhash  
 $(srcdir)/sqlite/src/keywordhash.h
 
 --
 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