date:20070711

Re: [PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /ext/odbc config.m4 /sapi/aolserver config.m4 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4 /sapi/apache_

2007-07-11 Thread Derick Rethans

On Wed, 11 Jul 2007, Jani Taskinen wrote:

> jani  Wed Jul 11 23:20:37 2007 UTC
> 

>   MFH: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (checks for unknown configure
>   MFH:   options)

Add this to the NEWS file? I am pretty sure people want to know about 
this as it's quite useful.

Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

-- 
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) / acinclude.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 15:16:56 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcacinclude.m4 
  Log:
  - Introducing 1st part of "show unknown configure options" and nuked 
PHP_REGEX macro for good
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.18&r2=1.332.2.14.2.19&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.18 
php-src/acinclude.m4:1.332.2.14.2.19
--- php-src/acinclude.m4:1.332.2.14.2.18Tue Jul 10 10:18:48 2007
+++ php-src/acinclude.m4Wed Jul 11 15:16:56 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.18 2007/07/10 10:18:48 jani Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.19 2007/07/11 15:16:56 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2560,28 +2560,50 @@
 ])
 
 dnl
-dnl PHP_REGEX
+dnl PHP_CHECK_CONFIGURE_OPTIONS
 dnl
-AC_DEFUN([PHP_REGEX],[
-  if test "$REGEX_TYPE" = "php"; then
-AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ])
-AC_DEFINE(HSREGEX,1,[ ])
-AC_DEFINE(REGEX,1,[ ])
-PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
-  elif test "$REGEX_TYPE" = "system"; then
-AC_DEFINE(REGEX,0,[ ])
-dnl Check if field re_magic exists in struct regex_t
-AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
-  AC_TRY_COMPILE([#include 
-#include ], [regex_t rt; rt.re_magic;],
-  [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
-])
-if test "$ac_cv_regex_t_re_magic" = "yes"; then
-  AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1)
-fi 
-  fi
-  AC_MSG_CHECKING([which regex library to use])
-  AC_MSG_RESULT([$REGEX_TYPE])
+AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[
+  for arg in $ac_configure_args; do
+case $arg in
+  --with-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`"
+;;
+  --without-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`"
+;;
+  --enable-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`"
+;;
+  --disable-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`"
+;;
+  *[)]
+   continue
+;;
+esac
+case $arg_name in
+  # Allow --disable-all / --enable-all
+  all[)];;
+
+  # Allow certain libtool options
+  libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];;
+
+  # Allow certain TSRM options
+  tsrm-pth | tsrm-st | tsrm-pthreads[)];;
+
+  # Allow certain Zend options
+  zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];;
+
+  # All the rest must be set using the PHP_ARG_* macros
+  *[)]
+is_arg_set=PHP_[]`echo [$]arg_name | tr 'abcdefghijklmnopqrstuvwxyz-' 
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+if eval test -z "\$$is_arg_set"; then
+  PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS
+[$]arg"
+fi
+;;
+esac
+  done
 ])
 
 dnl

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_row.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:01:39 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_row.phpt 
  Log:
  Whitespace and - as usual - removing skipifemb.inc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_row.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_row.phptWed Jul 11 14:01:39 2007
@@ -2,37 +2,36 @@
 mysql_fetch_row()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 [004]

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_get_client_info.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:45:53 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_get_client_info.phpt 
  Log:
  Whitespace and new "too many arguments" check.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_client_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_client_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.1 
php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_client_info.phpt:1.1  Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_client_info.phpt  Wed Jul 11 14:45:53 2007
@@ -2,19 +2,22 @@
 mysql_get_client_info()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/odbc config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 23:10:46 2007 UTC

  Modified files:  
/php-src/ext/odbc   config.m4 
  Log:
  - Changed all AC_ARG_* options to PHP_ARG_* options.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.80&r2=1.81&diff_format=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.80 php-src/ext/odbc/config.m4:1.81
--- php-src/ext/odbc/config.m4:1.80 Tue Jul  3 17:24:37 2007
+++ php-src/ext/odbc/config.m4  Wed Jul 11 23:10:46 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.80 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.81 2007/07/11 23:10:46 jani Exp $
 dnl
 
 AC_DEFUN([PHP_ODBC_CHECK_HEADER],[
@@ -96,19 +96,21 @@
   AC_MSG_RESULT(`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`)
 ])
 
+dnl
+dnl configure options
+dnl
 if test -z "$ODBC_TYPE"; then
-AC_MSG_CHECKING(for Adabas support)
-AC_ARG_WITH(adabas,
-[  --with-adabas[=DIR] Include Adabas D support [/usr/local]],
-[
-  PHP_WITH_SHARED
-  if test "$withval" = "yes"; then
-withval=/usr/local
-  fi
-  if test "$withval" != "no"; then
-PHP_ADD_INCLUDE($withval/incl)
-PHP_ADD_LIBPATH($withval/$PHP_LIBDIR)
-ODBC_OBJS="$withval/$PHP_LIBDIR/odbclib.a"
+PHP_ARG_WITH(adabas,,
+[  --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+
+  if test "$PHP_ADABAS" != "no"; then
+AC_MSG_CHECKING([for Adabas support])
+if test "$PHP_ADABAS" = "yes"; then
+  PHP_ADABAS=/usr/local
+fi
+PHP_ADD_INCLUDE($PHP_ADABAS/incl)
+PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR)
+ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
 ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
 $srcdir/build/shtool mkdir -f -p ext/odbc
 rm -f "$ODBC_LIB"
@@ -119,52 +121,39 @@
 ODBC_TYPE=adabas
 PHP_ODBC_CHECK_HEADER(sqlext.h)
 AC_DEFINE(HAVE_ADABAS,1,[ ])
-AC_MSG_RESULT(yes)
-  else
-AC_MSG_RESULT(no)
+AC_MSG_RESULT([$ext_output])
   fi
-],[
-  AC_MSG_RESULT(no)
-])
 fi
 
 if test -z "$ODBC_TYPE"; then
-AC_MSG_CHECKING(for SAP DB support)
-AC_ARG_WITH(sapdb,
-[  --with-sapdb[=DIR]  Include SAP DB support [/usr/local]],
-[
-  PHP_WITH_SHARED
-  if test "$withval" = "yes"; then
-withval=/usr/local
-  fi
-  if test "$withval" != "no"; then
-PHP_ADD_INCLUDE($withval/incl)
-PHP_ADD_LIBPATH($withval/lib)
+PHP_ARG_WITH(sapdb,,
+[  --with-sapdb[=DIR]  Include SAP DB support [/usr/local]])
+
+  if test "$PHP_SAPDB" != "no"; then
+AC_MSG_CHECKING([for SAP DB support])
+if test "$PHP_SAPDB" = "yes"; then
+  PHP_SAPDB=/usr/local
+fi
+PHP_ADD_INCLUDE($PHP_SAPDB/incl)
+PHP_ADD_LIBPATH($PHP_SAPDB/lib)
 PHP_ADD_LIBRARY(sqlod)
 ODBC_TYPE=sapdb
 AC_DEFINE(HAVE_SAPDB,1,[ ])
-AC_MSG_RESULT(yes)
-  else
-AC_MSG_RESULT(no)
+AC_MSG_RESULT([$ext_output])
   fi
-],[
-  AC_MSG_RESULT(no)
-])
 fi
 
-
 if test -z "$ODBC_TYPE"; then
-AC_MSG_CHECKING(for Solid support)
-AC_ARG_WITH(solid,
-[  --with-solid[=DIR]  Include Solid support [/usr/local/solid]],
-[
-  PHP_WITH_SHARED
-  if test "$withval" = "yes"; then
-withval=/usr/local/solid
-  fi
-  if test "$withval" != "no"; then
-ODBC_INCDIR=$withval/include
-ODBC_LIBDIR=$withval/$PHP_LIBDIR
+PHP_ARG_WITH(solid,,
+[  --with-solid[=DIR]  Include Solid support [/usr/local/solid]])
+
+  if test "$PHP_SOLID" != "no"; then
+AC_MSG_CHECKING(for Solid support)
+if test "$PHP_SOLID" = "yes"; then
+  PHP_SOLID=/usr/local/solid
+fi
+ODBC_INCDIR=$PHP_SOLID/include
+ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
 ODBC_INCLUDE=-I$ODBC_INCDIR
 ODBC_TYPE=solid
 if test -f $ODBC_LIBDIR/soc*35.a; then
@@ -174,41 +163,35 @@
 elif test -f $ODBC_LIBDIR/scl*23.a; then
   AC_DEFINE(HAVE_SOLID,1,[ ])
 fi
-AC_MSG_RESULT(yes)
+AC_MSG_RESULT([$ext_output])
 PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR)
-  else
-AC_MSG_RESULT(no)
   fi
-],[
-  AC_MSG_RESULT(no)
-])
 fi
 
 if test -z "$ODBC_TYPE"; then
-AC_MSG_CHECKING(for IBM DB2 support)
-AC_ARG_WITH(ibm-db2,
-[  --with-ibm-db2[=DIR]Include IBM DB2 support [/home/db2inst1/sqllib]],
-[
-  PHP_WITH_SHARED
-  if test "$withval" != "no"; then
-if test "$withval" = "yes"; then
+PHP_ARG_WITH(ibm-db2,,
+[  --with-ibm-db2[=DIR]Include IBM DB2 support [/home/db2inst1/sqllib]])
+
+  if test "$PHP_IBM_DB2" != "no"; then
+AC_MSG_CHECKING(for IBM DB2 support)
+if test "$PHP_IBM_DB2" = "yes"; then
   ODBC_INCDIR=/home/db2inst1/sqllib/include
   ODBC_LIBDIR=/home/db2inst1/sqllib/lib
 else
-  ODBC_INCDIR=$withval/include
-  ODBC_LIBDIR=$withval/$PHP_LIBDIR
+  ODBC_INCDIR=$PHP_IBM_DB2/include
+  ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
 fi
 
 PHP_ODBC_CHECK_HEADER(sqlcli1.h)
 
 ODBC_INCLUDE=-I$ODBC_INCDIR
 ODBC_LFLAGS=-L$ODBC_LIBDIR
-ODBC_TYPE=db2
+ODBC_TYPE=ibm-db2
 ODBC_LIBS=-ldb2
 
 PHP_TEST_BUILD(SQLExecute, [
   AC_DEFINE(HAVE_IBMDB2,1,[ ])
-  AC_MSG_RESULT(yes)
+  AC_MSG_RESULT([$ext_output])
 ]

[PHP-CVS] cvs: php-src / configure.in

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 23:13:20 2007 UTC

  Modified files:  
/php-srcconfigure.in 
  Log:
  - Enabled PHP_CHECK_CONFIGURE_OPTIONS (check for unknown configure options)
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.633&r2=1.634&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.633 php-src/configure.in:1.634
--- php-src/configure.in:1.633  Tue Jul 10 10:18:26 2007
+++ php-src/configure.inWed Jul 11 23:13:19 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.633 2007/07/10 10:18:26 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.634 2007/07/11 23:13:19 jani Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -129,9 +129,8 @@
 AC_PROG_LN_S
 
 dnl Support systems with system libraries in e.g. /usr/lib64
-AC_ARG_WITH(libdir,
-[  --with-libdir=NAME  Look for libraries in .../NAME rather than .../lib],
-[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
+PHP_ARG_WITH(libdir, for system library directory,
+[  --with-libdir=NAME  Look for libraries in .../NAME rather than 
.../lib],lib,no)
 
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH
@@ -704,9 +703,9 @@
   ZEND_DEBUG=no
 fi
 
-PHP_ARG_WITH(layout,[layout of installed files],
-[  --with-layout=TYPE  Set how installed files will be laid out.  Type is
-  one of "PHP" or "GNU" [TYPE=PHP]], PHP, no)
+PHP_ARG_WITH(layout, layout of installed files,
+[  --with-layout=TYPE  Set how installed files will be laid out.  Type can
+  be either PHP or GNU [PHP]], PHP, no)
 
 case $PHP_LAYOUT in
   GNU)
@@ -717,7 +716,7 @@
 ;;
 esac
 
-PHP_ARG_WITH(config-file-path,[path to configuration file],
+PHP_ARG_WITH(config-file-path, path to configuration file,
 [  --with-config-file-path=PATH
   Set the path in which to look for php.ini 
[PREFIX/lib]], DEFAULT, no)
 
@@ -732,16 +731,18 @@
   esac
 fi
 
-PHP_ARG_WITH(config-file-scan-dir,[where to scan for configuration files],
+AC_MSG_CHECKING([where to scan for configuration files])
+PHP_ARG_WITH(config-file-scan-dir,
 [  --with-config-file-scan-dir=PATH
   Set the path where to scan for configuration files], 
DEFAULT, no) 
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
+AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR])
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
-PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
+PHP_ARG_ENABLE(sigchild, whether to enable PHP's own SIGCHLD handler,
 [  --enable-sigchild   Enable PHP's own SIGCHLD handler], no, no)
 
 if test "$PHP_SIGCHILD" = "yes"; then
@@ -766,20 +767,19 @@
   PHP_ADD_LIBRARY(gcc, yes)
 fi
 
-PHP_ARG_ENABLE(short-tags,whether to enable short tags by default,
-[  --disable-short-tagsDisable the short-form http://www.php.net/manual/security.php for more details.   
|"
-  fi
-fi
-  fi
-
-
   if test -n "$DEBUG_LOG"; then
 rm -f config.cache
 cat

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 config.m4

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 22:16:11 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/oci8   config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.7&r2=1.55.2.3.2.8&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.7 
php-src/ext/oci8/config.m4:1.55.2.3.2.8
--- php-src/ext/oci8/config.m4:1.55.2.3.2.7 Tue Jul  3 17:25:34 2007
+++ php-src/ext/oci8/config.m4  Wed Jul 11 22:16:11 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55.2.3.2.7 2007/07/03 17:25:34 sniper Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.8 2007/07/11 22:16:11 tony2001 Exp $
 dnl
 
 if test -z "$SED"; then
@@ -37,9 +37,9 @@
 
   AC_MSG_CHECKING([OCI8 libraries dir])
   if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then
-   OCI8_LIB_DIR=lib
+OCI8_LIB_DIR=lib
   elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
-   OCI8_LIB_DIR=lib32
+OCI8_LIB_DIR=lib32
   elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
 OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
   else
@@ -100,6 +100,7 @@
   Use --with-oci8=instantclient,/path/to/oic/lib 
   for an Oracle Instant Client installation])
 
+if test "$PHP_OCI8" != "no"; then 
   AC_MSG_CHECKING([PHP version])
 
   tmp_version=$PHP_VERSION
@@ -127,22 +128,22 @@
   else
 AC_MSG_RESULT([$php_version, ok])
   fi
-
+fi
 
 PHP_OCI8_INSTANT_CLIENT="no"
 
 if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
-   PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
+PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
 PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
-   if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-   PHP_OCI8_INSTANT_CLIENT="yes"
-   fi
+if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+PHP_OCI8_INSTANT_CLIENT="yes"
+fi
 elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
-   PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
+PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
 PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
-   if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-   PHP_OCI8_INSTANT_CLIENT="yes"
-   fi
+if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+PHP_OCI8_INSTANT_CLIENT="yes"
+fi
 fi
 
 if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
@@ -215,7 +216,7 @@
 -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
   ])
 
- PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
+  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
   [
 AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
   ], [], [

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

[PHP-CVS] cvs: php-src /ext/oci8 config.m4

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 22:15:44 2007 UTC

  Modified files:  
/php-src/ext/oci8   config.m4 
  Log:
  check PHP version only when enabled
  and replace tabs with spaces
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.66&r2=1.67&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.66 php-src/ext/oci8/config.m4:1.67
--- php-src/ext/oci8/config.m4:1.66 Tue Jul  3 17:24:37 2007
+++ php-src/ext/oci8/config.m4  Wed Jul 11 22:15:44 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.66 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.67 2007/07/11 22:15:44 tony2001 Exp $
 dnl
 
 if test -z "$SED"; then
@@ -37,9 +37,9 @@
 
   AC_MSG_CHECKING([OCI8 libraries dir])
   if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then
-   OCI8_LIB_DIR=lib
+OCI8_LIB_DIR=lib
   elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
-   OCI8_LIB_DIR=lib32
+OCI8_LIB_DIR=lib32
   elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
 OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
   else
@@ -100,6 +100,7 @@
   Use --with-oci8=instantclient,/path/to/oic/lib 
   for an Oracle Instant Client installation])
 
+if test "$PHP_OCI8" != "no"; then 
   AC_MSG_CHECKING([PHP version])
 
   tmp_version=$PHP_VERSION
@@ -127,22 +128,22 @@
   else
 AC_MSG_RESULT([$php_version, ok])
   fi
-
+fi
 
 PHP_OCI8_INSTANT_CLIENT="no"
 
 if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then
-   PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
+PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`"
 PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`"
-   if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-   PHP_OCI8_INSTANT_CLIENT="yes"
-   fi
+if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+PHP_OCI8_INSTANT_CLIENT="yes"
+fi
 elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
-   PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
+PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
 PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
-   if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
-   PHP_OCI8_INSTANT_CLIENT="yes"
-   fi
+if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
+PHP_OCI8_INSTANT_CLIENT="yes"
+fi
 fi
 
 if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
@@ -215,7 +216,7 @@
 -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
   ])
 
- PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
+  PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2,
   [
 AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ])
   ], [], [

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests bug41884.phpt

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 22:06:54 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests   bug41884.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/reflection php_reflection.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.828&r2=1.2027.2.547.2.829&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.828 php-src/NEWS:1.2027.2.547.2.829
--- php-src/NEWS:1.2027.2.547.2.828 Wed Jul 11 17:36:55 2007
+++ php-src/NEWSWed Jul 11 22:06:54 2007
@@ -6,7 +6,7 @@
 - Upgraded PCRE to version 7.2 (Nuno)
 - Updated timezone database to version 2007.6. (Derick)
 
-- Improced openssl_x509_parse() to return extensions in readable form. (Dmitry)
+- Improved openssl_x509_parse() to return extensions in readable form. (Dmitry)
 - Improved fix for MOPB-03-2007. (Ilia)
 - Corrected fix for CVE-2007-2872. (Ilia)
 - Enabled statement cache for non-persistent OCI8 connections.
@@ -32,7 +32,10 @@
 - Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants. 
   (Andrey A. Belashkov, Tony)
 
-- Fixed crash in OpenSSL extension because of non-strin passphrase. (Dmitry)
+- Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not 
handle 
+  static attributes). (Tony)
+
+- Fixed crash in OpenSSL extension because of non-string passphrase. (Dmitry)
 - Fixed var_export() to use the new H modifier so that it can generate
   parseable PHP code for floats, independent of the locale. (Derick)
 - Fixed regression introduced by the fix for the libgd bug #74. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.40&r2=1.164.2.33.2.41&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.40 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.41
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.40 Wed Jul 11 
13:27:49 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jul 11 22:06:54 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.40 2007/07/11 13:27:49 tony2001 Exp $ 
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.41 2007/07/11 22:06:54 tony2001 Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2804,7 +2804,8 @@
 {
reflection_object *intern;
zend_class_entry *ce;
-   int count;
+   int count, i;
+   HashTable *ht_list[3];

METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ce);
@@ -2812,33 +2813,40 @@
 
zend_update_class_constants(ce TSRMLS_CC);
 
-   count = zend_hash_num_elements(&ce->default_properties);
-   if (count > 0) {
-   HashPosition pos;
-   zval **prop;
+   ht_list[0] = CE_STATIC_MEMBERS(ce);
+   ht_list[1] = &ce->default_properties;
+   ht_list[2] = NULL;
 
-   zend_hash_internal_pointer_reset_ex(&ce->default_properties, 
&pos);
-   while (zend_hash_get_current_data_ex(&ce->default_properties, 
(void **) &prop, &pos) == SUCCESS) {
-   char *key, *class_name, *prop_name;
-   uint key_len;
-   ulong num_index;
-   zval *prop_copy;
+   for (i = 0; ht_list[i] != NULL; i++) {
 
-   zend_hash_get_current_key_ex(&ce->default_properties, 
&key, &key_len, &num_index, 0, &pos);
-   zend_hash_move_forward_ex(&ce->default_properties, 
&pos);
-   zend_unmangle_property_name(key, key_len-1, 
&class_name, &prop_name);
-   if (class_name && class_name[0] != '*' && 
strcmp(class_name, ce->name)) {
-   /* filter privates from base classes */
-   continue;
-   }
+   count = zend_hash_num_elements(ht_list[i]);
+   if (count > 0) {
+   HashPosition pos;
+   zval **prop;
 
-   /* copy: enforce read only access */
-   ALLOC_ZVAL(prop_copy);
-   *prop_copy = **prop;
-   zval_copy_ctor(prop_copy);
-   INIT_PZVAL(prop_copy);
+   zend_hash_internal_pointer_reset_ex(ht_list[i], &pos);
+   while (zend_hash_get_current_data_ex(ht_list[i], (void 
**) &prop, &pos) == SUCCESS) {
+   char *key, *class_name, *prop_name;
+   uint key_len;
+   ulong num_index;
+   zval *prop_copy;
+
+   zend_hash_get_current_key_ex(ht_list[i], &key, 
&key_len, &num_index, 0, &pos);
+   zend_hash_move_forward_ex(ht_list[i], &pos);
+

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug41884.phpt

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 22:03:59 2007 UTC

  Added files: 
/php-src/ext/reflection/tests   bug41884.phpt 

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  implement (or fix?) #41884 (ReflectionClass::getDefaultProperties() does not 
handle static attributes)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.277&r2=1.278&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.277 
php-src/ext/reflection/php_reflection.c:1.278
--- php-src/ext/reflection/php_reflection.c:1.277   Wed Jul 11 13:26:47 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jul 11 22:03:59 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.277 2007/07/11 13:26:47 tony2001 Exp $ */
+/* $Id: php_reflection.c,v 1.278 2007/07/11 22:03:59 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2852,7 +2852,8 @@
 {
reflection_object *intern;
zend_class_entry *ce;
-   int count;
+   int count, i;
+   HashTable *ht_list[3];

METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ce);
@@ -2860,34 +2861,40 @@
 
zend_update_class_constants(ce TSRMLS_CC);
 
-   count = zend_hash_num_elements(&ce->default_properties);
-   if (count > 0) {
-   HashPosition pos;
-   zval **prop;
+   ht_list[0] = CE_STATIC_MEMBERS(ce);
+   ht_list[1] = &ce->default_properties;
+   ht_list[2] = NULL; /* this should be always the last element */
 
-   zend_hash_internal_pointer_reset_ex(&ce->default_properties, 
&pos);
-   while (zend_hash_get_current_data_ex(&ce->default_properties, 
(void **) &prop, &pos) == SUCCESS) {
-   zstr key, class_name, prop_name;
-   uint key_len;
-   ulong num_index;
-   zval *prop_copy;
+   for (i = 0; ht_list[i] != NULL; i++) {
+   count = zend_hash_num_elements(ht_list[i]);
+   if (count > 0) {
+   HashPosition pos;
+   zval **prop;
 
-   zend_hash_get_current_key_ex(&ce->default_properties, 
&key, &key_len, &num_index, 0, &pos);
-   zend_hash_move_forward_ex(&ce->default_properties, 
&pos);
-   
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key, key_len-1, 
&class_name, &prop_name);
-   if (class_name.s && class_name.s[0] != '*' && 
-   (UG(unicode)?u_strcmp(class_name.u, 
ce->name.u):strcmp(class_name.s, ce->name.s))) {
-   /* filter privates from base classes */
-   continue;
-   }
+   zend_hash_internal_pointer_reset_ex(ht_list[i], &pos);
+   while (zend_hash_get_current_data_ex(ht_list[i], (void 
**) &prop, &pos) == SUCCESS) {
+   zstr key, class_name, prop_name;
+   uint key_len;
+   ulong num_index;
+   zval *prop_copy;
+
+   zend_hash_get_current_key_ex(ht_list[i], &key, 
&key_len, &num_index, 0, &pos);
+   zend_hash_move_forward_ex(ht_list[i], &pos);
+   
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key, key_len-1, 
&class_name, &prop_name);
+   if (class_name.s && class_name.s[0] != '*' && 
+   (UG(unicode)?u_strcmp(class_name.u, 
ce->name.u):strcmp(class_name.s, ce->name.s))) {
+   /* filter privates from base classes */
+   continue;
+   }
 
-   /* copy: enforce read only access */
-   ALLOC_ZVAL(prop_copy);
-   *prop_copy = **prop;
-   zval_copy_ctor(prop_copy);
-   INIT_PZVAL(prop_copy);
+   /* copy: enforce read only access */
+   ALLOC_ZVAL(prop_copy);
+   *prop_copy = **prop;
+   zval_copy_ctor(prop_copy);
+   INIT_PZVAL(prop_copy);
 
-   add_u_assoc_zval(return_value, ZEND_STR_TYPE, 
prop_name, prop_copy);
+   add_u_assoc_zval(return_value, ZEND_STR_TYPE, 
prop_name, prop_copy);
+   }
}
}
 }
@@ -4998,7 +5005,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
 
-

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_pgsql config.m4 /ext/pgsql config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 21:51:55 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pgsql  config.m4 
/php-src/ext/pdo_pgsql  config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.m4?r1=1.46.2.1.2.4&r2=1.46.2.1.2.5&diff_format=u
Index: php-src/ext/pgsql/config.m4
diff -u php-src/ext/pgsql/config.m4:1.46.2.1.2.4 
php-src/ext/pgsql/config.m4:1.46.2.1.2.5
--- php-src/ext/pgsql/config.m4:1.46.2.1.2.4Sun Feb 18 17:05:53 2007
+++ php-src/ext/pgsql/config.m4 Wed Jul 11 21:51:55 2007
@@ -1,10 +1,7 @@
 dnl
-dnl $Id: config.m4,v 1.46.2.1.2.4 2007/02/18 17:05:53 iliaa Exp $
+dnl $Id: config.m4,v 1.46.2.1.2.5 2007/07/11 21:51:55 jani Exp $
 dnl
 
-AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
-])
-
 PHP_ARG_WITH(pgsql,for PostgreSQL support,
 [  --with-pgsql[=DIR]  Include PostgreSQL support.  DIR is the PostgreSQL
   base install directory or the path to pg_config])
@@ -63,7 +60,7 @@
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-AC_MSG_ERROR([Unable to find libpq anywhere under $withval])
+AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS])
   fi
 
   AC_DEFINE(HAVE_PGSQL,1,[Whether to build PostgreSQL support or not])
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.13.4.4&r2=1.13.4.5&diff_format=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.13.4.4 
php-src/ext/pdo_pgsql/config.m4:1.13.4.5
--- php-src/ext/pdo_pgsql/config.m4:1.13.4.4Mon Jul  9 12:54:11 2007
+++ php-src/ext/pdo_pgsql/config.m4 Wed Jul 11 21:51:55 2007
@@ -1,12 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.13.4.4 2007/07/09 12:54:11 jani Exp $
+dnl $Id: config.m4,v 1.13.4.5 2007/07/11 21:51:55 jani Exp $
 dnl
 
 if test "$PHP_PDO" != "no"; then
 
-AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
-])
-
 PHP_ARG_WITH(pdo-pgsql,for PostgreSQL support for PDO,
 [  --with-pdo-pgsql[=DIR]PDO: PostgreSQL support.  DIR is the PostgreSQL 
base
 install directory or the path to pg_config])
@@ -63,7 +60,7 @@
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-AC_MSG_ERROR([Unable to find libpq anywhere under $withval])
+AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS])
   fi
 
   AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or 
not])

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

[PHP-CVS] cvs: php-src /ext/pdo_pgsql config.m4 /ext/pgsql config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 21:51:10 2007 UTC

  Modified files:  
/php-src/ext/pgsql  config.m4 
/php-src/ext/pdo_pgsql  config.m4 
  Log:
  - Removed unused empty macro and nuked illegal use of $withval
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.m4?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/pgsql/config.m4
diff -u php-src/ext/pgsql/config.m4:1.51 php-src/ext/pgsql/config.m4:1.52
--- php-src/ext/pgsql/config.m4:1.51Mon Feb 19 19:46:36 2007
+++ php-src/ext/pgsql/config.m4 Wed Jul 11 21:51:10 2007
@@ -1,10 +1,7 @@
 dnl
-dnl $Id: config.m4,v 1.51 2007/02/19 19:46:36 tony2001 Exp $
+dnl $Id: config.m4,v 1.52 2007/07/11 21:51:10 jani Exp $
 dnl
 
-AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
-])
-
 PHP_ARG_WITH(pgsql,for PostgreSQL support,
 [  --with-pgsql[=DIR]  Include PostgreSQL support.  DIR is the PostgreSQL
   base install directory or the path to pg_config])
@@ -63,7 +60,7 @@
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-AC_MSG_ERROR([Unable to find libpq anywhere under $withval])
+AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS])
   fi
 
   AC_DEFINE(HAVE_PGSQL,1,[Whether to build PostgreSQL support or not])
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.17 
php-src/ext/pdo_pgsql/config.m4:1.18
--- php-src/ext/pdo_pgsql/config.m4:1.17Mon Jul  9 12:53:52 2007
+++ php-src/ext/pdo_pgsql/config.m4 Wed Jul 11 21:51:10 2007
@@ -1,12 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.17 2007/07/09 12:53:52 jani Exp $
+dnl $Id: config.m4,v 1.18 2007/07/11 21:51:10 jani Exp $
 dnl
 
 if test "$PHP_PDO" != "no"; then
 
-AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
-])
-
 PHP_ARG_WITH(pdo-pgsql,for PostgreSQL support for PDO,
 [  --with-pdo-pgsql[=DIR]PDO: PostgreSQL support.  DIR is the PostgreSQL 
base
 install directory or the path to pg_config])
@@ -63,7 +60,7 @@
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-AC_MSG_ERROR([Unable to find libpq anywhere under $withval])
+AC_MSG_ERROR([Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS])
   fi
 
   AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or 
not])



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

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 21:47:04 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB: PHP_CHECK_CONFIGURE_OPTIONS
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.374&r2=1.375&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.374 php-src/acinclude.m4:1.375
--- php-src/acinclude.m4:1.374  Wed Jul 11 17:39:04 2007
+++ php-src/acinclude.m4Wed Jul 11 21:47:04 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.374 2007/07/11 17:39:04 johannes Exp $
+dnl $Id: acinclude.m4,v 1.375 2007/07/11 21:47:04 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2609,6 +2609,53 @@
 ])
 
 dnl
+dnl PHP_CHECK_CONFIGURE_OPTIONS
+dnl
+AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[
+  for arg in $ac_configure_args; do
+case $arg in
+  --with-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`"
+;;
+  --without-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`"
+;;
+  --enable-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`"
+;;
+  --disable-*[)]
+   arg_name="`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`"
+;;
+  *[)]
+   continue
+;;
+esac
+case $arg_name in
+  # Allow --disable-all / --enable-all
+  all[)];;
+
+  # Allow certain libtool options
+  libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];;
+
+  # Allow certain TSRM options
+  tsrm-pth | tsrm-st | tsrm-pthreads[)];;
+
+  # Allow certain Zend options
+  zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];;
+
+  # All the rest must be set using the PHP_ARG_* macros
+  *[)]
+is_arg_set=PHP_[]`echo [$]arg_name | tr 'abcdefghijklmnopqrstuvwxyz-' 
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+if eval test -z "\$$is_arg_set"; then
+  PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS
+[$]arg"
+fi
+;;
+esac
+  done
+])
+
+dnl
 dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
 dnl
 AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[

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

[PHP-CVS] cvs: php-src /ext/reflection/tests reflectionClass_getName_basic.phpt reflectionClass_getName_error.phpt reflectionClass_getName_error1.phpt reflectionClass_isInstance_basic.phpt reflectionC

2007-07-11 Thread Zoe Slattery

zoe Wed Jul 11 20:16:43 2007 UTC

  Modified files:  
/php-src/ext/reflection/tests   

reflectionClass_isUserDefined_basic.phpt 

reflectionClass_isInstantiable_basic.phpt 

reflectionClass_isInstantiable_variation.phpt 
reflectionClass_getName_error.phpt 
reflectionClass_isSubclassOf_error.phpt 
reflectionClass_getName_error1.phpt 

reflectionClass_isSubclassOf_error1.phpt 
reflectionClass_getName_basic.phpt 
reflectionClass_isInstance_error.phpt 
reflectionClass_isSubclassOf_basic.phpt 
reflectionClass_isInstance_basic.phpt 
reflectionClass_isInternal_error.phpt 

reflectionClass_isUserDefined_error.phpt 

reflectionClass_isInstantiable_error.phpt 
reflectionClass_isInternal_basic.phpt 
  Log:
  More reflectionClass tests
  http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt
diff -u /dev/null 
php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt:1.2
--- /dev/null   Wed Jul 11 20:16:43 2007
+++ php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt   
Wed Jul 11 20:16:43 2007
@@ -0,0 +1,28 @@
+--TEST--
+ReflectionClass::isUserDefined()
+--FILE--
+isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), 
+$r4->isUserDefined(), $r5->isUserDefined());
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+--UEXPECTF--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt
diff -u /dev/null 
php-src/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt:1.2
--- /dev/null   Wed Jul 11 20:16:43 2007
+++ php-src/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt  
Wed Jul 11 20:16:43 2007
@@ -0,0 +1,46 @@
+--TEST--
+ReflectionClass::IsInstantiable()
+--FILE--
+IsInstantiable()); 
+
+}
+
+?>
+--EXPECTF--
+Is C instantiable?  bool(true)
+Is iface instantiable?  bool(false)
+Is ifaceImpl instantiable?  bool(true)
+Is abstractClass instantiable?  bool(false)
+Is D instantiable?  bool(true)
+--UEXPECTF--
+Is C instantiable?  bool(true)
+Is iface instantiable?  bool(false)
+Is ifaceImpl instantiable?  bool(true)
+Is abstractClass instantiable?  bool(false)
+Is D instantiable?  bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt?r1=1.1&r2=1.2&diff_format=u
Index: 
php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt
diff -u /dev/null 
php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt:1.2
--- /dev/null   Wed Jul 11 20:16:43 2007
+++ php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt  
Wed Jul 11 20:16:43 2007
@@ -0,0 +1,58 @@
+--TEST--
+ReflectionClass::IsInstantiable()
+--FILE--
+IsInstantiable()); 
+}
+
+?>
+--EXPECTF--
+Is noCtor instantiable?  bool(true)
+Is publicCtorNew instantiable?  bool(true)
+Is protectedCtorNew instantiable?  bool(false)
+Is privateCtorNew instantiable?  bool(false)
+Is publicCtorOld instantiable?  bool(true)
+Is protectedCtorOld instantiable?  bool(false)
+Is privateCtorOld instantiable?  bool(false)
+--UEXPECTF--
+Is noCtor instantiable?  bool(true)
+Is publicCtorNew instantiable?  bool(true)
+Is protectedCtorNew instantiable?  bool(false)
+Is privateCtorNew instantiable?  bool(false)
+Is publicCtorOld instantiable?  bool(true)
+Is protectedCtorOld instantiable?  bool(false)
+Is privateCtorOld instantiable?  bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getName_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/reflection/tests/reflectionClass_getName_error.phpt
diff -u /dev/null 
php-src/ext/reflection/tests/reflectionClass_getName_error.phpt:1.2
--- /dev/null   Wed Jul 11 20:16:43 2007
+++ php-src/ext/reflection/tests/reflectionClass_getName_error.phpt Wed Jul 
11 20:16:43 2007
@@ -0,0 +1,23 @@
+--TEST--
+ReflectionClass::getName() - invalid params
+--FILE--
+getName('X'));
+var_dump($r1->getName('X', true));
+?> 
+--EXPECTF--
+Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 5
+NULL
+
+Warn

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection/tests reflectionClass_getName_basic.phpt reflectionClass_getName_error.phpt reflectionClass_getName_error1.phpt reflectionClass_isInstance_basic.phpt re

2007-07-11 Thread Zoe Slattery

zoe Wed Jul 11 20:11:34 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests   

reflectionClass_isInstantiable_variation.phpt 
reflectionClass_isSubclassOf_error.phpt 

reflectionClass_isUserDefined_error.phpt 
reflectionClass_getName_error1.phpt 
reflectionClass_isInstance_error.phpt 
reflectionClass_isSubclassOf_basic.phpt 

reflectionClass_isUserDefined_basic.phpt 
reflectionClass_isInstance_basic.phpt 
reflectionClass_getName_error.phpt 
reflectionClass_isInternal_error.phpt 

reflectionClass_isInstantiable_error.phpt 

reflectionClass_isSubclassOf_error1.phpt 
reflectionClass_getName_basic.phpt 
reflectionClass_isInternal_basic.phpt 

reflectionClass_isInstantiable_basic.phpt 
  Log:
  More reflectionClass tests
  

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt?view=markup&rev=1.1
Index: 
php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getName_error1.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_getName_error1.phpt
+++ php-src/ext/reflection/tests/reflectionClass_getName_error1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstance_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isInstance_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isInstance_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getName_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_getName_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_getName_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isInternal_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt
+++ php-src/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_getName_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/reflectionClass_getName_basic.phpt
+++ php-src/ext/reflection/tests/reflectionClass_getName_basic.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInternal_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/refl

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/mbstring mbstring.c /ext/standard basic_functions.c mail.c php_mail.h /main config.w32.h main.c /win32/build config.w32.h.in

2007-07-11 Thread Johannes Schl

johannesWed Jul 11 17:39:04 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/mbstring   mbstring.c 
/php-src/ext/standard   basic_functions.c mail.c php_mail.h 
/php-src/main   config.w32.h main.c 
/php-src/win32/buildconfig.w32.h.in 
  Log:
  - Always enable mail() function
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.373&r2=1.374&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.373 php-src/acinclude.m4:1.374
--- php-src/acinclude.m4:1.373  Wed Jul 11 10:35:47 2007
+++ php-src/acinclude.m4Wed Jul 11 17:39:04 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
+dnl $Id: acinclude.m4,v 1.374 2007/07/11 17:39:04 johannes Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1991,9 +1991,6 @@
 AC_DEFUN([PHP_PROG_SENDMAIL], [
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
-  if test -n "$PROG_SENDMAIL"; then
-AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
-  fi
   PHP_SUBST(PROG_SENDMAIL)
 ])
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.268&r2=1.269&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.268 
php-src/ext/mbstring/mbstring.c:1.269
--- php-src/ext/mbstring/mbstring.c:1.268   Wed Apr  4 15:23:09 2007
+++ php-src/ext/mbstring/mbstring.c Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.268 2007/04/04 15:23:09 masugata Exp $ */
+/* $Id: mbstring.c,v 1.269 2007/07/11 17:39:04 johannes Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -3317,7 +3317,6 @@
 /* {{{ proto int mb_send_mail(string to, string subject, string message [, 
string additional_headers [, string additional_parameters]])
  *  Sends an email message with MIME scheme
  */
-#if HAVE_SENDMAIL
 
 #define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || 
str[pos + 2] == '\t')) {\
@@ -3821,16 +3820,6 @@
 #undef PHP_MBSTR_MAIL_MIME_HEADER2
 #undef PHP_MBSTR_MAIL_MIME_HEADER3
 #undef PHP_MBSTR_MAIL_MIME_HEADER4
-
-#else  /* HAVE_SENDMAIL */
-
-PHP_FUNCTION(mb_send_mail)
-{
-   RETURN_FALSE;
-}
-
-#endif /* HAVE_SENDMAIL */
-
 /* }}} */
 
 /* {{{ proto mixed mb_get_info([string type])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.863&r2=1.864&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.863 
php-src/ext/standard/basic_functions.c:1.864
--- php-src/ext/standard/basic_functions.c:1.863Wed Jul 11 15:52:44 2007
+++ php-src/ext/standard/basic_functions.c  Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.863 2007/07/11 15:52:44 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.864 2007/07/11 17:39:04 johannes Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1816,7 +1816,6 @@
 #endif
 /* }}} */
 /* {{{ mail.c */
-#ifdef HAVE_SENDMAIL
 static
 ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
ZEND_ARG_INFO(0, addr)
@@ -1830,7 +1829,6 @@
ZEND_ARG_INFO(0, additional_headers)
ZEND_ARG_INFO(0, additional_parameters)
 ZEND_END_ARG_INFO()
-#endif
 /* }}} */
 /* {{{ math.c */
 static
@@ -3693,10 +3691,8 @@
PHP_FALIAS(diskfreespace,   disk_free_space,
arginfo_disk_free_space)
 
/* functions from mail.c */
-#ifdef HAVE_SENDMAIL
PHP_FE(mail,
arginfo_mail)
PHP_FE(ezmlm_hash,  
arginfo_ezmlm_hash)
-#endif
 
/* functions from syslog.c */
 #ifdef HAVE_SYSLOG_H
@@ -4944,14 +4940,9 @@
 
case 1: /*send an email */
{
-#if HAVE_SENDMAIL
if (!php_mail(opt, "PHP error_log message", 
message, headers, NULL TSRMLS_CC)) {
return FAILURE;
}
-#else
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Mail option not available!");
-   return FAILURE;
-#endif
}
break;
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.93&r2=1.94&diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.93 php-src/ext/standard/mail

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS acinclude.m4 /ext/mbstring mbstring.c /ext/standard basic_functions.c mail.c php_mail.h /main config.w32.h main.c /win32/build config.w32.h.in

2007-07-11 Thread Johannes Schl

johannesWed Jul 11 17:36:56 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS acinclude.m4 
/php-src/ext/mbstring   mbstring.c 
/php-src/ext/standard   basic_functions.c mail.c php_mail.h 
/php-src/main   config.w32.h main.c 
/php-src/win32/buildconfig.w32.h.in 
  Log:
  - MFH: Always enable mail() function
  http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.827&r2=1.2027.2.547.2.828&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.827 php-src/NEWS:1.2027.2.547.2.828
--- php-src/NEWS:1.2027.2.547.2.827 Wed Jul 11 12:18:13 2007
+++ php-src/NEWSWed Jul 11 17:36:55 2007
@@ -16,6 +16,7 @@
 
 - Changed error handler to send HTTP 500 instead of blank page on PHP errors.
   (Dmitry, Andrei Nigmatulin)
+- Changed mail() function to be always available. (Johannes)
 
 - Added persistent connection status checker to pdo_pgsql.
   (Elvis Pranskevichus, Ilia)
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.19&r2=1.332.2.14.2.20&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.19 
php-src/acinclude.m4:1.332.2.14.2.20
--- php-src/acinclude.m4:1.332.2.14.2.19Wed Jul 11 15:16:56 2007
+++ php-src/acinclude.m4Wed Jul 11 17:36:55 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.19 2007/07/11 15:16:56 jani Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.20 2007/07/11 17:36:55 johannes Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1991,9 +1991,6 @@
 AC_DEFUN([PHP_PROG_SENDMAIL], [
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
-  if test -n "$PROG_SENDMAIL"; then
-AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
-  fi
   PHP_SUBST(PROG_SENDMAIL)
 ])
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.22&r2=1.224.2.22.2.23&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.22 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.23
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.22 Wed Apr  4 15:25:41 2007
+++ php-src/ext/mbstring/mbstring.c Wed Jul 11 17:36:55 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.22 2007/04/04 15:25:41 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.23 2007/07/11 17:36:55 johannes Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -3297,7 +3297,6 @@
 /* {{{ proto int mb_send_mail(string to, string subject, string message [, 
string additional_headers [, string additional_parameters]])
  *  Sends an email message with MIME scheme
  */
-#if HAVE_SENDMAIL
 
 #define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || 
str[pos + 2] == '\t')) {\
@@ -3806,16 +3805,6 @@
 #undef PHP_MBSTR_MAIL_MIME_HEADER2
 #undef PHP_MBSTR_MAIL_MIME_HEADER3
 #undef PHP_MBSTR_MAIL_MIME_HEADER4
-
-#else  /* HAVE_SENDMAIL */
-
-PHP_FUNCTION(mb_send_mail)
-{
-   RETURN_FALSE;
-}
-
-#endif /* HAVE_SENDMAIL */
-
 /* }}} */
 
 /* {{{ proto mixed mb_get_info([string type])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.57&r2=1.725.2.31.2.58&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.57 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.58
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.57  Mon Jul  9 
17:27:24 2007
+++ php-src/ext/standard/basic_functions.c  Wed Jul 11 17:36:55 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.57 2007/07/09 17:27:24 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.58 2007/07/11 17:36:55 johannes Exp $ 
*/
 
 #include "php.h"
 #include "php_streams.h"
@@ -1830,7 +1830,6 @@
 #endif
 /* }}} */
 /* {{{ mail.c */
-#ifdef HAVE_SENDMAIL
 static
 ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
ZEND_ARG_INFO(0, addr)
@@ -1844,7 +1843,6 @@
ZEND_ARG_INFO(0, additional_headers)
ZEND_ARG_INFO(0, additional_parameters)
 ZEND_END_ARG_INFO()
-#endif
 /* }}} */
 /* {{{ math.c */
 static
@@ -3650,10 +3648,8 @@
PHP_FALIAS(diskfreespace,   disk_free_space,
arginfo_disk_free_space)
 
/* functions from mail.c */
-#ifdef HAVE_SENDMAIL
PHP_FE(mail,
arginfo_mail)
PHP_FE(ezmlm_hash,  
a

[PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests 008.phpt

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 16:47:30 2007 UTC

  Modified files:  
/php-src/ext/xmlreader  php_xmlreader.c 
/php-src/ext/xmlreader/tests008.phpt 
  Log:
  Unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.45 
php-src/ext/xmlreader/php_xmlreader.c:1.46
--- php-src/ext/xmlreader/php_xmlreader.c:1.45  Fri Jan 12 12:16:36 2007
+++ php-src/ext/xmlreader/php_xmlreader.c   Wed Jul 11 16:47:30 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_xmlreader.c,v 1.45 2007/01/12 12:16:36 tony2001 Exp $ */
+/* $Id: php_xmlreader.c,v 1.46 2007/07/11 16:47:30 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1094,16 +1094,22 @@
int source_len = 0, encoding_len = 0;
long options = 0;
xmlreader_object *intern = NULL;
-   char *source, *uri = NULL, *encoding = NULL;
+   zstr source;
+   char *uri = NULL, *encoding = NULL;
int resolved_path_len;
char *directory=NULL, resolved_path[MAXPATHLEN];
xmlParserInputBufferPtr inputbfr;
xmlTextReaderPtr reader = NULL;
+   zend_uchar source_type;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|s!l", &source, 
&source_len, &encoding, &encoding_len, &options) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|s!l", &source, 
&source_len, &source_type, &encoding, &encoding_len, &options) == FAILURE) {
return;
}
 
+   if (source_type == IS_UNICODE) {
+   source.s = php_libxml_unicode_to_string(source.u, source_len, 
&source_len TSRMLS_CC);
+   }
+
id = getThis();
if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), 
xmlreader_class_entry TSRMLS_CC)) {
id = NULL;
@@ -1118,7 +1124,11 @@
RETURN_FALSE;
}
 
-   inputbfr = xmlParserInputBufferCreateMem(source, source_len, 
XML_CHAR_ENCODING_NONE);
+   inputbfr = xmlParserInputBufferCreateMem(source.s, source_len, 
XML_CHAR_ENCODING_NONE);
+
+   if (source_type == IS_UNICODE) {
+   efree(source.s);
+   }
 
 if (inputbfr != NULL) {
 /* Get the URI of the current script so that we can set the base directory in 
libxml */
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/008.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/xmlreader/tests/008.phpt
diff -u php-src/ext/xmlreader/tests/008.phpt:1.3 
php-src/ext/xmlreader/tests/008.phpt:1.4
--- php-src/ext/xmlreader/tests/008.phpt:1.3Sat Aug  5 12:32:54 2006
+++ php-src/ext/xmlreader/tests/008.phptWed Jul 11 16:47:30 2007
@@ -4,7 +4,7 @@
 
 --FILE--
 
 
@@ -22,7 +22,7 @@
 
 ';
 
-$dtdfile = rawurlencode(dirname(__FILE__)) . b'/dtdexample.dtd'; 
+$dtdfile = rawurlencode((binary)dirname(__FILE__)) . b'/dtdexample.dtd'; 
 $file = dirname(__FILE__) . '/__008.xml';
 file_put_contents($file, $xmlstring);
 

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

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

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 15:52:44 2007 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.862&r2=1.863&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.862 
php-src/ext/standard/basic_functions.c:1.863
--- php-src/ext/standard/basic_functions.c:1.862Tue Jul  3 10:22:55 2007
+++ php-src/ext/standard/basic_functions.c  Wed Jul 11 15:52:44 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.862 2007/07/03 10:22:55 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.863 2007/07/11 15:52:44 dmitry Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -5030,8 +5030,8 @@
if (PG(last_error_message)) {
array_init(return_value);
add_ascii_assoc_long_ex(return_value, "type", sizeof("type"), 
PG(last_error_type));
-   add_ascii_assoc_string_ex(return_value, "message", 
sizeof("message"), PG(last_error_message), 1);
-   add_ascii_assoc_string_ex(return_value, "file", sizeof("file"), 
PG(last_error_file)?PG(last_error_file):"-", 1 );
+   add_ascii_assoc_rt_string_ex(return_value, "message", 
sizeof("message"), PG(last_error_message), 1);
+   add_ascii_assoc_rt_string_ex(return_value, "file", 
sizeof("file"), PG(last_error_file)?PG(last_error_file):"-", 1 );
add_ascii_assoc_long_ex(return_value, "line", sizeof("line"), 
PG(last_error_lineno));
}
 }

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_num_fields.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:51:48 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_num_fields.phpt 
  Log:
  Whitespace/CS only
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_num_fields.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_num_fields.phpt
diff -u php-src/ext/mysql/tests/mysql_num_fields.phpt:1.1 
php-src/ext/mysql/tests/mysql_num_fields.phpt:1.2
--- php-src/ext/mysql/tests/mysql_num_fields.phpt:1.1   Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_num_fields.phpt   Wed Jul 11 15:51:48 2007
@@ -2,48 +2,47 @@
 mysql_num_fields()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: mysql_num_fields(): %d is not a valid MySQL result resource in %s on 
line %d

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_list_processes.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:49:32 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_list_processes.phpt 
  Log:
  Whitespace/Coding Standards and check added for default connection.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_processes.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_processes.phpt
diff -u php-src/ext/mysql/tests/mysql_list_processes.phpt:1.1 
php-src/ext/mysql/tests/mysql_list_processes.phpt:1.2
--- php-src/ext/mysql/tests/mysql_list_processes.phpt:1.1   Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_list_processes.phpt   Wed Jul 11 15:49:32 2007
@@ -4,32 +4,46 @@
 
 --FILE--
 
 --EXPECTF--
-done!
+done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_list_fields.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:47:39 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_list_fields.phpt 
  Log:
  Whitespace only
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_fields.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_fields.phpt
diff -u php-src/ext/mysql/tests/mysql_list_fields.phpt:1.1 
php-src/ext/mysql/tests/mysql_list_fields.phpt:1.2
--- php-src/ext/mysql/tests/mysql_list_fields.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_list_fields.phpt  Wed Jul 11 15:47:38 2007
@@ -4,27 +4,26 @@
 
 --FILE--
 
 --EXPECTF--
-done!
+done!
\ No newline at end of file

-- 
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 count_chars.phpt

2007-07-11 Thread Johannes Schl

johannesWed Jul 11 15:46:20 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/strings count_chars.phpt 
  Log:
  Fix test for unicode mode
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/count_chars.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/count_chars.phpt
diff -u php-src/ext/standard/tests/strings/count_chars.phpt:1.2 
php-src/ext/standard/tests/strings/count_chars.phpt:1.3
--- php-src/ext/standard/tests/strings/count_chars.phpt:1.2 Wed May 19 
08:45:23 2004
+++ php-src/ext/standard/tests/strings/count_chars.phpt Wed Jul 11 15:46:20 2007
@@ -4,15 +4,80 @@
 
 --EXPECT--
 
12100030001202108320236222
-12131221832236222
+Array
+(
+[32] => 12
+[45] => 1
+[97] => 3
+[101] => 12
+[103] => 1
+[104] => 1
+[105] => 1
+[106] => 1
+[107] => 2
+[108] => 1
+[110] => 8
+[111] => 3
+[112] => 2
+[114] => 2
+[115] => 3
+[116] => 6
+[117] => 2
+[118] => 2
+[119] => 2
+)
 
0
  -aeghijklnoprstuvw
-1
+bool(true)
+--UEXPECTF--
+Warning: count_chars(): Only mode=1 is supported with Unicode strings in %s on 
line %d
+
+Warning: implode(): Argument to implode must be an array in %s on line %d
+
+Array
+(
+[h] => 1
+[e] => 12
+[t] => 6
+[ ] => 12
+[l] => 1
+[v] => 2
+[n] => 8
+[i] => 1
+[s] => 3
+[r] => 2
+[w] => 2
+[o] => 3
+[p] => 2
+[-] => 1
+[j] => 1
+[k] => 2
+[u] => 2
+[g] => 1
+[a] => 3
+)
+
+Warning: count_chars(): Only mode=1 is supported with Unicode strings in %s on 
line %d
+
+Warning: implode(): Argument to implode must be an array in %s on line %d
+
+
+Warning: count_chars(): Only mode=1 is supported with Unicode strings in %s on 
line %d
+
+
+Warning: count_chars(): Only mode=1 is supported with Unicode strings in %s on 
line %d
+bool(false)

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_field.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:26:08 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_field.phpt 
  Log:
  Whitespace and more testing.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_field.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_field.phpt  Wed Jul 11 15:26:07 2007
@@ -2,7 +2,6 @@
 mysql_fetch_field()
 --SKIPIF--
 
-
 --FILE--
  array(1, 'int'),
+'TINYINT'   => array(1, 'int'),
+'BOOL'  => array('true', 'int'),
+'SMALLINT'  => array(32767, 'int'),
+'MEDIUMINT' => array(8388607, 'int'),
+'INT'   => array(100, 'int'),
+'BIGINT'=> array(100, 'int'),
+'FLOAT' => array(100, 'real'),
+'DOUBLE'=> array(100, 'real'),
+'DECIMAL'   => array(100, 'real'),
+'DATE'  => array(@date('Y-m-d'), 'date'),
+'DATETIME'  => array(@date('Y-m-d H:i:s'), 
'datetime'),
+'TIMESTAMP' => array(@date('Y-m-d H:i:s'), 
'timestamp'),
+'TIME'  => array(@date('H:i:s'), 'time'),
+'YEAR'  => array(@date('Y'), 'year'),
+'CHAR(1)'   => array('a', 'string'),
+'VARCHAR(1)'=> array('a', 'string'),
+'BINARY(1)' => array('a', 'string'),
+'VARBINARY(1)'  => array('a', 'string'),
+'TINYBLOB'  => array('a', 'blob'),
+'TINYTEXT'  => array('a', 'blob'),
+'BLOB'  => array('a', 'blob'),
+'TEXT'  => array('a', 'blob'),
+'MEDIUMBLOB'=> array('a', 'blob'),
+'MEDIUMTEXT'=> array('a', 'blob'),
+'LONGBLOB'  => array('a', 'blob'),
+'LONGTEXT'  => array('a', 'blob'),
+'ENUM("a", "b")'=> array('a', 'string'), /* !!! */
+'SET("a", "b")' => array('a', 'string'), /* !!! */
+  );
+  
+foreach ($types as $type_name => $type_desc) {
+if (!mysql_query("DROP TABLE IF EXISTS test", $link))
+printf("[008/%s] [%d] %s\n", $type_name, mysql_errno($link), 
mysql_error($link));
+if (!mysql_query(sprintf("CREATE TABLE test(id INT, label %s) ENGINE = 
%s", $type_name, $engine), $link)) {
+// server and/or engine might not support the data type
+continue;
+}
+if (!mysql_query(sprintf("INSERT INTO test(id, label) VALUES (1, 
'%s')", $type_desc[0]), $link)) {
+printf("[009/%s] [%d] %s\n", $type_name, mysql_errno($link), 
mysql_error($link));
+continue;
+}
+if (!$res = mysql_query("SELECT id, label FROM test", $link)) {
+printf("[010/%s] [%d] %s\n", $type_name, mysql_errno($link), 
mysql_error($link));
+continue;
+}
+if (!$tmp = mysql_fetch_field($res, 1)) {
+printf("[011/%s] [%d] %s\n", $type_name, mysql_errno($link), 
mysql_error($link));
+}
+
+if ($type_desc[1] != $tmp->type) {
+printf("[012/%s] Expecting type '%s' got '%s'\n", $type_name, 
$type_desc[1], $tmp->type);
+}
+mysql_free_result($res);
+}
 
 mysql_close($link);
 print "done!";
@@ -93,6 +164,8 @@
 }
 bool(false)
 
+Warning: mysql_fetch_field(): Bad field offset in %s on line %d
+
 Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on 
line %d
 done!
 --UEXPECTF--
@@ -154,5 +227,7 @@
 }
 bool(false)
 
+Warning: mysql_fetch_field(): Bad field offset in %s on line %d
+
 Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on 
line %d
 done!

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

[PHP-CVS] cvs: php-src /main/streams memory.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 15:17:59 2007 UTC

  Modified files:  
/php-src/main/streams   memory.c 
  Log:
  Unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.34&r2=1.35&diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.34 php-src/main/streams/memory.c:1.35
--- php-src/main/streams/memory.c:1.34  Thu Feb 22 23:25:36 2007
+++ php-src/main/streams/memory.c   Wed Jul 11 15:17:59 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: memory.c,v 1.34 2007/02/22 23:25:36 helly Exp $ */
+/* $Id: memory.c,v 1.35 2007/07/11 15:17:59 dmitry Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -640,11 +640,11 @@
MAKE_STD_ZVAL(meta);
array_init(meta);
if (!semi) { /* there is only a mime type */
-   add_ascii_assoc_stringl(meta, "mediatype", path, mlen, 
1);
+   add_ascii_assoc_ascii_stringl(meta, "mediatype", path, 
mlen, 1);
mlen = 0;
} else if (sep && sep < semi) { /* there is a mime type */
plen = semi - path;
-   add_ascii_assoc_stringl(meta, "mediatype", path, plen, 
1);
+   add_ascii_assoc_ascii_stringl(meta, "mediatype", path, 
plen, 1);
mlen -= plen;
path += plen;
} else if (semi != path || mlen != sizeof(";base64")-1 || 
memcmp(path, ";base64", sizeof(";base64")-1)) { /* must be error since 
parameters are only allowed after mediatype */
@@ -674,7 +674,7 @@
plen = sep - path;
vlen = (semi ? semi - sep : mlen - plen) - 1 /* '=' */;
key = estrndup(path, plen);
-   add_rt_assoc_stringl_ex(meta, key, plen + 1, sep + 1, 
vlen, 1);
+   add_rt_assoc_rt_stringl_ex(meta, key, plen + 1, sep + 
1, vlen, 1);
efree(key);
plen += vlen + 1;
mlen -= plen;

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_insert_id.phpt mysql_list_dbs.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:17:47 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_insert_id.phpt mysql_list_dbs.phpt 
  Log:
  Whitespace and new checks for default connection.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_insert_id.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_insert_id.phpt
diff -u php-src/ext/mysql/tests/mysql_insert_id.phpt:1.1 
php-src/ext/mysql/tests/mysql_insert_id.phpt:1.2
--- php-src/ext/mysql/tests/mysql_insert_id.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_insert_id.phptWed Jul 11 15:17:47 2007
@@ -2,53 +2,60 @@
 mysql_insert_id()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: mysql_insert_id(): %d is not a valid MySQL-Link resource in %s on 
line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_list_dbs.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_list_dbs.phpt
diff -u php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.1 
php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.2
--- php-src/ext/mysql/tests/mysql_list_dbs.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_list_dbs.phpt Wed Jul 11 15:17:47 2007
@@ -4,35 +4,44 @@
 
 --FILE--
 
 --EXPECTF--
 done!

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_info.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:13:10 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_info.phpt 
  Log:
  Whitespace only
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_info.phpt
diff -u php-src/ext/mysql/tests/mysql_info.phpt:1.1 
php-src/ext/mysql/tests/mysql_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_info.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_info.phpt Wed Jul 11 15:13:10 2007
@@ -2,66 +2,65 @@
 mysql_info()
 --SKIPIF--
 
-
 --FILE--
 = 100', 
$link))
-printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
-
-if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
-printf("[012] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);
-
-if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
-printf("[013] Expecting Unicode!\n");
-var_inspect($info);
-}
-
-if (!is_string($def_tmp = mysql_info()) || ('' == $def_tmp))
-printf("[014] Expecting string/any_non_empty, got %s/%s\n", 
gettype($def_tmp), $def_tmp);  
-
-if ($def_tmp !== $tmp) {
-printf("[015] Results differ for default link and specified link, [%d] 
%s\n",
-mysql_errno(), mysql_error());
-var_inspect($tmp);
-var_inspect($def_tmp);
-}
-
-// NOTE: no LOAD DATA INFILE test
+include "connect.inc";
 
-print "done!";
+if (false !== ($tmp = @mysql_info()))
+   printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), 
$tmp);
+
+if (NULL !== ($tmp = @mysql_info(NULL)))
+   printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!$res = mysql_query('INSERT INTO test(id, label) VALUES (100, "a")', 
$link))
+   printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_info($link)))
+   printf("[004] Expecting boolean/false, got %s/%s\n", gettype($tmp), 
$tmp);
+
+if (!$res = mysql_query('INSERT INTO test(id, label) VALUES (101, "a"), (102, 
"b")', $link))
+   printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+   printf("[006] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);
+
+if (!$res = mysql_query('INSERT INTO test(id, label) SELECT id + 200, label 
FROM test', $link))
+   printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+   printf("[008] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);
+
+if (!$res = mysql_query('ALTER TABLE test MODIFY label CHAR(2)', $link))
+   printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+   printf("[010] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);
+
+if (!$res = mysql_query('UPDATE test SET label = "b" WHERE id >= 100', $link))
+   printf("[011] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!is_string($tmp = mysql_info($link)) || ('' == $tmp))
+   printf("[012] Expecting string/any_non_empty, got %s/%s\n", 
gettype($tmp), $tmp);
+
+if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
+   printf("[013] Expecting Unicode!\n");
+   var_inspect($info);
+}
+
+if (!is_string($def_tmp = mysql_info()) || ('' == $def_tmp))
+   printf("[014] Expecting string/any_non_empty, got %s/%s\n", 
gettype($def_tmp), $def_tmp);
+
+if ($def_tmp !== $tmp) {
+   printf("[015] Results differ for default link and specified link, [%d] 
%s\n",
+   mysql_errno(), mysql_error());
+   var_inspect($tmp);
+   var_inspect($def_tmp);
+}
+
+// NOTE: no LOAD DATA INFILE test
+
+print "done!";
 ?>
 --EXPECTF--
 done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_get_host_info.phpt mysql_get_proto_info.phpt mysql_get_server_info.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 15:07:29 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_get_host_info.phpt 
mysql_get_server_info.phpt 
mysql_get_proto_info.phpt 
  Log:
  Mainly Whitespace/CS changes. Partly "too many arguments" check added.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_host_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_host_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.1 
php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.1Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_host_info.phptWed Jul 11 15:07:28 2007
@@ -4,30 +4,34 @@
 
 --FILE--
 
 --EXPECTF--
 done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_server_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_server_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.1 
php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.1  Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_server_info.phpt  Wed Jul 11 15:07:28 2007
@@ -2,33 +2,35 @@
 mysql_get_server_info()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_proto_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_proto_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.1 
php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.1   Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_proto_info.phpt   Wed Jul 11 15:07:28 2007
@@ -2,19 +2,26 @@
 mysql_get_proto_info()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 done!

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_free_result.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:44:18 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_free_result.phpt 
  Log:
  Whitespace/Coding Standards and new check what happens if one tries to 
  free not a mysql resource but a file resource.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_free_result.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_free_result.phpt
diff -u php-src/ext/mysql/tests/mysql_free_result.phpt:1.1 
php-src/ext/mysql/tests/mysql_free_result.phpt:1.2
--- php-src/ext/mysql/tests/mysql_free_result.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_free_result.phpt  Wed Jul 11 14:44:18 2007
@@ -2,30 +2,39 @@
 mysql_free_result()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 bool(true)

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_field_type.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:41:54 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_field_type.phpt 
  Log:
  Whitespace/Coding Standard
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_type.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_type.phpt
diff -u php-src/ext/mysql/tests/mysql_field_type.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_type.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_type.phpt:1.1   Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_type.phpt   Wed Jul 11 14:41:54 2007
@@ -2,42 +2,41 @@
 mysql_field_type()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: Wrong parameter count for mysql_field_type() in %s on line %d

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_field_name.phpt mysql_field_seek.phpt mysql_field_table.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:36:26 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_field_name.phpt 
mysql_field_seek.phpt 
mysql_field_table.phpt 
  Log:
  Removing reference to skipifemb.inc which is not needed and 
  Whitespace/Coding Standards.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_name.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_name.phpt
diff -u php-src/ext/mysql/tests/mysql_field_name.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_name.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_name.phpt:1.1   Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_name.phpt   Wed Jul 11 14:36:26 2007
@@ -2,42 +2,41 @@
 mysql_field_name()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: Wrong parameter count for mysql_field_name() in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_seek.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_seek.phpt
diff -u php-src/ext/mysql/tests/mysql_field_seek.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_seek.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_seek.phpt:1.1   Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_seek.phpt   Wed Jul 11 14:36:26 2007
@@ -2,40 +2,39 @@
 mysql_field_seek()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in 
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_table.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_table.phpt
diff -u php-src/ext/mysql/tests/mysql_field_table.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_table.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_table.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_table.phpt  Wed Jul 11 14:36:26 2007
@@ -2,42 +2,41 @@
 mysql_field_table()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: Wrong parameter count for mysql_field_table() in %s on line %d

-- 
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) /main/streams streams.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 14:33:30 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main/streams   streams.c 
  Log:
  Fixed wrong warning
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.15&r2=1.82.2.6.2.16&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.15 
php-src/main/streams/streams.c:1.82.2.6.2.16
--- php-src/main/streams/streams.c:1.82.2.6.2.15Tue Jul 10 11:57:34 2007
+++ php-src/main/streams/streams.c  Wed Jul 11 14:33:30 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.82.2.6.2.15 2007/07/10 11:57:34 dmitry Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.16 2007/07/11 14:33:30 dmitry Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1557,7 +1557,7 @@
 #ifdef PHP_WIN32
if (localhost == 0 && path[n+3] != '\0' && path[n+3] != 
'/' && path[n+4] != ':'){
 #else
-   if (localhost == 0 && path[n+3] != '/') {
+   if (localhost == 0 && path[n+3] != '\0' && path[n+3] != 
'/') {
 #endif
if (options & REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "remote host file access not supported, %s", path);

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

[PHP-CVS] cvs: php-src /main/streams streams.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 14:32:54 2007 UTC

  Modified files:  
/php-src/main/streams   streams.c 
  Log:
  Fixed wrong warning
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.152&r2=1.153&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.152 
php-src/main/streams/streams.c:1.153
--- php-src/main/streams/streams.c:1.152Tue Jul  3 10:22:55 2007
+++ php-src/main/streams/streams.c  Wed Jul 11 14:32:54 2007
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.152 2007/07/03 10:22:55 dmitry Exp $ */
+/* $Id: streams.c,v 1.153 2007/07/11 14:32:54 dmitry Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -2113,7 +2113,7 @@
 #ifdef PHP_WIN32
if (localhost == 0 && path[n+3] != '\0' && path[n+3] != 
'/' && path[n+4] != ':'){
 #else
-   if (localhost == 0 && path[n+3] != '/') {
+   if (localhost == 0 && path[n+3] != '\0' && path[n+3] != 
'/') {
 #endif
if (options & REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "remote host file access not supported, %s", path);

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_field_len.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:28:22 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_field_len.phpt 
  Log:
  Whitespace and the usual suspect: skipifemb.inc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_len.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_len.phpt
diff -u php-src/ext/mysql/tests/mysql_field_len.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_len.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_len.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_len.phptWed Jul 11 14:28:22 2007
@@ -2,43 +2,42 @@
 mysql_field_len()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: Wrong parameter count for mysql_field_len() in %s on line %d

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_field_flags.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 14:11:19 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_field_flags.phpt 
  Log:
  Whitespace/Coding Standards, removal of skipifemb.inc, improved testing
  and checking for expected field types.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_flags.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_field_flags.phpt
diff -u php-src/ext/mysql/tests/mysql_field_flags.phpt:1.1 
php-src/ext/mysql/tests/mysql_field_flags.phpt:1.2
--- php-src/ext/mysql/tests/mysql_field_flags.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_field_flags.phpt  Wed Jul 11 14:11:18 2007
@@ -2,48 +2,135 @@
 mysql_field_flags()
 --SKIPIF--
 
-
 --FILE--
   array(
+   array('label', 
'1'),
+   'label' => 
array(($version < 500) ? 'multiple_key' : 'unique_key')
+   ),
+   'labela INT, label2 CHAR(1), KEY keyname (labela, label2)'  =>  
array(
+   array('labela, 
label2', '1, "a"'),
+   'labela' => 
array('multiple_key'),
+   ),
+   'label1 BLOB'   =>  array(
+   array('label1', 
'"blob"'),
+   'label1' => 
array('blob', 'binary'),
+   ),
+   'label1 INT UNSIGNED'   =>  array(
+   array('label1', 
'100'),
+   'label1' => 
array('unsigned'),
+   ),
+   'label1 INT UNSIGNED NOT NULL AUTO INCREMENT'   =>  array(
+   array('label1', 
'100'),
+   'label1' => 
array('auto_increment',
+   
'unsigned'),
+   ),
+   'label1 ENUM("a", "b")' =>  array(
+   array('label1', 
'"a"'),
+   'label1' => 
array('enum'),
+   ),
+   'label1 SET("a", "b")'  =>  array(
+   array('label1', 
'"a"'),
+   'label1' => 
array('set'),
+   ),
+   'label1 TIMESTAMP'  =>  array(
+   array('label1', 
sprintf('"%s"', @date("Y-m-d H:i:s"))),
+   'label1' => 
array(
+   
'timestamp',
+   
'unsigned',
+   
'zerofill',
+   
'binary',
+   
'not_null'),
+   ),
+);
+
+foreach ($tables as $columns => $expected) {
+   if (!mysql_query("DROP TABLE IF EXISTS test", $link)) {
+   printf("[010/%s] [%d] %s\n", $columns, mysql_errno($link), 
mysql_error($link));
+   continue;
+   }
+   $sql = sprintf("CREATE TABLE test(id INT, %s) ENGINE = %s", $columns, 
$engine);
+   if ([EMAIL PROTECTED]($sql, $link)) {
+   // server or engine might not support this
+   continue;
+   }
+
+   reset($expected);
+   list($k, $values) = each($expected);
+   $sql = sprintf("INSERT INTO test(id, %s) VALUES (1, %s)", $values[0], 
$values[1]);
+   if (!mysql_query($sql, $link)) {
+   printf("[011/%s] '%s', [%d] %s\n", $columns, $sql, 
mysql_errno($link), mysql_error($link));
+   continue;
+   }
+
+   if (!$res = mysql_query(sprintf("SELECT id, %s FROM test", $values[0]), 
$link)) {
+   printf("[012/%s] [%d] %s\n", $columns, mysql_errno($link), 
mysql_error($link));
+   con

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_object.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 13:56:37 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_object.phpt 
  Log:
  Whitespace/Coding Standards, removing reference to skipifemb.inc, 
  tweaking EXPECTF.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_object.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_object.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_object.phpt Wed Jul 11 13:56:37 2007
@@ -2,69 +2,68 @@
 mysql_fetch_object()
 --SKIPIF--
 
-
 --FILE--
 a = $a;
-$this->b = $b;
-}
-
-}
-
-var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', null));  
  
-var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', 
array('a')));
-var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', 
array('a', 'b')));
-var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', 
array('a', 'b', 'c')));
-var_dump(mysql_fetch_object($res));
-
-mysql_free_result($res); 
-
-if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST", 
$link)) {
-printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
-}
-
-mysql_free_result($res);
-
-var_dump(mysql_fetch_object($res));
-
-// Fatal error, script execution will end
-var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));   
-
-mysql_close($link);
-print "done!";
+if (false !== ($tmp = @mysql_fetch_object($link)))
+   printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), 
$tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id 
LIMIT 5", $link)) {
+   printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_fetch_object($res));
+
+class mysql_fetch_object_test {
+
+   public $a = null;
+   public $b = null;
+
+   public function toString() {
+   var_dump($this);
+   }
+}
+
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test'));
+
+class mysql_fetch_object_construct extends mysql_fetch_object_test {
+
+   public function __construct($a, $b) {
+   $this->a = $a;
+   $this->b = $b;
+   }
+
+}
+
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', null));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 
'b')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 
'b', 'c')));
+var_dump(mysql_fetch_object($res));
+
+mysql_free_result($res);
+
+if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST", $link)) {
+   printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_object($res));
+
+// Fatal error, script execution will end
+var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));
+
+mysql_close($link);
+print "done!";
 ?>
 --EXPECTF--
 object(stdClass)#%d (2) {
@@ -91,7 +90,7 @@
 Notice: Undefined variable: a in %s on line %d
 
 Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   NULL
   ["b"]=>
@@ -105,7 +104,7 @@
 Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in 
%s on line %d
 
 Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   string(1) "a"
   ["b"]=>
@@ -115,7 +114,7 @@
   ["label"]=>
   string(1) "d"
 }
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   string(1) "a"
   ["b"]=>
@@ -157,7 +156,7 @@
 Notice: Undefined variable: a in %s on line %d
 
 Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   [u"a"]=>
   NULL
   [u"b"]=>
@@ -171,7 +170,7 @@
 Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in 
%s on line %d
 
 Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   [u"a"]=>
   unicode(1) "a"
   [u"b"]=>
@@ -181,7 +180,7 @@
   [u"label"]=>
   unicode(1) "d"
 }
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   [u"a"]=>
   unicode(1) "a"
   [u"b"]=>

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_lengths.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 13:51:32 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_lengths.phpt 
  Log:
  Whitespace. Removing reference to skipifemb.inc.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_lengths.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_lengths.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.1Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_lengths.phptWed Jul 11 13:51:31 2007
@@ -2,35 +2,34 @@
 mysql_fetch_lengths()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 array(2) {
@@ -43,4 +42,4 @@
 
 Warning: mysql_fetch_lengths(): %d is not a valid MySQL result resource in %s 
on line %d
 bool(false)
-done! 
\ No newline at end of file
+done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_array.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 13:36:11 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_array.phpt 
  Log:
  Aside from whitespace / coding standards this one is more interesting.
  We added a flag to check if a MySQL column type is a binary type. If so,
  ext/mysql should return data for such columns not as unicode strings but
  as binary strings if unicode.semantics is on.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_array.phpt  Wed Jul 11 13:36:11 2007
@@ -4,266 +4,275 @@
 
 --FILE--
 
 --EXPECTF--
 [005]

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_assoc.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 13:29:41 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_fetch_assoc.phpt 
  Log:
  Whitespace / Coding Standards
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt
diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.1 
php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2
--- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt  Wed Jul 11 13:29:41 2007
@@ -2,49 +2,48 @@
 mysql_fetch_assoc()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 [005]
@@ -97,4 +96,4 @@
 }
 
 Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on 
line %d
-done!
+done!
\ No newline at end of file

-- 
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/reflection php_reflection.c

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 13:27:49 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c 
  Log:
  MFH: fix copy/paste type and bug #41962
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.39&r2=1.164.2.33.2.40&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.39 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.40
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.39 Tue May 29 
08:44:05 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jul 11 13:27:49 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.39 2007/05/29 08:44:05 helly Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.40 2007/07/11 13:27:49 tony2001 Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3616,7 +3616,7 @@
case IS_STRING:
if (zend_lookup_class(Z_STRVAL_P(class_name), 
Z_STRLEN_P(class_name), &pce TSRMLS_CC) == FAILURE) {

zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
-   "Interface %s does not exist", 
Z_STRVAL_P(class_name));
+   "Class %s does not exist", 
Z_STRVAL_P(class_name));
return;
}
class_ce = *pce;
@@ -4878,7 +4878,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
 
-   php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.33.2.39 2007/05/29 08:44:05 helly Exp $");
+   php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.33.2.40 2007/07/11 13:27:49 tony2001 Exp $");
 
php_info_print_table_end();
 } /* }}} */

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

[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c

2007-07-11 Thread Antony Dovgal

tony2001Wed Jul 11 13:26:47 2007 UTC

  Modified files:  
/php-src/ext/reflection php_reflection.c 
  Log:
  fix typo and bug #41962
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.276&r2=1.277&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.276 
php-src/ext/reflection/php_reflection.c:1.277
--- php-src/ext/reflection/php_reflection.c:1.276   Fri Jul  6 12:11:20 2007
+++ php-src/ext/reflection/php_reflection.c Wed Jul 11 13:26:47 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_reflection.c,v 1.276 2007/07/06 12:11:20 tony2001 Exp $ */
+/* $Id: php_reflection.c,v 1.277 2007/07/11 13:26:47 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3697,7 +3697,7 @@
case IS_UNICODE:
if (zend_u_lookup_class(Z_TYPE_P(class_name), 
Z_UNIVAL_P(class_name), Z_UNILEN_P(class_name), &pce TSRMLS_CC) == FAILURE) {

zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, 
-   "Interface %R does not exist", 
Z_TYPE_P(class_name), Z_UNIVAL_P(class_name));
+   "Class %R does not exist", 
Z_TYPE_P(class_name), Z_UNIVAL_P(class_name));
return;
}
class_ce = *pce;
@@ -4998,7 +4998,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
 
-   php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.276 
2007/07/06 12:11:20 tony2001 Exp $");
+   php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.277 
2007/07/11 13:26:47 tony2001 Exp $");
 
php_info_print_table_end();
 } /* }}} */

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_escape_string.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 13:22:17 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_escape_string.phpt 
  Log:
  1) Whitespace / Coding Standards
  2) Don't even dare to have variables that sound like connection parameters 
and don't come from connect.inc
  3) skipifem.inc is not there for ext/mysql tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_escape_string.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_escape_string.phpt
diff -u php-src/ext/mysql/tests/mysql_escape_string.phpt:1.1 
php-src/ext/mysql/tests/mysql_escape_string.phpt:1.2
--- php-src/ext/mysql/tests/mysql_escape_string.phpt:1.1Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_escape_string.phptWed Jul 11 13:22:17 2007
@@ -2,27 +2,25 @@
 mysql_escape_string()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 string(31) "Am I a unicode string in PHP 6?"

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_errno.phpt mysql_error.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 12:57:57 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_error.phpt mysql_errno.phpt 
  Log:
  Whitespace/Coding Standards.
  The tests origin from ext/mysqli/tests. ext/mysqli/tests should have a 
  skipifemb.inc, which is not needed and not available for ext/mysql/tests.
  Nevertheless the tests tried to include that file.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_error.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_error.phpt
diff -u php-src/ext/mysql/tests/mysql_error.phpt:1.1 
php-src/ext/mysql/tests/mysql_error.phpt:1.2
--- php-src/ext/mysql/tests/mysql_error.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_error.phptWed Jul 11 12:57:57 2007
@@ -2,48 +2,57 @@
 mysql_error()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: mysql_error(): %d is not a valid MySQL-Link resource in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_errno.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_errno.phpt
diff -u php-src/ext/mysql/tests/mysql_errno.phpt:1.1 
php-src/ext/mysql/tests/mysql_errno.phpt:1.2
--- php-src/ext/mysql/tests/mysql_errno.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_errno.phptWed Jul 11 12:57:57 2007
@@ -2,39 +2,46 @@
 mysql_errno()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 int(0)
@@ -42,4 +49,5 @@
 
 Warning: mysql_errno(): %d is not a valid MySQL-Link resource in %s on line %d
 bool(false)
+int(%d)
 done!
\ No newline at end of file

-- 
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/array extract.phpt /ext/standard/tests/file flock_error.phpt

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 12:57:55 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/array   extract.phpt 
/php-src/ext/standard/tests/fileflock_error.phpt 
  Log:
  Fixed tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/extract.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/array/extract.phpt
diff -u php-src/ext/standard/tests/array/extract.phpt:1.2 
php-src/ext/standard/tests/array/extract.phpt:1.3
--- php-src/ext/standard/tests/array/extract.phpt:1.2   Sat May 12 11:20:52 2007
+++ php-src/ext/standard/tests/array/extract.phpt   Wed Jul 11 12:57:55 2007
@@ -131,7 +131,7 @@
 Warning: extract() expects parameter 1 to be array, integer given in %s on 
line %d
 NULL
 
-Warning: extract() expects parameter 1 to be array, string given in %s on line 
%d
+Warning: extract() expects parameter 1 to be array, %s given in %s on line %d
 NULL
 
 Warning: extract() expects at most 3 parameters, 4 given in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_error.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/flock_error.phpt
diff -u php-src/ext/standard/tests/file/flock_error.phpt:1.2 
php-src/ext/standard/tests/file/flock_error.phpt:1.3
--- php-src/ext/standard/tests/file/flock_error.phpt:1.2Fri May 25 
13:50:06 2007
+++ php-src/ext/standard/tests/file/flock_error.phptWed Jul 11 12:57:55 2007
@@ -148,8 +148,10 @@
 NULL
 
 --- Iteration 8 ---
-Warning: flock() expects parameter 2 to be long, Unicode string given in %s on 
line %d
-NULL
+Notice: A non well formed numeric value encountered in %s on line %d
+
+Warning: flock(): Illegal operation argument in %s on line %d
+bool(false)
 
 Warning: flock(): 6 is not a valid stream resource in %s on line %d
 bool(false)

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_connect.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 12:26:21 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_connect.phpt 
  Log:
  Mostly whitespace (replacing spaces with tab). Additional, weak test for 
  "host:port:socket" syntax, just to make sure we cover the underlying
  C code.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_connect.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_connect.phpt
diff -u php-src/ext/mysql/tests/mysql_connect.phpt:1.1 
php-src/ext/mysql/tests/mysql_connect.phpt:1.2
--- php-src/ext/mysql/tests/mysql_connect.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_connect.phpt  Wed Jul 11 12:26:21 2007
@@ -4,69 +4,95 @@
 
 --FILE--
 
 --EXPECTF--
 Warning: mysql_connect(): Access denied for user '%s'@'%s' (using password: 
YES) in %s on line %d
-done!
+done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_db_query.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 12:50:35 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_db_query.phpt 
  Log:
  Whitespace/Coding Standards.
  Test for default link added.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_query.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_query.phpt
diff -u php-src/ext/mysql/tests/mysql_db_query.phpt:1.1 
php-src/ext/mysql/tests/mysql_db_query.phpt:1.2
--- php-src/ext/mysql/tests/mysql_db_query.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_db_query.phpt Wed Jul 11 12:50:34 2007
@@ -4,40 +4,55 @@
 
 --FILE--
 
 --EXPECTF--
 done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_create_db.phpt mysql_data_seek.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 12:28:47 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_create_db.phpt mysql_data_seek.phpt 
  Log:
  Should be whitespace/coding standards changes only.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_create_db.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_create_db.phpt
diff -u php-src/ext/mysql/tests/mysql_create_db.phpt:1.1 
php-src/ext/mysql/tests/mysql_create_db.phpt:1.2
--- php-src/ext/mysql/tests/mysql_create_db.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_create_db.phptWed Jul 11 12:28:46 2007
@@ -1,44 +1,44 @@
 --TEST--
 mysql_create_db()
 --SKIPIF--
-
 --FILE--
 
 --EXPECTF--
 done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_data_seek.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_data_seek.phpt
diff -u php-src/ext/mysql/tests/mysql_data_seek.phpt:1.1 
php-src/ext/mysql/tests/mysql_data_seek.phpt:1.2
--- php-src/ext/mysql/tests/mysql_data_seek.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_data_seek.phptWed Jul 11 12:28:46 2007
@@ -2,63 +2,62 @@
 mysql_data_seek()
 --SKIPIF--
 
-
 --FILE--
 
 --EXPECTF--
 Warning: mysql_data_seek(): Offset 4 is invalid for MySQL result index %d (or 
the query data is unbuffered) in %s on line %d

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_db_name.phpt mysql_drop_db.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 12:47:23 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_db_name.phpt mysql_drop_db.phpt 
  Log:
  Those two should be whitespace / coding standards only. However, in some of
  my commit messages I might be wrong, it's hard to say what we added to the
  tests and I might miss this or that little detail, although I check the diff
  before commit.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_name.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_name.phpt
diff -u php-src/ext/mysql/tests/mysql_db_name.phpt:1.1 
php-src/ext/mysql/tests/mysql_db_name.phpt:1.2
--- php-src/ext/mysql/tests/mysql_db_name.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_db_name.phpt  Wed Jul 11 12:47:23 2007
@@ -4,57 +4,55 @@
 
 --FILE--
 
 --EXPECTF--
 Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in 
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_drop_db.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_drop_db.phpt
diff -u php-src/ext/mysql/tests/mysql_drop_db.phpt:1.1 
php-src/ext/mysql/tests/mysql_drop_db.phpt:1.2
--- php-src/ext/mysql/tests/mysql_drop_db.phpt:1.1  Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_drop_db.phpt  Wed Jul 11 12:47:23 2007
@@ -1,43 +1,43 @@
 --TEST--
 mysql_drop_db()
 --SKIPIF--
-
 --FILE--
 
 --EXPECTF--
-done!
+done!
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_affected_rows.phpt mysql_client_encoding.phpt mysql_close.phpt

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 11:57:45 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsmysql_affected_rows.phpt 
mysql_client_encoding.phpt 
mysql_close.phpt 
  Log:
  Whitespace: replacing spaces with tab to follow coding conventions.
  
  One tiny change in mysql_close.phpt: don't overrule connection parameter 
  in any of the tests. Alway take connection parameter, including the database 
  name ($db), from connect.inc.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_affected_rows.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/mysql_affected_rows.phpt
diff -u php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.2 
php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.3
--- php-src/ext/mysql/tests/mysql_affected_rows.phpt:1.2Tue May 29 
12:01:14 2007
+++ php-src/ext/mysql/tests/mysql_affected_rows.phptWed Jul 11 11:57:45 2007
@@ -4,111 +4,114 @@
 
 --FILE--
 
 --EXPECTF--
-done! 
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_client_encoding.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_client_encoding.phpt
diff -u php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.1 
php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.2
--- php-src/ext/mysql/tests/mysql_client_encoding.phpt:1.1  Sun Nov 19 
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_client_encoding.phpt  Wed Jul 11 11:57:45 2007
@@ -4,65 +4,64 @@
 
 --FILE--
 http://bugs.mysql.com/bug.php?id=7923\n";);
-} else {
-printf("[009] Check manually, watch out for unicode and others\n");
-var_dump($link_enc);
-var_dump($tmp);
-}
-}
-
-if (ini_get('unicode.semantics') && function_exists('is_unicode')) {
-// unicode mode
-if (!is_unicode($default_link_enc) || !is_unicode($link_enc)) {
-printf("[010] No unicode returned!\n");
-var_dump($default_link_enc);
-var_dump($link_enc);
-}   
-
-}   
-
-mysql_close($link); 
-
-if (false !== ($tmp = @mysql_client_encoding($link)))
-printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), 
$tmp);
-
-print "done!";
+include_once "connect.inc";
+
+$tmp= NULL;
+$link   = NULL;
+
+if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
+   printf("[002] Cannot connect to the server using host=%s, user=%s, 
passwd=***, dbname=%s, port=%s, socket=%s\n",
+   $host, $user, $db, $port, $socket);
+
+$default_link_enc = mysql_client_encoding();
+$link_enc = mysql_client_encoding($link);
+
+if ($default_link_enc !== $link_enc)
+   printf("[003] %s != %s, [%d] %s\n", $default_link_enc, $link_enc, 
mysql_errno($link), mysql_error($link));
+
+if (!$res = mysql_query('SELECT version() AS server_version', $link))
+   printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+$tmp = mysql_fetch_assoc($res);
+mysql_free_result($res);
+$version = explode('.', $tmp['server_version']);
+if (empty($version))
+   printf("[005] Cannot determine server version, need MySQL Server 4.1+ 
for the test!\n");
+
+if ($version[0] <= 4 && $version[1] < 1)
+   printf("[006] Need MySQL Server 4.1+ for the test!\n");
+
+if (!$res = mysql_query('SELECT @@character_set_connection AS charset, 
@@collation_connection AS collation', $link))
+   printf("[007] [%d] %s\n", mysql_errno($link), mysql_error($link));
+$tmp = mysql_fetch_assoc($res);
+mysql_free_result($res);
+if (!$tmp['charset'])
+   printf("[008] Cannot determine current character set and collation\n");
+
+if ($link_enc !== $tmp['charset']) {
+   if ($link_enc === $tmp['collation']) {
+   printf("[009] Known bug, collation instead of chatset returned, 
http://bugs.mysql.com/bug.php?id=7923\n";);
+   } else {
+   printf("[009] Check manually, watch out for unicode and 
others\n");
+   var_dump($link_enc);
+   var_dump($tmp);
+   }
+}
+
+if (ini_get('unicode.semantics') && function_exists('is_unicode')) {
+// unicode mode
+   if (!is_unicode($default_link_enc) || !is_unicode($link_enc)) {
+   printf("[010] No unicode returned!\n");
+   var_dump($default_link_enc);
+   var_dump($link_enc);
+   }
+}
+
+mysql_close($link);
+
+if (false !== ($tmp = @mysql_client_encoding($link)))
+   printf("[012] Expecting boolean/false, got %s/%s\n", gettype($tmp), 
$tmp);
+
+print "done!";
 ?>
 --EXPECTF--
 done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_close.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_close.phpt
diff -u php-src/ext/mysql/tests/mysql_close.phpt:1.1 
php-src/ext/mysql/tests/mysql_close.phpt:1.2
--- php-src/ext/mysql/tests/mysql_close.phpt:1.1Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_close.phptWed

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 11:56:03 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   config.m4 
  Log:
  MFH: Nuked unnecessary AC_MSG_CHECKING
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.80.2.3.2.2&r2=1.80.2.3.2.3&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80.2.3.2.2 
php-src/ext/standard/config.m4:1.80.2.3.2.3
--- php-src/ext/standard/config.m4:1.80.2.3.2.2 Wed Jul 11 11:50:37 2007
+++ php-src/ext/standard/config.m4  Wed Jul 11 11:56:03 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.80.2.3.2.2 2007/07/11 11:50:37 jani Exp $ -*- autoconf 
-*-
+dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf 
-*-
 
 divert(3)dnl
 
@@ -210,7 +210,7 @@
 dnl
 dnl Check for regex library type
 dnl
-PHP_ARG_WITH(regex, for selected regex library type,
+PHP_ARG_WITH(regex,,
 [  --with-regex=TYPE   regex library type: system, apache, php. [TYPE=php]
   WARNING: Do NOT use unless you know what you are 
doing!], php, no)
 
@@ -230,7 +230,7 @@
 ;;
   *)
 REGEX_TYPE=php
-AC_MSG_WARN(Invalid regex library type. Using default value: php)
+AC_MSG_WARN(Invalid regex library type selected. Using default value: php)
 ;;
 esac
 

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

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 11:55:46 2007 UTC

  Modified files:  
/php-src/ext/standard   config.m4 
  Log:
  - Nuke extra AC_MSG_CHECKING
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.85&r2=1.86&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.85 php-src/ext/standard/config.m4:1.86
--- php-src/ext/standard/config.m4:1.85 Wed Jul 11 10:27:16 2007
+++ php-src/ext/standard/config.m4  Wed Jul 11 11:55:46 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.85 2007/07/11 10:27:16 jani Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.86 2007/07/11 11:55:46 jani Exp $ -*- autoconf -*-
 
 divert(3)dnl
 
@@ -210,7 +210,7 @@
 dnl
 dnl Check for regex library type
 dnl
-PHP_ARG_WITH(regex, for selected regex library type,
+PHP_ARG_WITH(regex,,
 [  --with-regex=TYPE   regex library type: system, apache, php. [TYPE=php]
   WARNING: Do NOT use unless you know what you are 
doing!], php, no)
 
@@ -230,7 +230,7 @@
 ;;
   *)
 REGEX_TYPE=php
-AC_MSG_WARN(Invalid regex library type. Using default value: php)
+AC_MSG_WARN(Invalid regex library type selected. Using default value: php)
 ;;
 esac
 

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/openssl openssl.c /ext/openssl/tests bug28382.phpt

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 12:18:14 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/opensslopenssl.c 
/php-src/ext/openssl/tests  bug28382.phpt 
  Log:
  mproced openssl_x509_parse() to return extensions in readable form
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.826&r2=1.2027.2.547.2.827&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.826 php-src/NEWS:1.2027.2.547.2.827
--- php-src/NEWS:1.2027.2.547.2.826 Tue Jul 10 20:25:49 2007
+++ php-src/NEWSWed Jul 11 12:18:13 2007
@@ -6,6 +6,7 @@
 - Upgraded PCRE to version 7.2 (Nuno)
 - Updated timezone database to version 2007.6. (Derick)
 
+- Improced openssl_x509_parse() to return extensions in readable form. (Dmitry)
 - Improved fix for MOPB-03-2007. (Ilia)
 - Corrected fix for CVE-2007-2872. (Ilia)
 - Enabled statement cache for non-persistent OCI8 connections.
@@ -30,6 +31,7 @@
 - Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants. 
   (Andrey A. Belashkov, Tony)
 
+- Fixed crash in OpenSSL extension because of non-strin passphrase. (Dmitry)
 - Fixed var_export() to use the new H modifier so that it can generate
   parseable PHP code for floats, independent of the locale. (Derick)
 - Fixed regression introduced by the fix for the libgd bug #74. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.37&r2=1.98.2.5.2.38&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.37 
php-src/ext/openssl/openssl.c:1.98.2.5.2.38
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.37 Wed Jul 11 07:36:12 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 12:18:14 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.37 2007/07/11 07:36:12 dmitry Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.38 2007/07/11 12:18:14 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -999,8 +999,10 @@
char * tmpstr;
zval * subitem;
X509_EXTENSION *extension;
-   ASN1_OCTET_STRING *extdata;
char *extname;
+   BIO  *bio_out;
+   BUF_MEM *bio_buf;
+   char buf[256];
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|b", &zcert, 
&useshortnames) == FAILURE) {
return;
@@ -1082,9 +1084,20 @@
 
for (i = 0; i < X509_get_ext_count(cert); i++) {
extension = X509_get_ext(cert, i);
-   extdata = X509_EXTENSION_get_data(extension);
-   extname = (char 
*)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension)));
-   add_assoc_asn1_string(subitem, extname, extdata);
+   if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != 
NID_undef) {
+   extname = (char 
*)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension)));
+   } else {
+   OBJ_obj2txt(buf, sizeof(buf)-1, 
X509_EXTENSION_get_object(extension), 1);
+   extname = buf;
+   }
+   bio_out = BIO_new(BIO_s_mem());
+   if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
+   add_assoc_stringl(subitem, extname, bio_buf->data, 
bio_buf->length, 1);
+   } else {
+   add_assoc_asn1_string(subitem, extname, 
X509_EXTENSION_get_data(extension));
+   }
+   BIO_free(bio_out);
}
add_assoc_zval(return_value, "extensions", subitem);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug28382.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/openssl/tests/bug28382.phpt
diff -u php-src/ext/openssl/tests/bug28382.phpt:1.1.2.5 
php-src/ext/openssl/tests/bug28382.phpt:1.1.2.6
--- php-src/ext/openssl/tests/bug28382.phpt:1.1.2.5 Wed May 30 15:40:26 2007
+++ php-src/ext/openssl/tests/bug28382.phpt Wed Jul 11 12:18:14 2007
@@ -14,25 +14,28 @@
 --EXPECTF--
 array(11) {
   ["basicConstraints"]=>
-  string(2) "%s"
+  string(8) "CA:FALSE"
   ["nsComment"]=>
-  string(40) "%s"
+  string(38) "For Grid use only; request tag userTag"
   ["nsCertType"]=>
-  string(4) "%s"
+  string(30) "SSL Client, SSL Server, S/MIME"
   ["crlDistributionPoints"]=>
-  string(56) "%s"
+  string(51) "URI:http://mobile.blue-software.ro:90/ca/crl.shtml
+"
   ["nsCaPolicyUrl"]=>
-  string(40) "%s"
+  string(38) "http://mobile.blue-software.ro:90/pub/";
   ["subjectAltName"]=>
-  string(26) "%s"
+  string(28) "email:[EMAIL PROTECTED]"
   ["subjectKeyIdentifier"]=>
-  string(22) "%s"
+  string(59) "B0:A7:FF:F9:41:15:DE:23:39:BD:DD:31:0F:97:A0:B2:A2:74:E0:FC"
   ["authorityKeyIdentifier"]=>
-  string(159) "%s"
+  string(115) "DirName:/C=RO/ST=Romania/L=Craiova/O=Sergiu/OU=Sergiu 
SRL/CN=Sergiu CA/[EMAIL PROTECTED]
+serial:00
+"
   ["keyUsage"]=>
-  string(4) "%s"
+  string(71) "Digital Signat

[PHP-CVS] cvs: php-src /ext/openssl openssl.c /ext/openssl/tests 005.phpt bug28382.phpt

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 12:10:28 2007 UTC

  Modified files:  
/php-src/ext/opensslopenssl.c 
/php-src/ext/openssl/tests  005.phpt bug28382.phpt 
  Log:
  Unicode support
  improved openssl_x509_parse() extensions support
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.144&r2=1.145&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.144 php-src/ext/openssl/openssl.c:1.145
--- php-src/ext/openssl/openssl.c:1.144 Wed Jul 11 07:35:53 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 12:10:28 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.144 2007/07/11 07:35:53 dmitry Exp $ */
+/* $Id: openssl.c,v 1.145 2007/07/11 12:10:28 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -283,11 +283,11 @@
str = X509_NAME_ENTRY_get_data(ne);
if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) 
{
to_add_len = 
ASN1_STRING_to_UTF8(&to_add, str);
-   add_next_index_stringl(subentries, 
(char *)to_add, to_add_len, 1);
+   add_next_index_utf8_stringl(subentries, 
(char *)to_add, to_add_len, 1);
} else {
to_add = ASN1_STRING_data(str);
to_add_len = ASN1_STRING_length(str);
-   add_next_index_stringl(subentries, 
(char *)to_add, to_add_len, 1);
+   add_next_index_utf8_stringl(subentries, 
(char *)to_add, to_add_len, 1);
}
}
last = j;
@@ -295,24 +295,36 @@
i = last;

if (obj_cnt > 1) {
-   add_assoc_zval_ex(subitem, sname, strlen(sname) + 1, 
subentries);
+   add_ascii_assoc_zval_ex(subitem, sname, strlen(sname) + 
1, subentries);
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
if (obj_cnt && str) {
-   add_assoc_stringl(subitem, sname, (char 
*)to_add, to_add_len, 1);
+   add_ascii_assoc_utf8_stringl(subitem, sname, 
(char *)to_add, to_add_len, 1);
}
}
}
if (key != NULL) {
-   zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void 
*)&subitem, sizeof(subitem), NULL);
+   add_ascii_assoc_zval_ex(val, key, strlen(key) + 1, subitem);
}
 }
 /* }}} */
 
 static void add_assoc_asn1_string(zval * val, char * key, ASN1_STRING * str) 
/* {{{ */
 {
-   add_assoc_stringl(val, key, (char *)str->data, str->length, 1);
+   unsigned char *data;
+   int data_len;
+   TSRMLS_FETCH();
+
+   if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
+   data = ASN1_STRING_data(str);
+   data_len = ASN1_STRING_length(str);
+   add_ascii_assoc_stringl(val, key, (char*)data, data_len, 1);
+   } else {
+   data = ASN1_STRING_data(str);
+   data_len = ASN1_STRING_length(str);
+   add_ascii_assoc_utf8_stringl(val, key, (char*)data, data_len, 
1);
+   }
 }
 /* }}} */
 
@@ -443,13 +455,15 @@
req->config_filename, req->var, req->req_config 
TSRMLS_CC) == FAILURE) return FAILURE
 
 #define SET_OPTIONAL_STRING_ARG(key, varname, defval)  \
-   if (optional_args && zend_hash_find(Z_ARRVAL_P(optional_args), key, 
sizeof(key), (void**)&item) == SUCCESS) \
+   if (optional_args && zend_ascii_hash_find(Z_ARRVAL_P(optional_args), 
key, sizeof(key), (void**)&item) == SUCCESS) { \
+   convert_to_string_ex(item); \
varname = Z_STRVAL_PP(item); \
-   else \
-   varname = defval
+   } else \
+   varname = defval;
+
 
 #define SET_OPTIONAL_LONG_ARG(key, varname, defval)\
-   if (optional_args && zend_hash_find(Z_ARRVAL_P(optional_args), key, 
sizeof(key), (void**)&item) == SUCCESS) \
+   if (optional_args && zend_ascii_hash_find(Z_ARRVAL_P(optional_args), 
key, sizeof(key), (void**)&item) == SUCCESS) \
varname = Z_LVAL_PP(item); \
else \
varname = defval
@@ -985,8 +999,11 @@
char * tmpstr;
zval * subitem;
X509_EXTENSION *extension;
-   ASN1_OCTET_STRING *extdata;
char *extname;
+   BIO  *bio_out;
+   BUF_MEM *bio_buf;
+   char buf[256];
+
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|b", &zcert, 
&useshortnames) == FAILURE) {
return;
@@ -998,37 +1015,37 @@
array_init(return_value);
 
if (cert->name) {

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 11:50:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   config.m4 
  Log:
  MFH: cleanup, removed unnecessary macro definitions
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.80.2.3.2.1&r2=1.80.2.3.2.2&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80.2.3.2.1 
php-src/ext/standard/config.m4:1.80.2.3.2.2
--- php-src/ext/standard/config.m4:1.80.2.3.2.1 Thu Aug 24 11:06:02 2006
+++ php-src/ext/standard/config.m4  Wed Jul 11 11:50:37 2007
@@ -1,13 +1,12 @@
-dnl $Id: config.m4,v 1.80.2.3.2.1 2006/08/24 11:06:02 tony2001 Exp $ -*- 
autoconf -*-
+dnl $Id: config.m4,v 1.80.2.3.2.2 2007/07/11 11:50:37 jani Exp $ -*- autoconf 
-*-
 
 divert(3)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
 dnl
-AC_DEFUN([AC_FLUSH_IO],[
-  AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
-  AC_TRY_RUN( [
+AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
+AC_TRY_RUN( [
 #include 
 #include 
 
@@ -48,24 +47,21 @@
 ],[
   ac_cv_flush_io=no
 ])])
-  if test "$ac_cv_flush_io" = "yes"; then
-AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
-  fi
-])
+if test "$ac_cv_flush_io" = "yes"; then
+  AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
+fi
 
 dnl
 dnl Check for crypt() capabilities
 dnl
-AC_DEFUN([AC_CRYPT_CAP],[
-
-  if test "$ac_cv_func_crypt" = "no"; then
+if test "$ac_cv_func_crypt" = "no"; then
   AC_CHECK_LIB(crypt, crypt, [
 LIBS="-lcrypt $LIBS -lcrypt"
 AC_DEFINE(HAVE_CRYPT, 1, [ ])
   ])
-  fi
+fi
   
-  AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
+AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
@@ -82,21 +78,20 @@
exit(0);
 #endif
 }],[
-ac_cv_crypt_des=yes
-  ],[
-ac_cv_crypt_des=no
-  ],[
-ac_cv_crypt_des=yes
-  ])
-  ])
-  if test "$ac_cv_crypt_des" = "yes"; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system 
supports standard DES salt])
+  ac_cv_crypt_des=yes
+],[
+  ac_cv_crypt_des=no
+],[
+  ac_cv_crypt_des=yes
+])])
+if test "$ac_cv_crypt_des" = "yes"; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports 
standard DES salt])
 
-  AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
+AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
@@ -108,27 +103,26 @@
 
 main() {
 #if HAVE_CRYPT
-exit (strcmp((char 
*)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
+  exit (strcmp((char 
*)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
 #else
-   exit(0);
+  exit(0);
 #endif
 }],[
-ac_cv_crypt_ext_des=yes
-  ],[
-ac_cv_crypt_ext_des=no
-  ],[
-ac_cv_crypt_ext_des=no
-  ])
-  ])
-  if test "$ac_cv_crypt_ext_des" = "yes"; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system 
supports extended DES salt])
+  ac_cv_crypt_ext_des=yes
+],[
+  ac_cv_crypt_ext_des=no
+],[
+  ac_cv_crypt_ext_des=no
+])])
+if test "$ac_cv_crypt_ext_des" = "yes"; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports 
extended DES salt])
 
-  AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
-  AC_TRY_RUN([
+AC_CACHE_CHECK(for MD5 crypt, ac_cv_crypt_md5,[
+AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
 #endif
@@ -153,25 +147,24 @@
exit(0);
 #endif
 }],[
-ac_cv_crypt_md5=yes
-  ],[
-ac_cv_crypt_md5=no
-  ],[
-ac_cv_crypt_md5=no
-  ])
-  ])
-  if test "$ac_cv_crypt_md5" = "yes"; then
-ac_result=1
-  else
-if test "$ac_cv_crypt_des" != "yes"; then
-  PHP_DEBUG_MACRO(debug.log)
-fi
-ac_result=0
+  ac_cv_crypt_md5=yes
+],[
+  ac_cv_crypt_md5=no
+],[
+  ac_cv_crypt_md5=no
+])])
+if test "$ac_cv_crypt_md5" = "yes"; then
+  ac_result=1
+else
+  if test "$ac_cv_crypt_des" != "yes"; then
+PHP_DEBUG_MACRO(debug.log)
   fi
-  AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports 
MD5 salt])
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 
salt])
 
-  AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
-  AC_TRY_RUN([
+AC_CACHE_CHECK(for Blowfish crypt, ac_cv_crypt_blowfish,[
+AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
 #endif
@@ -193,81 +186,72 @@
exit(0);
 #endif
 }],[
-ac_cv_crypt_blowfish=yes
-  ],[
-ac_cv_crypt_blowfish=no
-  ],[
-ac_cv_crypt_blowfish=no
-  ])
-  ])
-  if test "$ac_cv_crypt_blowfish" = "yes"; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PH

[PHP-CVS] cvs: php-src /ext/mysql/tests 001.phpt 002.phpt 003.phpt connect.inc skipif.inc table.inc

2007-07-11 Thread Ulf Wendel

uw  Wed Jul 11 11:12:11 2007 UTC

  Modified files:  
/php-src/ext/mysql/testsconnect.inc table.inc skipif.inc 001.phpt 
002.phpt 003.phpt 
  Log:
  Trying to fix broken tests. The last set of files committed a few weeks ago
  broke almost all tests. I'll try to merge the CVS with a working set of
  tests from the mysqlnd development repository. With this first set of 
  changes most tests should run (and pass) again.
  
  Note the additional environment variables in connect.inc that you can
  use to control a test run.
  
  More changes to come.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/connect.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/connect.inc
diff -u php-src/ext/mysql/tests/connect.inc:1.1 
php-src/ext/mysql/tests/connect.inc:1.2
--- php-src/ext/mysql/tests/connect.inc:1.1 Mon Jan 12 02:31:08 2004
+++ php-src/ext/mysql/tests/connect.inc Wed Jul 11 11:12:10 2007
@@ -1,10 +1,64 @@
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/table.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/table.inc
diff -u php-src/ext/mysql/tests/table.inc:1.1 
php-src/ext/mysql/tests/table.inc:1.2
--- php-src/ext/mysql/tests/table.inc:1.1   Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/table.inc   Wed Jul 11 11:12:10 2007
@@ -1,4 +1,4 @@
-
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/skipif.inc?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysql/tests/skipif.inc
diff -u php-src/ext/mysql/tests/skipif.inc:1.3 
php-src/ext/mysql/tests/skipif.inc:1.4
--- php-src/ext/mysql/tests/skipif.inc:1.3  Tue Jun 27 00:09:23 2006
+++ php-src/ext/mysql/tests/skipif.inc  Wed Jul 11 11:12:10 2007
@@ -1,11 +1,6 @@
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/001.phpt
diff -u php-src/ext/mysql/tests/001.phpt:1.4 
php-src/ext/mysql/tests/001.phpt:1.5
--- php-src/ext/mysql/tests/001.phpt:1.4Mon Feb  6 14:25:28 2006
+++ php-src/ext/mysql/tests/001.phptWed Jul 11 11:12:10 2007
@@ -4,22 +4,30 @@
 
 --FILE--
 
 --EXPECT--
 string(2) "11"
+done!
+--UEXPECTF--
+unicode(2) "11"
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/002.phpt
diff -u php-src/ext/mysql/tests/002.phpt:1.1 
php-src/ext/mysql/tests/002.phpt:1.2
--- php-src/ext/mysql/tests/002.phpt:1.1Mon Jan 12 02:31:08 2004
+++ php-src/ext/mysql/tests/002.phptWed Jul 11 11:12:10 2007
@@ -4,14 +4,13 @@
 
 --FILE--
 
 --EXPECTF--
 resource(%d) of type (mysql link)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
 resource(%d) of type (mysql result)
 array(3) {
   ["col1"]=>
@@ -51,3 +51,27 @@
   ["col3"]=>
   string(3) "bar"
 }
+done!
+--UEXPECTF--
+resource(%d) of type (mysql link)
+bool(true)
+bool(true)
+bool(true)
+resource(%d) of type (mysql result)
+array(3) {
+  [u"col1"]=>
+  unicode(1) "1"
+  [u"col2"]=>
+  unicode(3) "foo"
+  [u"col3"]=>
+  unicode(3) "bar"
+}
+array(3) {
+  [u"col1"]=>
+  unicode(1) "2"
+  [u"col2"]=>
+  unicode(3) "foo"
+  [u"col3"]=>
+  unicode(3) "bar"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/003.phpt
diff -u php-src/ext/mysql/tests/003.phpt:1.1 
php-src/ext/mysql/tests/003.phpt:1.2
--- php-src/ext/mysql/tests/003.phpt:1.1Mon Jan 12 02:34:55 2004
+++ php-src/ext/mysql/tests/003.phptWed Jul 11 11:12:10 2007
@@ -4,8 +4,7 @@
 
 --FILE--
 
-==DONE==
 --EXPECTF--
-string(3) "one"
-string(3) "two"
-string(5) "three"
 ==stdClass==
 object(stdClass)#%d (1) {
   ["a"]=>
@@ -81,4 +79,35 @@
   ["a"]=>
   string(5) "three"
 }
-==DONE==
+done!
+--UEXPECTF--
+==stdClass==
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(3) "one"
+}
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(3) "two"
+}
+object(stdClass)#%d (1) {
+  [u"a"]=>
+  unicode(5) "three"
+}
+==class24==
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(3) "one"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(3) "two"
+}
+class24::__construct
+object(class24)#%d (1) {
+  [u"a"]=>
+  unicode(5) "three"
+}
+done!
\ No newline at end of file

-- 
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) /ext/openssl openssl.c

2007-07-11 Thread Pierre


On 7/11/07, Dmitry Stogov <[EMAIL PROTECTED]> wrote:

I don't think it is imprtant fix.
Nobody uses non-sting pasphrases. :)

I found this bug in PHP6 where it was real stopper (because of unicode
passphrases) and then backported it to 5.2.


If it changes / fixes a behaviors/bugs, it has be in the NEWS file,
even if "nobody" uses it :)

(for example, It is useful when one has to patch its php after a release)

Thanks,
--Pierre

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

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:35:47 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Improved PHP_SETUP_ICU
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.372&r2=1.373&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.372 php-src/acinclude.m4:1.373
--- php-src/acinclude.m4:1.372  Wed Jul 11 10:27:16 2007
+++ php-src/acinclude.m4Wed Jul 11 10:35:47 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.372 2007/07/11 10:27:16 jani Exp $
+dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2122,30 +2122,16 @@
 dnl Common setup macro for ICU
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
-  unset PHP_ICU_DIR
+  PHP_ARG_WITH(icu-dir, for location of ICU headers and libraries,
+  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], DEFAULT, no)
 
-  AC_MSG_CHECKING([for location of ICU headers and libraries])
-
-  AC_ARG_WITH(icu-dir,
-  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], 
-  [
-if test "x$withval" != "xyes"; then
-  PHP_ICU_DIR=$withval
-else
-  PHP_ICU_DIR=DEFAULT
-fi
-  ], [
+  if test "$PHP_ICU_DIR" = "no"; then
 PHP_ICU_DIR=DEFAULT
-  ])
+  fi
 
   if test "$PHP_ICU_DIR" = "DEFAULT"; then
-ICU_CONFIG=icu-config
-for i in /usr/local/bin /usr/bin; do
-  if test -x "$i/icu-config"; then
-ICU_CONFIG=$i/icu-config
-break;
-  fi
-done
+dnl Try to find icu-config
+AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
   else
 ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
   fi
@@ -2167,7 +2153,7 @@
 IFS=$ac_IFS
 icu_version=`expr [$]1 \* 1000 + [$]2`
 AC_MSG_RESULT([found $icu_version_full])
-   
+
 if test "$icu_version" -lt "3004"; then
   AC_MSG_ERROR([ICU version 3.4 or later is required])
 fi
@@ -2179,7 +2165,6 @@
   fi
 ])
 
-
 dnl
 dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
 dnl

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

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/standard config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:27:16 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/standard   config.m4 
  Log:
  - Cleanup, nuked some unnecessary macros.
  http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.371&r2=1.372&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.371 php-src/acinclude.m4:1.372
--- php-src/acinclude.m4:1.371  Tue Jul 10 10:18:26 2007
+++ php-src/acinclude.m4Wed Jul 11 10:27:16 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.371 2007/07/10 10:18:26 jani Exp $
+dnl $Id: acinclude.m4,v 1.372 2007/07/11 10:27:16 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2627,31 +2627,6 @@
 ])
 
 dnl
-dnl PHP_REGEX
-dnl
-AC_DEFUN([PHP_REGEX],[
-  if test "$REGEX_TYPE" = "php"; then
-AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ])
-AC_DEFINE(HSREGEX,1,[ ])
-AC_DEFINE(REGEX,1,[ ])
-PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
-  elif test "$REGEX_TYPE" = "system"; then
-AC_DEFINE(REGEX,0,[ ])
-dnl Check if field re_magic exists in struct regex_t
-AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
-  AC_TRY_COMPILE([#include 
-#include ], [regex_t rt; rt.re_magic;],
-  [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
-])
-if test "$ac_cv_regex_t_re_magic" = "yes"; then
-  AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1)
-fi 
-  fi
-  AC_MSG_CHECKING([which regex library to use])
-  AC_MSG_RESULT([$REGEX_TYPE])
-])
-
-dnl
 dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
 dnl
 AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.84&r2=1.85&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.84 php-src/ext/standard/config.m4:1.85
--- php-src/ext/standard/config.m4:1.84 Thu Aug 24 11:05:38 2006
+++ php-src/ext/standard/config.m4  Wed Jul 11 10:27:16 2007
@@ -1,13 +1,12 @@
-dnl $Id: config.m4,v 1.84 2006/08/24 11:05:38 tony2001 Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.85 2007/07/11 10:27:16 jani Exp $ -*- autoconf -*-
 
 divert(3)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
 dnl
-AC_DEFUN([AC_FLUSH_IO],[
-  AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
-  AC_TRY_RUN( [
+AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
+AC_TRY_RUN( [
 #include 
 #include 
 
@@ -48,24 +47,21 @@
 ],[
   ac_cv_flush_io=no
 ])])
-  if test "$ac_cv_flush_io" = "yes"; then
-AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
-  fi
-])
+if test "$ac_cv_flush_io" = "yes"; then
+  AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
+fi
 
 dnl
 dnl Check for crypt() capabilities
 dnl
-AC_DEFUN([AC_CRYPT_CAP],[
-
-  if test "$ac_cv_func_crypt" = "no"; then
+if test "$ac_cv_func_crypt" = "no"; then
   AC_CHECK_LIB(crypt, crypt, [
 LIBS="-lcrypt $LIBS -lcrypt"
 AC_DEFINE(HAVE_CRYPT, 1, [ ])
   ])
-  fi
+fi
   
-  AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
+AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
@@ -82,21 +78,20 @@
exit(0);
 #endif
 }],[
-ac_cv_crypt_des=yes
-  ],[
-ac_cv_crypt_des=no
-  ],[
-ac_cv_crypt_des=yes
-  ])
-  ])
-  if test "$ac_cv_crypt_des" = "yes"; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system 
supports standard DES salt])
+  ac_cv_crypt_des=yes
+],[
+  ac_cv_crypt_des=no
+],[
+  ac_cv_crypt_des=yes
+])])
+if test "$ac_cv_crypt_des" = "yes"; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports 
standard DES salt])
 
-  AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
+AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include 
@@ -108,27 +103,26 @@
 
 main() {
 #if HAVE_CRYPT
-exit (strcmp((char 
*)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
+  exit (strcmp((char 
*)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
 #else
-   exit(0);
+  exit(0);
 #endif
 }],[
-ac_cv_crypt_ext_des=yes
-  ],[
-ac_cv_crypt_ext_des=no
-  ],[
-ac_cv_crypt_ext_des=no
-  ])
-  ])
-  if test "$ac_cv_crypt_ext_des" = "yes"; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system 
supports extended DES salt])
+  ac_cv_crypt_ext_des=yes
+],[
+  ac_cv_crypt_ext_des=no
+],[
+  ac_cv_crypt_ext_des=no
+])])
+if test "$ac_cv_crypt_ext_des" = "yes"; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports 
extended DES sa

RE: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl openssl.c

2007-07-11 Thread Dmitry Stogov

I don't think it is imprtant fix.
Nobody uses non-sting pasphrases. :)

I found this bug in PHP6 where it was real stopper (because of unicode
passphrases) and then backported it to 5.2.

Thanks. Dmitry.

> -Original Message-
> From: Pierre [mailto:[EMAIL PROTECTED] 
> Sent: Wednesday, July 11, 2007 12:42 PM
> To: Dmitry Stogov
> Cc: php-cvs@lists.php.net
> Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl openssl.c
> 
> 
> Hi Dmitry,
> 
> Thanks for the fixes!
> 
> Can you add two NEWS entry please? (5_2)
> 
> On 7/11/07, Dmitry Stogov <[EMAIL PROTECTED]> wrote:
> > dmitry  Wed Jul 11 07:26:52 2007 UTC
> >
> >   Modified files:  (Branch: PHP_5_2)
> > /php-src/ext/opensslopenssl.c
> >   Log:
> >   Fixed crash on non-string passphrase
> >
> >
> > 
> http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.
> > 5.2.35&r2=1.98.2.5.2.36&diff_format=u
> > Index: php-src/ext/openssl/openssl.c
> > diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.35 
> php-src/ext/openssl/openssl.c:1.98.2.5.2.36
> > --- php-src/ext/openssl/openssl.c:1.98.2.5.2.35 Tue Jun 19 
> 22:09:49 2007
> > +++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:26:52 2007
> > @@ -20,7 +20,7 @@
> > 
> +-
> -+
> >   */
> >
> > -/* $Id: openssl.c,v 1.98.2.5.2.35 2007/06/19 22:09:49 
> iliaa Exp $ */
> > +/* $Id: openssl.c,v 1.98.2.5.2.36 2007/07/11 07:26:52 
> dmitry Exp $ */
> >
> >  #ifdef HAVE_CONFIG_H
> >  #include "config.h"
> > @@ -2256,6 +2256,7 @@
> > } else {
> > tmp = **zphrase;
> > zval_copy_ctor(&tmp);
> > +   convert_to_string(&tmp);
> > passphrase = Z_STRVAL(tmp);
> > }
> >
> >
> > --
> > 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(PHP_5_2) /main main.c

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:24:04 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/main   main.c 
  Log:
  MFH: No return values for void function
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.41&r2=1.640.2.23.2.42&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.41 php-src/main/main.c:1.640.2.23.2.42
--- php-src/main/main.c:1.640.2.23.2.41 Tue Jul 10 17:58:19 2007
+++ php-src/main/main.c Wed Jul 11 10:24:04 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.41 2007/07/10 17:58:19 stas Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.42 2007/07/11 10:24:04 jani Exp $ */
 
 /* {{{ includes
  */
@@ -357,11 +357,11 @@
}
 #endif
if (PG(safe_mode) && (!php_checkuid(PG(error_log), NULL, 
CHECKUID_CHECK_FILE_AND_DIR|CHECKUID_NO_ERRORS))) {
-   return FAILURE;
+   return;
}
 
if (PG(open_basedir) && 
php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
-   return FAILURE;
+   return;
}

fd = VCWD_OPEN_MODE(PG(error_log), O_CREAT | O_APPEND | 
O_WRONLY, 0644);

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

[PHP-CVS] cvs: php-src /main main.c

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:23:47 2007 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  - No return value for void function
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.734&r2=1.735&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.734 php-src/main/main.c:1.735
--- php-src/main/main.c:1.734   Tue Jul 10 18:42:01 2007
+++ php-src/main/main.c Wed Jul 11 10:23:47 2007
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.734 2007/07/10 18:42:01 stas Exp $ */
+/* $Id: main.c,v 1.735 2007/07/11 10:23:47 jani Exp $ */
 
 /* {{{ includes
  */
@@ -454,7 +454,7 @@
}
 #endif
if (PG(open_basedir) && 
php_check_open_basedir_ex(PG(error_log), 0 TSRMLS_CC)) {
-   return FAILURE;
+   return;
}
fd = VCWD_OPEN_MODE(PG(error_log), O_CREAT | O_APPEND | 
O_WRONLY, 0644);
if (fd != -1) {

-- 
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 popen_pclose_error-sunos.phpt popen_pclose_error.phpt

2007-07-11 Thread Raghubansh Kumar

kraghubaWed Jul 11 09:13:47 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/filepopen_pclose_error-sunos.phpt 
popen_pclose_error.phpt 
  Log:
  better check for skip
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.1 
php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt:1.1.2.1   
Mon Jul  9 17:38:32 2007
+++ php-src/ext/standard/tests/file/popen_pclose_error-sunos.phpt   Wed Jul 
11 09:13:47 2007
@@ -2,10 +2,9 @@
 Test popen() and pclose function: error conditions
 --SKIPIF--
 
-
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.2 
php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/popen_pclose_error.phpt:1.1.2.2 Mon Jul 
 9 17:38:33 2007
+++ php-src/ext/standard/tests/file/popen_pclose_error.phpt Wed Jul 11 
09:13:47 2007
@@ -2,10 +2,9 @@
 Test popen() and pclose function: error conditions
 --SKIPIF--
 
-
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/snmp config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 08:47:45 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/snmp   config.m4 
  Log:
  MFH: Changed AC_ARG_ENABLE to PHP_ARG_ENABLE
  
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/config.m4?r1=1.32.2.1.2.1&r2=1.32.2.1.2.2&diff_format=u
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.32.2.1.2.1 
php-src/ext/snmp/config.m4:1.32.2.1.2.2
--- php-src/ext/snmp/config.m4:1.32.2.1.2.1 Tue Jul  3 17:25:35 2007
+++ php-src/ext/snmp/config.m4  Wed Jul 11 08:47:45 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.32.2.1.2.1 2007/07/03 17:25:35 sniper Exp $
+dnl $Id: config.m4,v 1.32.2.1.2.2 2007/07/11 08:47:45 jani Exp $
 dnl
 
 PHP_ARG_WITH(snmp,for SNMP support,
@@ -8,6 +8,9 @@
 PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
 [  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
 
+PHP_ARG_ENABLE(ucd-snmp-hack, whether to enable UCD SNMP hack, 
+[  --enable-ucd-snmp-hackSNMP: Enable UCD SNMP hack], no, no)
+
 if test "$PHP_SNMP" != "no"; then
 
   dnl
@@ -119,19 +122,10 @@
 $SNMP_SHARED_LIBADD
   ])
 
+  if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
+AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
+  fi
+  
   PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
   PHP_SUBST(SNMP_SHARED_LIBADD)
 fi
-
-AC_MSG_CHECKING(whether to enable UCD SNMP hack)
-AC_ARG_ENABLE(ucd-snmp-hack,
-[  --enable-ucd-snmp-hackSNMP: Enable UCD SNMP hack],[
-  if test "$enableval" = "yes" ; then
-AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
-AC_MSG_RESULT(yes)
-  else
-AC_MSG_RESULT(no)
-  fi
-],[
-  AC_MSG_RESULT(no)
-])

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

[PHP-CVS] cvs: php-src /ext/snmp config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 08:47:31 2007 UTC

  Modified files:  
/php-src/ext/snmp   config.m4 
  Log:
  - Changed AC_ARG_ENABLE to PHP_ARG_ENABLE
  
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/config.m4?r1=1.34&r2=1.35&diff_format=u
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.34 php-src/ext/snmp/config.m4:1.35
--- php-src/ext/snmp/config.m4:1.34 Thu Dec 22 11:02:51 2005
+++ php-src/ext/snmp/config.m4  Wed Jul 11 08:47:31 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.34 2005/12/22 11:02:51 tony2001 Exp $
+dnl $Id: config.m4,v 1.35 2007/07/11 08:47:31 jani Exp $
 dnl
 
 PHP_ARG_WITH(snmp,for SNMP support,
@@ -8,6 +8,9 @@
 PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
 [  --with-openssl-dir[=DIR]  SNMP: openssl install prefix], no, no)
 
+PHP_ARG_ENABLE(ucd-snmp-hack, whether to enable UCD SNMP hack, 
+[  --enable-ucd-snmp-hackSNMP: Enable UCD SNMP hack], no, no)
+
 if test "$PHP_SNMP" != "no"; then
 
   dnl
@@ -119,19 +122,10 @@
 $SNMP_SHARED_LIBADD
   ])
 
+  if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
+AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
+  fi
+  
   PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
   PHP_SUBST(SNMP_SHARED_LIBADD)
 fi
-
-AC_MSG_CHECKING(whether to enable UCD SNMP hack)
-AC_ARG_ENABLE(ucd-snmp-hack,
-[  --enable-ucd-snmp-hackSNMP: Enable UCD SNMP hack],[
-  if test "$enableval" = "yes" ; then
-AC_DEFINE(UCD_SNMP_HACK, 1, [ ])
-AC_MSG_RESULT(yes)
-  else
-AC_MSG_RESULT(no)
-  fi
-],[
-  AC_MSG_RESULT(no)
-])

-- 
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) /ext/openssl openssl.c

2007-07-11 Thread Pierre


Hi Dmitry,

Thanks for the fixes!

Can you add two NEWS entry please? (5_2)

On 7/11/07, Dmitry Stogov <[EMAIL PROTECTED]> wrote:

dmitry  Wed Jul 11 07:26:52 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c
  Log:
  Fixed crash on non-string passphrase


http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.35&r2=1.98.2.5.2.36&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.35 
php-src/ext/openssl/openssl.c:1.98.2.5.2.36
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.35 Tue Jun 19 22:09:49 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:26:52 2007
@@ -20,7 +20,7 @@
+--+
  */

-/* $Id: openssl.c,v 1.98.2.5.2.35 2007/06/19 22:09:49 iliaa Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.36 2007/07/11 07:26:52 dmitry Exp $ */

 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2256,6 +2256,7 @@
} else {
tmp = **zphrase;
zval_copy_ctor(&tmp);
+   convert_to_string(&tmp);
passphrase = Z_STRVAL(tmp);
}


--
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/xml xml.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 08:27:33 2007 UTC

  Modified files:  
/php-src/ext/xmlxml.c 
  Log:
  unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.171&r2=1.172&diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.171 php-src/ext/xml/xml.c:1.172
--- php-src/ext/xml/xml.c:1.171 Mon Jan  1 09:29:33 2007
+++ php-src/ext/xml/xml.c   Wed Jul 11 08:27:33 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: xml.c,v 1.171 2007/01/01 09:29:33 sebastian Exp $ */
+/* $Id: xml.c,v 1.172 2007/07/11 08:27:33 dmitry Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -1703,6 +1703,9 @@
RETURN_FALSE;
}
 
+   if (data_type == IS_UNICODE) {
+   RETURN_UNICODEL(data, data_len, 1);
+   }
if (UG(unicode)) {
decoded = xml_utf8_decode(data, data_len, &len, NULL);
} else {

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl openssl.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 07:26:52 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c 
  Log:
  Fixed crash on non-string passphrase
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.35&r2=1.98.2.5.2.36&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.35 
php-src/ext/openssl/openssl.c:1.98.2.5.2.36
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.35 Tue Jun 19 22:09:49 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:26:52 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.35 2007/06/19 22:09:49 iliaa Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.36 2007/07/11 07:26:52 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2256,6 +2256,7 @@
} else {
tmp = **zphrase;
zval_copy_ctor(&tmp);
+   convert_to_string(&tmp);
passphrase = Z_STRVAL(tmp);
}
 

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

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

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 07:27:20 2007 UTC

  Modified files:  
/php-src/ext/opensslopenssl.c 
  Log:
  Fixed crash on non-string passphrase and unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.142&r2=1.143&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.142 php-src/ext/openssl/openssl.c:1.143
--- php-src/ext/openssl/openssl.c:1.142 Tue Jul 10 07:57:15 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:27:20 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.142 2007/07/10 07:57:15 dmitry Exp $ */
+/* $Id: openssl.c,v 1.143 2007/07/11 07:27:20 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2258,6 +2258,7 @@
} else {
tmp = **zphrase;
zval_copy_ctor(&tmp);
+   convert_to_string(&tmp);
passphrase = Z_STRVAL(tmp);
}
 
@@ -2313,7 +2314,7 @@
/* passing non string values leaks, object uses toString, it 
returns NULL 
 * bug38255.phpt
 */
-   if (!(Z_TYPE_PP(val) == IS_STRING || Z_TYPE_PP(val) == 
IS_OBJECT)) {
+   if (!(Z_TYPE_PP(val) == IS_STRING || Z_TYPE_PP(val) == 
IS_UNICODE || Z_TYPE_PP(val) == IS_OBJECT)) {
TMP_CLEAN;
}
convert_to_string_ex(val);

-- 
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/openssl openssl.c

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 07:36:12 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c 
  Log:
  Fixed memory leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.36&r2=1.98.2.5.2.37&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.36 
php-src/ext/openssl/openssl.c:1.98.2.5.2.37
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.36 Wed Jul 11 07:26:52 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:36:12 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.36 2007/07/11 07:26:52 dmitry Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.37 2007/07/11 07:36:12 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2608,6 +2608,7 @@
RETVAL_TRUE;
 
bio_mem_len = BIO_get_mem_data(bio_out, &bio_mem_ptr);
+   zval_dtor(out);
ZVAL_STRINGL(out, bio_mem_ptr, bio_mem_len, 1);
}
}

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

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

2007-07-11 Thread Dmitry Stogov

dmitry  Wed Jul 11 07:35:53 2007 UTC

  Modified files:  
/php-src/ext/opensslopenssl.c 
  Log:
  Fixed memory leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.143&r2=1.144&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.143 php-src/ext/openssl/openssl.c:1.144
--- php-src/ext/openssl/openssl.c:1.143 Wed Jul 11 07:27:20 2007
+++ php-src/ext/openssl/openssl.c   Wed Jul 11 07:35:53 2007
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: openssl.c,v 1.143 2007/07/11 07:27:20 dmitry Exp $ */
+/* $Id: openssl.c,v 1.144 2007/07/11 07:35:53 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2610,6 +2610,7 @@
RETVAL_TRUE;
 
bio_mem_len = BIO_get_mem_data(bio_out, &bio_mem_ptr);
+   zval_dtor(out);
ZVAL_STRINGL(out, bio_mem_ptr, bio_mem_len, 1);
}
}

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

Re: [PHP-CVS] cvs: php-src /main/streams plain_wrapper.c

2007-07-11 Thread Jani Taskinen

Shouldn't this be MFH'd??

--Jani

On Tue, 2007-07-10 at 20:13 +, Sascha Schumann wrote:
> sas   Tue Jul 10 20:13:29 2007 UTC
> 
>   Modified files:  
> /php-src/main/streams plain_wrapper.c 
>   Log:
>   - fix concurrent reader/writer use case
> (we read, while the other process writes -> if we don't try
>  read we won't notice that the file has been growing.)
>   
>   
> http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.88&r2=1.89&diff_format=u
> Index: php-src/main/streams/plain_wrapper.c
> diff -u php-src/main/streams/plain_wrapper.c:1.88 
> php-src/main/streams/plain_wrapper.c:1.89
> --- php-src/main/streams/plain_wrapper.c:1.88 Mon May 28 23:00:24 2007
> +++ php-src/main/streams/plain_wrapper.c  Tue Jul 10 20:13:29 2007
> @@ -16,7 +16,7 @@
> +--+
>   */
>  
> -/* $Id: plain_wrapper.c,v 1.88 2007/05/28 23:00:24 iliaa Exp $ */
> +/* $Id: plain_wrapper.c,v 1.89 2007/07/10 20:13:29 sas Exp $ */
>  
>  #include "php.h"
>  #include "php_globals.h"
> @@ -333,9 +333,6 @@
>   assert(data != NULL);
>  
>   if (data->fd >= 0) {
> - if (stream->eof && !data->is_pipe) {
> - return 0;
> - }
>   ret = read(data->fd, buf, count);
>  
>   if (ret == (size_t)-1 && errno == EINTR) {
> 

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

Re: [PHP-CVS] cvs: php-src /main/streams plain_wrapper.c

2007-07-11 Thread Derick Rethans

On Wed, 11 Jul 2007, Antony Dovgal wrote:

> MFH ?

Test case?

Derick

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

Re: [PHP-CVS] cvs: php-src /main/streams plain_wrapper.c

2007-07-11 Thread Antony Dovgal


MFH ?

On 11.07.2007 00:13, Sascha Schumann wrote:

sas Tue Jul 10 20:13:29 2007 UTC

  Modified files:  
/php-src/main/streams	plain_wrapper.c 
  Log:

  - fix concurrent reader/writer use case
(we read, while the other process writes -> if we don't try
 read we won't notice that the file has been growing.)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.88&r2=1.89&diff_format=u

Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.88 
php-src/main/streams/plain_wrapper.c:1.89
--- php-src/main/streams/plain_wrapper.c:1.88   Mon May 28 23:00:24 2007
+++ php-src/main/streams/plain_wrapper.cTue Jul 10 20:13:29 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: plain_wrapper.c,v 1.88 2007/05/28 23:00:24 iliaa Exp $ */

+/* $Id: plain_wrapper.c,v 1.89 2007/07/10 20:13:29 sas Exp $ */
 
 #include "php.h"

 #include "php_globals.h"
@@ -333,9 +333,6 @@
assert(data != NULL);
 
 	if (data->fd >= 0) {

-   if (stream->eof && !data->is_pipe) {
-   return 0;
-   }
ret = read(data->fd, buf, count);
 
 		if (ret == (size_t)-1 && errno == EINTR) {





--
Wbr, 
Antony Dovgal


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

73 matches

Mail list logo