date:20051129

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

2005-11-29 Thread Dmitry Stogov

Hi Marcus,

You broke tests in unicode mode.

Dmitry.

> -Original Message-
> From: Marcus Boerger [mailto:[EMAIL PROTECTED] 
> Sent: Tuesday, November 29, 2005 5:46 AM
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c 
> 
> 
> helly Mon Nov 28 21:46:20 2005 EDT
> 
>   Modified files:  
> /php-src/ext/simplexmlsimplexml.c 
>   Log:
>   - Fix some memleaks
>   
> http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?
> r1=1.177&r2=1.178&ty=u
> Index: php-src/ext/simplexml/simplexml.c
> diff -u php-src/ext/simplexml/simplexml.c:1.177 
> php-src/ext/simplexml/simplexml.c:1.178
> --- php-src/ext/simplexml/simplexml.c:1.177   Sun Nov 20 08:03:15 2005
> +++ php-src/ext/simplexml/simplexml.c Mon Nov 28 21:46:19 2005
> @@ -18,7 +18,7 @@
>
> +-
> -+
>  */
>  
> -/* $Id: simplexml.c,v 1.177 2005/11/20 13:03:15 helly Exp $ */
> +/* $Id: simplexml.c,v 1.178 2005/11/29 02:46:19 helly Exp $ */
>  
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -746,10 +746,19 @@
>  }
>  /* }}} */
>  
> +static inline char * sxe_xmlNodeListGetString(xmlDocPtr doc, 
> xmlNodePtr 
> +list, int inLine) {
> + xmlChar *tmp = xmlNodeListGetString(doc, list, inLine);
> + char*res = estrdup((char*)tmp);
> +
> + xmlFree(tmp);
> + 
> + return res;
> +}
> +
>  /* {{{ _get_base_node_value()
>   */
> -static void
> -_get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr 
> node, zval **value, char *prefix TSRMLS_DC)
> +static void _get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr 
> +node, zval **value, char *prefix TSRMLS_DC)
>  {
>   php_sxe_object *subnode;
>   xmlChar*contents;
> @@ -838,7 +847,7 @@
>   while (attr) {
>   if ((!test || !xmlStrcmp(attr->name, 
> sxe->iter.name)) && match_ns(sxe, (xmlNodePtr)attr, 
> sxe->iter.nsprefix)) {
>   MAKE_STD_ZVAL(value);
> - ZVAL_STRING(value, 
> xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, 
> attr->children, 1), 1);
> + ZVAL_STRING(value, 
> sxe_xmlNodeListGetString((xmlDocPtr) 
> +sxe->document->ptr, attr->children, 1), 0);
>   namelen = xmlStrlen(attr->name) + 1;
>   if (!zattr) {
>   MAKE_STD_ZVAL(zattr);
> @@ -856,7 +865,7 @@
>   if (node && sxe->iter.type != SXE_ITER_ATTRLIST) {
>   if (node->type == XML_ATTRIBUTE_NODE) {
>   MAKE_STD_ZVAL(value);
> - 
> ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), 
> value, xmlNodeListGetString(node->doc, node->children, 1), 1);
> + ZVAL_STRING(value, 
> sxe_xmlNodeListGetString(node->doc, 
> +node->children, 1), 0);
>   zend_hash_next_index_insert(rv, &value, 
> sizeof(zval *), NULL);
>   node = NULL;
>   } else {
> @@ -869,7 +878,7 @@
>   } else {
>   if (node->type == XML_TEXT_NODE) {
>   MAKE_STD_ZVAL(value);
> - 
> ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), 
> value, xmlNodeListGetString(node->doc, node, 1), 1);
> + ZVAL_STRING(value, 
> sxe_xmlNodeListGetString(node->doc, node, 1), 
> +0);
>   
> zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
>   goto next_iter;
>   }
> @@ -2020,7 +2029,7 @@
>  {
>   php_info_print_table_start();
>   php_info_print_table_header(2, "Simplexml support", "enabled");
> - php_info_print_table_row(2, "Revision", "$Revision: 1.177 $");
> + php_info_print_table_row(2, "Revision", "$Revision: 1.178 $");
>   php_info_print_table_row(2, "Schema support",
>  #ifdef LIBXML_SCHEMAS_ENABLED
>   "enabled");
> 
> -- 
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
> 
> 

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

Re: [PHP-CVS] cvs: php-src(PHP_5_1) / acinclude.m4

2005-11-29 Thread Wez Furlong

On 11/29/05, Wez Furlong <[EMAIL PROTECTED]> wrote:
>   For this to be foolproof, we either need to guarantee that the extensions 
> have
>   their PHP_NEW_EXTENSION invoked in the right sequence.

I did have an "or ..." in mind, but can't remember what it was.

>  Eg: PDO should be
>   handled in the configure script before any of the extensions that depend on 
> it
>   are handled... tricky.

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

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

2005-11-29 Thread Wez Furlong

wez Tue Nov 29 23:50:04 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/sqlite config.m4 
  Log:
  Fix dep usage; it must appear after the PHP_NEW_EXTENSION line.
  pdo and spl are both optional dependencies.
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.41&r2=1.41.2.1&ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.41 php-src/ext/sqlite/config.m4:1.41.2.1
--- php-src/ext/sqlite/config.m4:1.41   Mon Jun 13 21:44:16 2005
+++ php-src/ext/sqlite/config.m4Tue Nov 29 23:50:03 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2005/06/14 01:44:16 sniper Exp $
+dnl $Id: config.m4,v 1.41.2.1 2005/11/30 04:50:03 wez Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -105,16 +105,15 @@
 libsqlite/src/vacuum.c libsqlite/src/copy.c \
 libsqlite/src/vdbeaux.c libsqlite/src/date.c \
 libsqlite/src/where.c libsqlite/src/trigger.c"
- 
-PHP_ADD_EXTENSION_DEP(sqlite, spl)
-PHP_ADD_EXTENSION_DEP(sqlite, pdo)
   fi
-
   dnl
   dnl Common for both bundled/external
   dnl
   sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 
   PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+  PHP_ADD_EXTENSION_DEP(sqlite, spl, true)
+  PHP_ADD_EXTENSION_DEP(sqlite, pdo, true)
+
   PHP_ADD_MAKEFILE_FRAGMENT
   PHP_SUBST(SQLITE_SHARED_LIBADD)
   PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h])

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

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

2005-11-29 Thread Wez Furlong

wez Tue Nov 29 23:47:30 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcacinclude.m4 
  Log:
  Fix bugs #35379 and #35432 by erroring out when the user configures PHP
  extensions with conflicting options.
  
  Jani, feel free to refine the way that extensions are detected as shared :)
  
  For this to be foolproof, we either need to guarantee that the extensions have
  their PHP_NEW_EXTENSION invoked in the right sequence.  Eg: PDO should be
  handled in the configure script before any of the extensions that depend on it
  are handled... tricky.
  
  By happy coincidence, the alphabet ensures that pdo is configured before all
  the pdo_ extensions, and also before sqlite, so this works for now.
  
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.332.2.7&r2=1.332.2.8&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.7 php-src/acinclude.m4:1.332.2.8
--- php-src/acinclude.m4:1.332.2.7  Mon Nov 21 18:08:01 2005
+++ php-src/acinclude.m4Tue Nov 29 23:47:24 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.7 2005/11/21 23:08:01 sniper Exp $
+dnl $Id: acinclude.m4,v 1.332.2.8 2005/11/30 04:47:24 wez Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -940,7 +940,7 @@
 
   if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then
 dnl -- Static module
-
+[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
 PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
 EXT_STATIC="$EXT_STATIC $1"
 if test "$3" != "nocli"; then
@@ -949,6 +949,7 @@
   else
 if test "$3" = "shared" || test "$3" = "yes"; then
 dnl -- Shared module
+  [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=yes
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
 *netware*[)]
@@ -964,6 +965,7 @@
 
   if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
 dnl -- CLI static module
+[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
 if test "$PHP_SAPI" = "cgi"; then
   PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
   EXT_STATIC="$EXT_STATIC $1"
@@ -1004,9 +1006,29 @@
 dnl $1 = name of extension, $2 = extension upon which it depends
 dnl $3 = optional: if true, it's ok for $2 to have not been configured
 dnl default is false and should halt the build.
+dnl To be effective, this macro must be invoked *after* PHP_NEW_EXTENSION.
+dnl The extension on which it depends must also have been configured.
 dnl See ADD_EXTENSION_DEP in win32 build 
 dnl
-AC_DEFUN([PHP_ADD_EXTENSION_DEP], [])
+AC_DEFUN([PHP_ADD_EXTENSION_DEP], [
+  am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]
+  is_it_shared=$[PHP_]translit($2,a-z_-,A-Z__)[_SHARED]
+  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
+AC_MSG_ERROR([
+You've configured extension $1 to build statically, but it
+depends on extension $2, which you've configured to build shared.
+You either need to build $1 shared or build $2 statically for the
+build to be successful.
+])
+  fi
+  if test "x$is_it_shared" = "x" && test "x$3" != "xtrue"; then
+AC_MSG_ERROR([
+You've configured extension $1, which depends on extension $2,
+but you've either not enabled $2, or have disabled it.
+])
+  fi
+  dnl Some systems require that we link $2 to $1 when building
+])
 
 dnl -
 dnl Checks for structures, typedefs, broken functions, etc.

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

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

2005-11-29 Thread Wez Furlong

wez Tue Nov 29 22:18:12 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_ociconfig.m4 
  Log:
  Fix PECL Bug #6102; fails to configure for instant client on OSX.
  In addition, make it work for the instant client install on my gentoo box.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14.2.2&r2=1.14.2.3&ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.2 
php-src/ext/pdo_oci/config.m4:1.14.2.3
--- php-src/ext/pdo_oci/config.m4:1.14.2.2  Sun Nov 27 13:36:11 2005
+++ php-src/ext/pdo_oci/config.m4   Tue Nov 29 22:18:09 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.2 2005/11/27 18:36:11 tony2001 Exp $
+dnl $Id: config.m4,v 1.14.2.3 2005/11/30 03:18:09 wez Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -61,10 +61,24 @@
 elif test -f 
$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
   
PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
   
AC_MSG_RESULT($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
+elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
+  PHP_ADD_INCLUDE($PDO_OCI_PREFIX/sdk/include)
+  AC_MSG_RESULT($PDO_OCI_PREFIX/sdk/include)
+elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
+  PHP_ADD_INCLUDE($PDO_OCI_PREFIX/client/include)
+  AC_MSG_RESULT($PDO_OCI_PREFIX/client/include)
 else
   AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in 
your instant client install])
 fi
-PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+if test -f 
"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
+  
PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
+  PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
+elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
+  PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
+else
+  AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your 
instant client install])
+fi
 PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
   else
 if test -d "$PDO_OCI_DIR/rdbms/public"; then

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

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 18:23:33 2005 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  fn
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2086&r2=1.2087&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2086 php-src/NEWS:1.2087
--- php-src/NEWS:1.2086 Wed Nov 23 15:47:41 2005
+++ php-src/NEWSTue Nov 29 18:23:32 2005
@@ -2,10 +2,10 @@
 |||
 ?? ??? , PHP 6.0
 - Unicode support. (Andrei, Dmitry, et al)
-- Cleaned CGI code. Now FastCGI can not be disabled. See into sapi/cgi/CHANGES
+- Cleaned CGI code. Now FastCGI can not be disabled. See sapi/cgi/CHANGES
   for more details. (Dmitry)
-- Removed support for continue and break operators with non-constant operands.
-  (Dmitry)
+- Removed support for "continue" and "break" operators with non-constant
+  operands. (Dmitry)
 - Changed __toString() behavior to call it in all necessary places
   (Marcus, Dmitry)
 - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
@@ -13,13 +13,11 @@
 - Changed reflection constants to class constants. (Johannes)
 - Added "allow_url_include" ini directive to be able to turn off remote url
   code execution separately from the "allow_url_fopen" setting. (Rasmus)
-- Added --enable-gcov configure option to enable C-level code coverage.
-  (John, Jani)
 - Added to cURL extension: (Ilia)
   . curl_setopt_array() which allows setting of multiple cURL options.
   . CURLINFO_HEADER_OUT constant to facilitate request retrieval.
-- Added --rclass and --rextension CLI parameters to reflect internal classes 
and
-  loaded extensions. (Johannes)
+- Added --rclass and --rextension CLI parameters to reflect internal classes
+  and loaded extensions. (Johannes)
 - Added optional parameter to http_build_query() to allow specification of 
   string separator. (Ilia)
 - Added an optional parameter to parse_url() to allow retrieval of distinct URL

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

[PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov NEWS configure.in

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 18:20:07 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-srcMakefile.gcov 

  Modified files:  
/php-srcNEWS configure.in 
  Log:
  MFH: - Added --enable-gcov configure option to enable C-level code coverage.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.252&r2=1.2027.2.253&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.252 php-src/NEWS:1.2027.2.253
--- php-src/NEWS:1.2027.2.252   Tue Nov 29 15:43:52 2005
+++ php-src/NEWSTue Nov 29 18:19:55 2005
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.1.2
+- Added --enable-gcov configure option to enable C-level code coverage.
+  (John, Jani)
 - Added missing support for 'B' format identifier to date() function. (Ilia)
 - Improved SPL: (Marcus)
   . Added class SplFileInfo as root class for DirectoryIterator and 
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.24&r2=1.579.2.25&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.24 php-src/configure.in:1.579.2.25
--- php-src/configure.in:1.579.2.24 Sun Nov 27 12:29:52 2005
+++ php-src/configure.inTue Nov 29 18:20:01 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.24 2005/11/27 17:29:52 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.25 2005/11/29 23:20:01 sniper Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -378,7 +378,8 @@
 utime.h \
 sys/utsname.h \
 sys/ipc.h \
-dlfcn.h
+dlfcn.h \
+assert.h
 ],[],[],[
 #ifdef HAVE_SYS_PARAM_H
 #include 
@@ -597,6 +598,72 @@
 
 PHP_HELP_SEPARATOR([General settings:])
 
+PHP_ARG_ENABLE(gcov,  whether to include gcov symbols,
+[  --enable-gcov   Enable GCOV code coverage (requires LTP) - FOR 
DEVELOPERS ONLY!!], no, no)
+
+if test "$PHP_GCOV" = "yes"; then
+
+  if test "$GCC" != "yes"; then
+AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+  
+  dnl Check if ccache is being used
+  dnl FIXME: Need a check for ccache usage, the one below does not work!
+  PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])
+  
+  if test "$gcc_ccache" = "yes"; then
+if test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"; then
+  AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. 
You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
+fi
+lcov_target="lcov-ccache"
+  fi
+  
+  ltp_version_list="1.4"
+
+  AC_CHECK_PROG(LTP, lcov, lcov)
+  AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
+  PHP_SUBST(LTP)
+  PHP_SUBST(LTP_GENHTML)
+
+  if test "$LTP"; then
+AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [
+  php_cv_ltp_version=invalid
+  ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
+  for ltp_check_version in $ltp_version_list; do
+if test "$ltp_version" = "$ltp_check_version"; then
+  php_cv_ltp_version="$ltp_check_version (ok)"
+fi
+  done
+])
+  else
+ltp_msg="To enable code coverage reporting you must have one of the 
following LTP versions installed: $ltp_version_list"  
+AC_MSG_ERROR([$ltp_msg])
+  fi
+
+  case $php_cv_ltp_version in
+""|invalid[)]
+  ltp_msg="You must have one of the following versions of LTP: 
$ltp_version_list (found: $ltp_version)."
+  AC_MSG_ERROR([$ltp_msg])
+  LTP="exit 0;"
+  ;;
+  esac
+
+  if test -z "$LTP_GENHTML"; then
+AC_MSG_ERROR([Could not find genhtml from the LTP package])
+  fi
+
+  AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
+  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
+
+  dnl Remove all optimization flags from CFLAGS
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+
+  dnl Add the special gcc flags
+  CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
+fi
+
 PHP_ARG_ENABLE(debug, whether to include debugging symbols,
 [  --enable-debug  Compile with debugging symbols], no, no)
 
@@ -1180,7 +1247,7 @@
 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) 
\$(PHP_CLI_TARGET)"
 install_targets="$install_modules install-build install-headers 
install-programs $install_pear"
 
 case $PHP_SAPI in

http://cvs.php.net/co.php/php-src/Makefile.gcov?r=1.1&p=1
Index: php-src/Makefile.gcov
+++ php-src/Makefile.gcov
.php_cov_info.ltpdata:
@mkdir -p .cov/; \
find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' | 
xargs --replace cp {} .cov/; \
find . -name \*.gcda -o -name \*.gcno | sed -e 's/^\.\/\.cov\/.*//' | 
sed -e 's/^\.\///' | xargs --max-args=1 dirname | sed -e 's/\/.*//' | xargs 
--replace ln -s `pwd`/{} `pwd`/.cov > /dev

[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 18:10:48 2005 EDT

  Modified files:  
/php-src/ext/date   php_date.c php_date.h 
  Log:
  MFB51: fixed zts build
  
  
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.72&r2=1.73&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.72 php-src/ext/date/php_date.c:1.73
--- php-src/ext/date/php_date.c:1.72Tue Nov 29 15:48:44 2005
+++ php-src/ext/date/php_date.c Tue Nov 29 18:10:48 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.72 2005/11/29 20:48:44 iliaa Exp $ */
+/* $Id: php_date.c,v 1.73 2005/11/29 23:10:48 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -34,6 +34,7 @@
 function_entry date_functions[] = {
PHP_FE(strtotime, NULL)
PHP_FE(date, NULL)
+   PHP_FE(idate, NULL)
PHP_FE(gmdate, NULL)
PHP_FE(mktime, NULL)
PHP_FE(gmmktime, NULL)
@@ -793,9 +794,6 @@
case 'Z': retval = (int) (!localtime ? offset->offset : 0); 
break;
 
case 'U': retval = (int) t->sse; break;
-   default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Unrecognized date format token.");
-   break;
}
 
if (!localtime) {
@@ -830,6 +828,7 @@
char   *format;
int format_len;
time_t  ts;
+   int ret; 
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, 
&format_len, &ts) == FAILURE) {
RETURN_FALSE;
@@ -844,7 +843,12 @@
ts = time(NULL);
}
 
-   RETURN_LONG(php_idate(format[0], ts, 0));
+   ret = php_idate(format[0], ts, 0);
+   if (ret == -1) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date 
format token.");
+   RETURN_FALSE;
+   }
+   RETURN_LONG(ret);
 }
 /* }}} */
 
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.24 php-src/ext/date/php_date.h:1.25
--- php-src/ext/date/php_date.h:1.24Tue Nov 29 15:27:21 2005
+++ php-src/ext/date/php_date.h Tue Nov 29 18:10:48 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.24 2005/11/29 20:27:21 iliaa Exp $ */
+/* $Id: php_date.h,v 1.25 2005/11/29 23:10:48 iliaa Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -28,6 +28,7 @@
 #define phpext_date_ptr &date_module_entry
 
 PHP_FUNCTION(date);
+PHP_FUNCTION(idate);
 PHP_FUNCTION(gmdate);
 PHP_FUNCTION(strtotime);
 

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date php_date.c php_date.h

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 18:10:22 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/date   php_date.c php_date.h 
  Log:
  Fixed ZTS build
  
  
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.27&r2=1.43.2.28&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.27 
php-src/ext/date/php_date.c:1.43.2.28
--- php-src/ext/date/php_date.c:1.43.2.27   Tue Nov 29 15:43:53 2005
+++ php-src/ext/date/php_date.c Tue Nov 29 18:10:14 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.27 2005/11/29 20:43:53 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.28 2005/11/29 23:10:14 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -33,6 +33,7 @@
 function_entry date_functions[] = {
PHP_FE(strtotime, NULL)
PHP_FE(date, NULL)
+   PHP_FE(idate, NULL)
PHP_FE(gmdate, NULL)
PHP_FE(mktime, NULL)
PHP_FE(gmmktime, NULL)
@@ -686,9 +687,6 @@
case 'Z': retval = (int) (!localtime ? offset->offset : 0); 
break;
 
case 'U': retval = (int) t->sse; break;
-   default:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Unrecognized date format token.");
-   break;
}
 
if (!localtime) {
@@ -723,6 +721,7 @@
char   *format;
int format_len;
time_t  ts;
+   int ret; 
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, 
&format_len, &ts) == FAILURE) {
RETURN_FALSE;
@@ -737,7 +736,12 @@
ts = time(NULL);
}
 
-   RETURN_LONG(php_idate(format[0], ts, 0));
+   ret = php_idate(format[0], ts, 0);
+   if (ret == -1) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date 
format token.");
+   RETURN_FALSE;
+   }
+   RETURN_LONG(ret);
 }
 /* }}} */
 
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.17.2.6&r2=1.17.2.7&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.6 
php-src/ext/date/php_date.h:1.17.2.7
--- php-src/ext/date/php_date.h:1.17.2.6Tue Nov 29 15:19:56 2005
+++ php-src/ext/date/php_date.h Tue Nov 29 18:10:15 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.17.2.6 2005/11/29 20:19:56 iliaa Exp $ */
+/* $Id: php_date.h,v 1.17.2.7 2005/11/29 23:10:15 iliaa Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -28,6 +28,7 @@
 #define phpext_date_ptr &date_module_entry
 
 PHP_FUNCTION(date);
+PHP_FUNCTION(idate);
 PHP_FUNCTION(gmdate);
 PHP_FUNCTION(strtotime);
 

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

[PHP-CVS] cvs: php-src /build buildcheck.sh

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:42:54 2005 EDT

  Modified files:  
/php-src/build  buildcheck.sh 
  Log:
  MFB: automake dependancy was removed long time ago
  
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.37&r2=1.38&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.37 php-src/build/buildcheck.sh:1.38
--- php-src/build/buildcheck.sh:1.37Wed Aug  3 10:06:38 2005
+++ php-src/build/buildcheck.sh Tue Nov 29 17:42:53 2005
@@ -16,7 +16,7 @@
 #  |  Sascha Schumann <[EMAIL PROTECTED]>|
 #  +--+
 #
-# $Id: buildcheck.sh,v 1.37 2005/08/03 14:06:38 sniper Exp $ 
+# $Id: buildcheck.sh,v 1.38 2005/11/29 22:42:53 sniper Exp $ 
 #
 
 echo "buildconf: checking installation..."
@@ -49,7 +49,7 @@
 if test "$1" = "2" && test "$2" -ge "50"; then
   echo "buildconf: Your version of autoconf likely contains buggy cache code."
   echo "   Running cvsclean for you."
-  echo "   To avoid this, install autoconf-2.13 and automake-1.5."
+  echo "   To avoid this, install autoconf-2.13."
   ./cvsclean
   stamp=
 fi

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

[PHP-CVS] cvs: php-src(PHP_4_4) /build buildcheck.sh

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:41:53 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/build  buildcheck.sh 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.21.2.13&r2=1.21.2.13.2.1&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.21.2.13 
php-src/build/buildcheck.sh:1.21.2.13.2.1
--- php-src/build/buildcheck.sh:1.21.2.13   Thu Apr  7 19:33:50 2005
+++ php-src/build/buildcheck.sh Tue Nov 29 17:41:52 2005
@@ -16,7 +16,7 @@
 #  |  Sascha Schumann <[EMAIL PROTECTED]>|
 #  +--+
 #
-# $Id: buildcheck.sh,v 1.21.2.13 2005/04/07 23:33:50 jon Exp $
+# $Id: buildcheck.sh,v 1.21.2.13.2.1 2005/11/29 22:41:52 sniper Exp $
 #
 
 echo "buildconf: checking installation..."
@@ -49,7 +49,7 @@
 if test "$1" = "2" && test "$2" -ge "50"; then
   echo "buildconf: Your version of autoconf likely contains buggy cache code."
   echo "   Running cvsclean for you."
-  echo "   To avoid this, install autoconf-2.13 and automake-1.5."
+  echo "   To avoid this, install autoconf-2.13."
   ./cvsclean
   stamp=
 fi

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

[PHP-CVS] cvs: php-src(PHP_5_1) /build buildcheck.sh

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:41:16 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/build  buildcheck.sh 
  Log:
  - automake is not needed
  
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.37&r2=1.37.2.1&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.37 php-src/build/buildcheck.sh:1.37.2.1
--- php-src/build/buildcheck.sh:1.37Wed Aug  3 10:06:38 2005
+++ php-src/build/buildcheck.sh Tue Nov 29 17:41:15 2005
@@ -16,7 +16,7 @@
 #  |  Sascha Schumann <[EMAIL PROTECTED]>|
 #  +--+
 #
-# $Id: buildcheck.sh,v 1.37 2005/08/03 14:06:38 sniper Exp $ 
+# $Id: buildcheck.sh,v 1.37.2.1 2005/11/29 22:41:15 sniper Exp $ 
 #
 
 echo "buildconf: checking installation..."
@@ -49,7 +49,7 @@
 if test "$1" = "2" && test "$2" -ge "50"; then
   echo "buildconf: Your version of autoconf likely contains buggy cache code."
   echo "   Running cvsclean for you."
-  echo "   To avoid this, install autoconf-2.13 and automake-1.5."
+  echo "   To avoid this, install autoconf-2.13."
   ./cvsclean
   stamp=
 fi

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

[PHP-CVS] cvs: php-src(PHP_4_4) / buildconf /build build.mk build2.mk

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:39:46 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-srcbuildconf 
/php-src/build  build.mk build2.mk 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.57.4.4&r2=1.57.4.4.2.1&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.57.4.4 php-src/buildconf:1.57.4.4.2.1
--- php-src/buildconf:1.57.4.4  Thu Feb  3 12:43:04 2005
+++ php-src/buildconf   Tue Nov 29 17:39:46 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.57.4.4 2005/02/03 17:43:04 sniper Exp $
+# $Id: buildconf,v 1.57.4.4.2.1 2005/11/29 22:39:46 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case "$EXTRA_VERSION" in
@@ -15,10 +15,6 @@
 debug=no
 
 while test $# -gt 0; do
-  if test "$1" = "--copy"; then
-automake_flags=--copy
-  fi
-
   if test "$1" = "--force"; then
 devok=1
 echo "Forcing buildconf"
@@ -67,7 +63,7 @@
 rm -f generated_lists
 
 if test "$debug" = "yes"; then
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
 else
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR"
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR"
 fi
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.18.2.1&r2=1.18.2.1.4.1&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.18.2.1 php-src/build/build.mk:1.18.2.1.4.1
--- php-src/build/build.mk:1.18.2.1 Sun Mar 14 12:43:44 2004
+++ php-src/build/build.mk  Tue Nov 29 17:39:46 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build.mk,v 1.18.2.1 2004/03/14 17:43:44 sas Exp $ 
+# $Id: build.mk,v 1.18.2.1.4.1 2005/11/29 22:39:46 sniper Exp $ 
 #
 #
 # Makefile to generate build tools
@@ -30,7 +30,7 @@
 
 
 all: $(STAMP) $(ALWAYS)
-   @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
+   @$(MAKE) -s -f build/build2.mk
 
 generated_lists:
@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
@@ -55,7 +55,7 @@
test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \
done; \
find . -type l -exec rm {} \; ; \
-   $(MAKE) AMFLAGS=--copy -f build/build.mk; \
+   $(MAKE) -f build/build.mk; \
cd ..; \
tar cf $$distname.tar $$distname; \
rm -rf $$distname $$distname.tar.*; \
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.9&r2=1.27.4.9.2.1&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.27.4.9 php-src/build/build2.mk:1.27.4.9.2.1
--- php-src/build/build2.mk:1.27.4.9Thu Apr  7 16:49:00 2005
+++ php-src/build/build2.mk Tue Nov 29 17:39:46 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build2.mk,v 1.27.4.9 2005/04/07 20:49:00 sniper Exp $
+# $Id: build2.mk,v 1.27.4.9.2.1 2005/11/29 22:39:46 sniper Exp $
 #
 
 include generated_lists
@@ -23,9 +23,6 @@
 
 LT_TARGETS = ltmain.sh config.guess config.sub
 
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files= $(makefile_am_files:e.am=e)
-
 config_h_in = main/php_config.h.in
 
 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)

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

[PHP-CVS] cvs: php-src(PHP_5_1) / buildconf /build build.mk build2.mk

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:39:20 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcbuildconf 
/php-src/build  build.mk build2.mk 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.64&r2=1.64.2.1&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.64 php-src/buildconf:1.64.2.1
--- php-src/buildconf:1.64  Thu Feb  3 12:42:42 2005
+++ php-src/buildconf   Tue Nov 29 17:39:19 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.64 2005/02/03 17:42:42 sniper Exp $
+# $Id: buildconf,v 1.64.2.1 2005/11/29 22:39:19 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case "$EXTRA_VERSION" in
@@ -15,10 +15,6 @@
 debug=no
 
 while test $# -gt 0; do
-  if test "$1" = "--copy"; then
-automake_flags=--copy
-  fi
-
   if test "$1" = "--force"; then
 devok=1
 echo "Forcing buildconf"
@@ -67,7 +63,7 @@
 rm -f generated_lists
 
 if test "$debug" = "yes"; then
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
 else
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR"
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR"
 fi
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.26&r2=1.26.2.1&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.26 php-src/build/build.mk:1.26.2.1
--- php-src/build/build.mk:1.26 Wed Aug  3 10:06:37 2005
+++ php-src/build/build.mk  Tue Nov 29 17:39:19 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build.mk,v 1.26 2005/08/03 14:06:37 sniper Exp $ 
+# $Id: build.mk,v 1.26.2.1 2005/11/29 22:39:19 sniper Exp $ 
 #
 #
 # Makefile to generate build tools
@@ -30,7 +30,7 @@
 
 
 all: $(STAMP) $(ALWAYS)
-   @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
+   @$(MAKE) -s -f build/build2.mk
 
 generated_lists:
@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
@@ -55,7 +55,7 @@
test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \
done; \
find . -type l -exec rm {} \; ; \
-   $(MAKE) AMFLAGS=--copy -f build/build.mk; \
+   $(MAKE) -f build/build.mk; \
cd ..; \
tar cf $$distname.tar $$distname; \
rm -rf $$distname $$distname.tar.*; \
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.37&r2=1.37.2.1&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.37 php-src/build/build2.mk:1.37.2.1
--- php-src/build/build2.mk:1.37Wed Aug  3 10:06:38 2005
+++ php-src/build/build2.mk Tue Nov 29 17:39:19 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build2.mk,v 1.37 2005/08/03 14:06:38 sniper Exp $ 
+# $Id: build2.mk,v 1.37.2.1 2005/11/29 22:39:19 sniper Exp $ 
 #
 
 include generated_lists
@@ -23,9 +23,6 @@
 
 LT_TARGETS = ltmain.sh config.guess config.sub
 
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files= $(makefile_am_files:e.am=e)
-
 config_h_in = main/php_config.h.in
 
 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)

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

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:38:36 2005 EDT

  Modified files:  
/php-srcconfigure.in 
  Log:
  - Remove unnecessary libgcov entry (the gcc options handle it)
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.594&r2=1.595&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.594 php-src/configure.in:1.595
--- php-src/configure.in:1.594  Mon Nov 21 18:07:31 2005
+++ php-src/configure.inTue Nov 29 17:38:32 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.594 2005/11/21 23:07:31 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.595 2005/11/29 22:38:32 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -608,6 +608,7 @@
   fi
   
   dnl Check if ccache is being used
+  dnl FIXME: Need a check for ccache usage, the one below does not work!
   PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])
   
   if test "$gcc_ccache" = "yes"; then
@@ -621,6 +622,8 @@
 
   AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
+  PHP_SUBST(LTP)
+  PHP_SUBST(LTP_GENHTML)
 
   if test "$LTP"; then
 AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [
@@ -649,10 +652,6 @@
 AC_MSG_ERROR([Could not find genhtml from the LTP package])
   fi
 
-  PHP_SUBST(LTP)
-  PHP_SUBST(LTP_GENHTML)
-
-  PHP_ADD_LIBRARY(gcov)
   AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
 

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

[PHP-CVS] cvs: php-src / buildconf /build build.mk build2.mk

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 17:26:07 2005 EDT

  Modified files:  
/php-srcbuildconf 
/php-src/build  build.mk build2.mk 
  Log:
  - Remove unused lines
  
  
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.65&r2=1.66&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.65 php-src/buildconf:1.66
--- php-src/buildconf:1.65  Tue Aug  9 05:52:45 2005
+++ php-src/buildconf   Tue Nov 29 17:26:04 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: buildconf,v 1.65 2005/08/09 09:52:45 derick Exp $
+# $Id: buildconf,v 1.66 2005/11/29 22:26:04 sniper Exp $
 
 eval `grep '^EXTRA_VERSION=' configure.in`
 case "$EXTRA_VERSION" in
@@ -15,10 +15,6 @@
 debug=no
 
 while test $# -gt 0; do
-  if test "$1" = "--copy"; then
-automake_flags=--copy
-  fi
-
   if test "$1" = "--force"; then
 devok=1
 echo "Forcing buildconf"
@@ -67,7 +63,7 @@
 rm -f generated_lists
 
 if test "$debug" = "yes"; then
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
 else
-  ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" 
ZENDDIR="$ZENDDIR"
+  ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR"
 fi
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.26&r2=1.27&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.26 php-src/build/build.mk:1.27
--- php-src/build/build.mk:1.26 Wed Aug  3 10:06:37 2005
+++ php-src/build/build.mk  Tue Nov 29 17:26:07 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build.mk,v 1.26 2005/08/03 14:06:37 sniper Exp $ 
+# $Id: build.mk,v 1.27 2005/11/29 22:26:07 sniper Exp $ 
 #
 #
 # Makefile to generate build tools
@@ -30,7 +30,7 @@
 
 
 all: $(STAMP) $(ALWAYS)
-   @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
+   @$(MAKE) -s -f build/build2.mk
 
 generated_lists:
@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
@@ -55,7 +55,7 @@
test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \
done; \
find . -type l -exec rm {} \; ; \
-   $(MAKE) AMFLAGS=--copy -f build/build.mk; \
+   $(MAKE) -f build/build.mk; \
cd ..; \
tar cf $$distname.tar $$distname; \
rm -rf $$distname $$distname.tar.*; \
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.37&r2=1.38&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.37 php-src/build/build2.mk:1.38
--- php-src/build/build2.mk:1.37Wed Aug  3 10:06:38 2005
+++ php-src/build/build2.mk Tue Nov 29 17:26:07 2005
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build2.mk,v 1.37 2005/08/03 14:06:38 sniper Exp $ 
+# $Id: build2.mk,v 1.38 2005/11/29 22:26:07 sniper Exp $ 
 #
 
 include generated_lists
@@ -23,9 +23,6 @@
 
 LT_TARGETS = ltmain.sh config.guess config.sub
 
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files= $(makefile_am_files:e.am=e)
-
 config_h_in = main/php_config.h.in
 
 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)

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

[PHP-CVS] cvs: php-src / config.guess config.sub ltmain.sh /build libtool.m4

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 16:33:13 2005 EDT

  Modified files:  
/php-srcconfig.sub config.guess ltmain.sh 
/php-src/build  libtool.m4 
  Log:
  MFB51: Update bundled libtool to version 1.5.20
  http://cvs.php.net/diff.php/php-src/config.sub?r1=1.18&r2=1.19&ty=u
Index: php-src/config.sub
diff -u php-src/config.sub:1.18 php-src/config.sub:1.19
--- php-src/config.sub:1.18 Fri May 27 09:06:04 2005
+++ php-src/config.sub  Tue Nov 29 16:33:11 2005
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-05-12'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -248,6 +248,7 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+   | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -256,13 +257,14 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+   | ms1 \
| msp430 \
| ns16k | ns32k \
-   | openrisc | or32 \
+   | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
-   | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | 
sh3ele \
+   | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | 
sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b \
@@ -274,6 +276,9 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
+   m32c)
+   basic_machine=$basic_machine-unknown
+   ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -322,6 +327,7 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+   | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -330,6 +336,7 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
+   | ms1-* \
| msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
@@ -337,7 +344,7 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
-   | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+   | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
| sparclite-* \
@@ -352,6 +359,8 @@
| ymp-* \
| z8k-*)
;;
+   m32c-*)
+   ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -762,9 +771,8 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
-   or32 | or32-*)
+   openrisc | openrisc-*)
basic_machine=or32-unknown
-   os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -1090,12 +1098,9 @@
we32k)
basic_machine=we32k-att
;;
-   sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+   sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
-   sh64)
-   basic_machine=sh64-unknown
-   ;;
sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
@@ -1182,7 +1187,8 @@
  | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | 
-skyos*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1200,7 +1206,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9*

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 16:31:35 2005 EDT

  Modified files:  
/php-src/ext/mysqli config.m4 
  Log:
  MFB51: Always use $SED instead of sed
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.m4?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.22 php-src/ext/mysqli/config.m4:1.23
--- php-src/ext/mysqli/config.m4:1.22   Tue Jun  7 08:39:02 2005
+++ php-src/ext/mysqli/config.m4Tue Nov 29 16:31:35 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22 2005/06/07 12:39:02 sniper Exp $
+dnl $Id: config.m4,v 1.23 2005/11/29 21:31:35 sniper Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -30,8 +30,8 @@
   fi
   
   if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; 
then
-MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | sed -e "s/'//g"`
-MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | sed -e "s/'//g"`
+MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
+MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
   else
 AC_MSG_RESULT([mysql_config not found])
 AC_MSG_ERROR([Please reinstall the mysql distribution])

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

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

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 15:48:45 2005 EDT

  Modified files:  
/php-src/ext/date   php_date.c 
  Log:
  Added missing support for 'B' format identifier to date() function.
  
  
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.71&r2=1.72&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.71 php-src/ext/date/php_date.c:1.72
--- php-src/ext/date/php_date.c:1.71Tue Nov 29 15:27:21 2005
+++ php-src/ext/date/php_date.c Tue Nov 29 15:48:44 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.71 2005/11/29 20:27:21 iliaa Exp $ */
+/* $Id: php_date.c,v 1.72 2005/11/29 20:48:44 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -587,7 +587,15 @@
/* time */
case 'a': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"%R", localized ? IS_UNICODE : IS_STRING, am_pm_lower_full(t->h >= 12 ? 1 : 0, 
localized)); break;
case 'A': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"%R", localized ? IS_UNICODE : IS_STRING, am_pm_upper_full(t->h >= 12 ? 1 : 0, 
localized)); break;
-   case 'B': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"[B unimplemented]"); break;
+   case 'B': {
+   int retval = (long)t->sse)-(((long)t->sse) 
- long)t->sse) % 86400) + 3600))) * 10) / 864);
+   while (retval < 0) {
+   retval += 1000;
+   }
+   retval = retval % 1000;
+   date_spprintf(&buffer, 32 TSRMLS_CC, "%03d", 
retval);
+   break;
+   }
case 'g': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
case 'G': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"%d", (int) t->h); break;
case 'h': length = date_spprintf(&buffer, 32 TSRMLS_CC, 
"%02d", (t->h % 12) ? (int) t->h % 12 : 12); break;

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 15:43:54 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/php-src/ext/date   php_date.c 
  Log:
  Added missing support for 'B' format identifier to date() function.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.251&r2=1.2027.2.252&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.251 php-src/NEWS:1.2027.2.252
--- php-src/NEWS:1.2027.2.251   Tue Nov 29 15:19:52 2005
+++ php-src/NEWSTue Nov 29 15:43:52 2005
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 200?, PHP 5.1.2
+- Added missing support for 'B' format identifier to date() function. (Ilia)
 - Improved SPL: (Marcus)
   . Added class SplFileInfo as root class for DirectoryIterator and 
 SplFileObject
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.26&r2=1.43.2.27&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.26 
php-src/ext/date/php_date.c:1.43.2.27
--- php-src/ext/date/php_date.c:1.43.2.26   Tue Nov 29 15:19:56 2005
+++ php-src/ext/date/php_date.c Tue Nov 29 15:43:53 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.26 2005/11/29 20:19:56 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.27 2005/11/29 20:43:53 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -494,7 +494,15 @@
/* time */
case 'a': snprintf(buffer, 32, "%s", t->h >= 12 ? "pm" 
: "am"); break;
case 'A': snprintf(buffer, 32, "%s", t->h >= 12 ? "PM" 
: "AM"); break;
-   case 'B': snprintf(buffer, 32, "[B unimplemented]"); 
break;
+   case 'B': {
+   int retval = (long)t->sse)-(((long)t->sse) 
- long)t->sse) % 86400) + 3600))) * 10) / 864);  
+   while (retval < 0) {
+   retval += 1000;
+   }
+   retval = retval % 1000;
+   snprintf(buffer, 32, "%03d", retval); break;
+   break;
+   }
case 'g': snprintf(buffer, 32, "%d", (t->h % 12) ? 
(int) t->h % 12 : 12); break;
case 'G': snprintf(buffer, 32, "%d", (int) t->h); break;
case 'h': snprintf(buffer, 32, "%02d", (t->h % 12) ? 
(int) t->h % 12 : 12); break;

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

[PHP-CVS] cvs: php-src /ext/date php_date.c php_date.h /ext/date/tests bug35425.phpt /ext/standard basic_functions.c datetime.c datetime.h

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 15:27:21 2005 EDT

  Modified files:  
/php-src/ext/standard   datetime.c datetime.h basic_functions.c 
/php-src/ext/date   php_date.c php_date.h 
/php-src/ext/date/tests bug35425.phpt 
  Log:
  MFB51: Fixed bug #35425 (idate() function ignores timezone settings).
  
  http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.135&r2=1.136&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.135 
php-src/ext/standard/datetime.c:1.136
--- php-src/ext/standard/datetime.c:1.135   Fri Aug 12 22:23:29 2005
+++ php-src/ext/standard/datetime.c Tue Nov 29 15:27:20 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: datetime.c,v 1.135 2005/08/13 02:23:29 wez Exp $ */
+/* $Id: datetime.c,v 1.136 2005/11/29 20:27:20 iliaa Exp $ */
 
 #if HAVE_STRPTIME
 #define _XOPEN_SOURCE
@@ -53,164 +53,6 @@
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && 
!defined(HAVE_DECLARED_TIMEZONE)
-#ifdef NETWARE
-#define timezone_timezone   /* timezone is called '_timezone' in new 
version of LibC */
-#endif
-extern time_t timezone;
-extern int daylight;
-#endif
-
-static int phpday_tab[2][12] = {
-   {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-   {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-};
-
-#define isleap(year) year) % 4) == 0 && ((year) % 100) != 0) || ((year) % 
400)==0)
-#define YEAR_BASE 1900
-
-/* {{{ php_idate
- */
-PHPAPI int php_idate(char format, time_t timestamp, int gm)
-{
-   time_t the_time;
-   struct tm *ta, tmbuf;
-   int h, beat, fd, wd, yd, wk;
-#if !HAVE_TM_GMTOFF
-   long tzone;
-   char *tname[2]= {"GMT Standard Time", "BST"};
-#endif
-   
-   the_time = timestamp;
-
-   if (gm) {
-   ta = php_gmtime_r(&the_time, &tmbuf);
-#if !HAVE_TM_GMTOFF
-   tzone = 0;
-#endif
-   } else {
-   ta = php_localtime_r(&the_time, &tmbuf);
-#if !HAVE_TM_GMTOFF
-#ifdef __CYGWIN__
-   tzone = _timezone;
-#else
-   tzone = timezone;
-#endif
-   tname[0] = tzname[0];
-#endif
-   }
-   
-   switch (format) {
-   case 'U':   /* seconds since the epoch */
-   return (long)the_time;
-   case 'Y':   /* year, numeric, 4 digits */
-   return  ta->tm_year + YEAR_BASE;
-   case 'z':   /* day (of the year) */
-   return ta->tm_yday;
-   case 'y':   /* year, numeric, 2 digits */
-   return (ta->tm_year) % 100;
-   case 'm':   /* month, numeric */
-   case 'n':
-   return ta->tm_mon + 1;
-   case 'd':   /* day of the month, numeric */
-   case 'j':
-   return ta->tm_mday;
-   case 'H':   /* hour, numeric, 24 hour format */
-   case 'G':
-   return ta->tm_hour;
-   case 'h':   /* hour, numeric, 12 hour format */
-   case 'g':
-   h = ta->tm_hour % 12;
-   if (h == 0) {
-   h = 12;
-   }
-   return h;
-   case 'i':   /* minutes, numeric */
-   return ta->tm_min;
-   case 's':   /* seconds, numeric */
-   return  ta->tm_sec;
-   case 't':   /* days in current month */
-   return phpday_tab[isleap((ta->tm_year + 
YEAR_BASE))][ta->tm_mon];
-   case 'w':   /* day of the week, numeric EXTENSION */
-   return ta->tm_wday;
-   case 'Z':   /* timezone offset in seconds */
-#if HAVE_TM_GMTOFF
-   return ta->tm_gmtoff;
-#else
-   return ta->tm_isdst ? -(tzone - 3600) : -tzone;
-#endif
-   case 'L':   /* boolean for leapyear */
-   return isleap(ta->tm_year + YEAR_BASE) ? 1 : 0;
-   case 'B':   /* Swatch Beat a.k.a. Internet Time */
-   beat =  (long)the_time) - (((long)the_time) - 
long)the_time) % 86400) + 3600))) * 10) / 864);
-   while (beat < 0) {
-   beat += 1000;
-   }
-   beat = beat % 1000;
-   return beat;
-   case 'I':
-   return ta->tm_isdst;
-   case 'W':   /* ISO-8601 week number of year, weeks 
starting on Monday */
-   wd = (ta->tm_wday == 0) ? 6 : ta->tm_wday - 1; /* 
weekda

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c php_date.h /ext/date/tests bug35425.phpt /ext/standard basic_functions.c datetime.c datetime.h

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 15:19:56 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/date/tests bug35425.phpt 

  Modified files:  
/php-src/ext/standard   datetime.c datetime.h basic_functions.c 
/php-srcNEWS 
/php-src/ext/date   php_date.c php_date.h 
  Log:
  Fixed bug #35425 (idate() function ignores timezone settings).
  
  http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.134&r2=1.134.2.1&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.134 
php-src/ext/standard/datetime.c:1.134.2.1
--- php-src/ext/standard/datetime.c:1.134   Wed Aug  3 10:07:57 2005
+++ php-src/ext/standard/datetime.c Tue Nov 29 15:19:48 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: datetime.c,v 1.134 2005/08/03 14:07:57 sniper Exp $ */
+/* $Id: datetime.c,v 1.134.2.1 2005/11/29 20:19:48 iliaa Exp $ */
 
 #if HAVE_STRPTIME
 #define _XOPEN_SOURCE
@@ -53,163 +53,6 @@
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
-#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && 
!defined(HAVE_DECLARED_TIMEZONE)
-#ifdef NETWARE
-#define timezone_timezone   /* timezone is called '_timezone' in new 
version of LibC */
-#endif
-extern time_t timezone;
-extern int daylight;
-#endif
-
-static int phpday_tab[2][12] = {
-   {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-   {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-};
-
-#define isleap(year) year) % 4) == 0 && ((year) % 100) != 0) || ((year) % 
400)==0)
-#define YEAR_BASE 1900
-
-/* {{{ php_idate
- */
-PHPAPI int php_idate(char format, int timestamp, int gm)
-{
-   time_t the_time;
-   struct tm *ta, tmbuf;
-   int h, beat, fd, wd, yd, wk;
-#if !HAVE_TM_GMTOFF
-   long tzone;
-   char *tname[2]= {"GMT Standard Time", "BST"};
-#endif
-   
-   the_time = timestamp;
-
-   if (gm) {
-   ta = php_gmtime_r(&the_time, &tmbuf);
-#if !HAVE_TM_GMTOFF
-   tzone = 0;
-#endif
-   } else {
-   ta = php_localtime_r(&the_time, &tmbuf);
-#if !HAVE_TM_GMTOFF
-#ifdef __CYGWIN__
-   tzone = _timezone;
-#else
-   tzone = timezone;
-#endif
-   tname[0] = tzname[0];
-#endif
-   }
-   
-   switch (format) {
-   case 'U':   /* seconds since the epoch */
-   return (long)the_time;
-   case 'Y':   /* year, numeric, 4 digits */
-   return  ta->tm_year + YEAR_BASE;
-   case 'z':   /* day (of the year) */
-   return ta->tm_yday;
-   case 'y':   /* year, numeric, 2 digits */
-   return (ta->tm_year) % 100;
-   case 'm':   /* month, numeric */
-   case 'n':
-   return ta->tm_mon + 1;
-   case 'd':   /* day of the month, numeric */
-   case 'j':
-   return ta->tm_mday;
-   case 'H':   /* hour, numeric, 24 hour format */
-   case 'G':
-   return ta->tm_hour;
-   case 'h':   /* hour, numeric, 12 hour format */
-   case 'g':
-   h = ta->tm_hour % 12;
-   if (h == 0) {
-   h = 12;
-   }
-   return h;
-   case 'i':   /* minutes, numeric */
-   return ta->tm_min;
-   case 's':   /* seconds, numeric */
-   return  ta->tm_sec;
-   case 't':   /* days in current month */
-   return phpday_tab[isleap((ta->tm_year + 
YEAR_BASE))][ta->tm_mon];
-   case 'w':   /* day of the week, numeric EXTENSION */
-   return ta->tm_wday;
-   case 'Z':   /* timezone offset in seconds */
-#if HAVE_TM_GMTOFF
-   return ta->tm_gmtoff;
-#else
-   return ta->tm_isdst ? -(tzone - 3600) : -tzone;
-#endif
-   case 'L':   /* boolean for leapyear */
-   return isleap(ta->tm_year + YEAR_BASE) ? 1 : 0;
-   case 'B':   /* Swatch Beat a.k.a. Internet Time */
-   beat =  (long)the_time) - (((long)the_time) - 
long)the_time) % 86400) + 3600))) * 10) / 864);
-   while (beat < 0) {
-   beat += 1000;
-   }
-   beat = beat % 1000;
-   return beat;
-   case 'I':
-   return ta->tm_isdst;
-   case 'W':   /* ISO-8601 week number of year, weeks 
starting on Monday */
-

[PHP-CVS] cvs: CVSROOT / avail

2005-11-29 Thread Pierre-Alain Joye

pajoye  Tue Nov 29 14:29:50 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  - peardoc for fa
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1054&r2=1.1055&ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1054 CVSROOT/avail:1.1055
--- CVSROOT/avail:1.1054Tue Nov 29 06:05:44 2005
+++ CVSROOT/avail   Tue Nov 29 14:29:46 2005
@@ -303,7 +303,7 @@
 avail|mikl|pecl/memcache
 avail|norro|pear/Image_3D
 avail|ttsuruoka|pear/Services_Amazon
-avail|fa|pear/Net_DNS,pear/Net_IPv4
+avail|fa|peardoc,pear/Net_DNS,pear/Net_IPv4
 
 # Curl modules
 
avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www

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

[PHP-CVS] cvs: php-src /ext/pcre config0.m4 /ext/zlib config0.m4

2005-11-29 Thread Antony Dovgal

tony2001Tue Nov 29 13:38:48 2005 EDT

  Modified files:  
/php-src/ext/pcre   config0.m4 
/php-src/ext/zlib   config0.m4 
  Log:
  MF51: change "-o" to "||" to support weird systems with broken `test`
  
  
http://cvs.php.net/diff.php/php-src/ext/pcre/config0.m4?r1=1.37&r2=1.38&ty=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.37 php-src/ext/pcre/config0.m4:1.38
--- php-src/ext/pcre/config0.m4:1.37Wed Nov 16 17:14:24 2005
+++ php-src/ext/pcre/config0.m4 Tue Nov 29 13:38:48 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.37 2005/11/16 22:14:24 sniper Exp $
+dnl $Id: config0.m4,v 1.38 2005/11/29 18:38:48 tony2001 Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -27,7 +27,7 @@
 fi
 
 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
-  test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && 
PCRE_LIBDIR=$j
+  test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && 
PCRE_LIBDIR=$j
 done
 
 if test -z "$PCRE_LIBDIR" ; then
http://cvs.php.net/diff.php/php-src/ext/zlib/config0.m4?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/zlib/config0.m4
diff -u php-src/ext/zlib/config0.m4:1.17 php-src/ext/zlib/config0.m4:1.18
--- php-src/ext/zlib/config0.m4:1.17Sun May 29 19:16:45 2005
+++ php-src/ext/zlib/config0.m4 Tue Nov 29 13:38:48 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.17 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config0.m4,v 1.18 2005/11/29 18:38:48 tony2001 Exp $
 dnl
 
 PHP_ARG_WITH(zlib,for ZLIB support,
@@ -8,7 +8,7 @@
 PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
 [  --with-zlib-dir=   Define the location of zlib install directory], no, 
no)
 
-if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
+if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, 
$ext_shared)
   PHP_SUBST(ZLIB_SHARED_LIBADD)
   

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/ming config.m4 /ext/pcre config0.m4 /ext/zlib config0.m4

2005-11-29 Thread Antony Dovgal

tony2001Tue Nov 29 13:35:27 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ming   config.m4 
/php-src/ext/pcre   config0.m4 
/php-src/ext/zlib   config0.m4 
  Log:
  remaining part of the fix (-o -> ||)
  
  
http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22.2.4&r2=1.22.2.5&ty=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.4 php-src/ext/ming/config.m4:1.22.2.5
--- php-src/ext/ming/config.m4:1.22.2.4 Sun Nov 27 18:22:42 2005
+++ php-src/ext/ming/config.m4  Tue Nov 29 13:35:24 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22.2.4 2005/11/27 23:22:42 sniper Exp $
+dnl $Id: config.m4,v 1.22.2.5 2005/11/29 18:35:24 tony2001 Exp $
 dnl
 
 PHP_ARG_WITH(ming, for MING support,
@@ -9,7 +9,7 @@
   AC_CHECK_LIB(m, sin)
 
   for i in $PHP_MING /usr/local /usr; do
-if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f 
$i/$PHP_LIBDIR/libming.a; then
+if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME || test -f 
$i/$PHP_LIBDIR/libming.a; then
   MING_DIR=$i
   break
 fi
http://cvs.php.net/diff.php/php-src/ext/pcre/config0.m4?r1=1.36.2.1&r2=1.36.2.2&ty=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.36.2.1 
php-src/ext/pcre/config0.m4:1.36.2.2
--- php-src/ext/pcre/config0.m4:1.36.2.1Wed Nov 16 17:14:32 2005
+++ php-src/ext/pcre/config0.m4 Tue Nov 29 13:35:26 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.36.2.1 2005/11/16 22:14:32 sniper Exp $
+dnl $Id: config0.m4,v 1.36.2.2 2005/11/29 18:35:26 tony2001 Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -27,7 +27,7 @@
 fi
 
 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
-  test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && 
PCRE_LIBDIR=$j
+  test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && 
PCRE_LIBDIR=$j
 done
 
 if test -z "$PCRE_LIBDIR" ; then
http://cvs.php.net/diff.php/php-src/ext/zlib/config0.m4?r1=1.17&r2=1.17.2.1&ty=u
Index: php-src/ext/zlib/config0.m4
diff -u php-src/ext/zlib/config0.m4:1.17 php-src/ext/zlib/config0.m4:1.17.2.1
--- php-src/ext/zlib/config0.m4:1.17Sun May 29 19:16:45 2005
+++ php-src/ext/zlib/config0.m4 Tue Nov 29 13:35:26 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.17 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config0.m4,v 1.17.2.1 2005/11/29 18:35:26 tony2001 Exp $
 dnl
 
 PHP_ARG_WITH(zlib,for ZLIB support,
@@ -8,7 +8,7 @@
 PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
 [  --with-zlib-dir=   Define the location of zlib install directory], no, 
no)
 
-if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
+if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, 
$ext_shared)
   PHP_SUBST(ZLIB_SHARED_LIBADD)
   

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/dba config.m4 /ext/gd config.m4 /ext/snmp config.m4 /ext/standard config.m4 /ext/xmlrpc config.m4 /sapi/caudium config.m4 /sapi/roxen config.m4

2005-11-29 Thread Antony Dovgal

tony2001Tue Nov 29 13:26:03 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/dbaconfig.m4 
/php-src/ext/gd config.m4 
/php-src/ext/snmp   config.m4 
/php-src/ext/standard   config.m4 
/php-src/ext/xmlrpc config.m4 
/php-src/sapi/caudium   config.m4 
/php-src/sapi/roxen config.m4 
  Log:
  change "-o" to "||" (fixes potential problems on weird systems where test 
doesn't support -o)
  
  http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.70.2.1&r2=1.70.2.2&ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.70.2.1 php-src/ext/dba/config.m4:1.70.2.2
--- php-src/ext/dba/config.m4:1.70.2.1  Mon Aug 22 15:59:28 2005
+++ php-src/ext/dba/config.m4   Tue Nov 29 13:25:58 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70.2.1 2005/08/22 19:59:28 iliaa Exp $
+dnl $Id: config.m4,v 1.70.2.2 2005/11/29 18:25:58 tony2001 Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -55,7 +55,7 @@
   if test -n "$3"; then
 AC_MSG_ERROR($3)
   fi
-  if test "$THIS_RESULT" = "yes" -o "$THIS_RESULT" = "builtin"; then
+  if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
 HAVE_DBA=1
 eval HAVE_$THIS_NAME=1
 AC_MSG_RESULT($THIS_RESULT)
@@ -171,7 +171,7 @@
 dnl parameters(version, library list, function)
 AC_DEFUN([PHP_DBA_DB_CHECK],[
   for LIB in $2; do
-if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a -o -f 
$THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
+if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f 
$THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
   PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
 AC_TRY_LINK([
 #include "$THIS_INCLUDE"
@@ -306,7 +306,7 @@
 [  --with-db2[=DIR]  DBA: Include Berkeley DB2 support],[
   if test "$withval" != "no"; then
 PHP_DBA_STD_BEGIN
-if test "$HAVE_DB3" = "1" -o "$HAVE_DB4" = "1"; then
+if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then
   AC_DBA_STD_RESULT(db2,Berkeley DB2,You cannot combine --with-db2 with 
--with-db3 or --with-db4)
 fi
 for i in $withval $withval/BerkeleyDB /usr/BerkeleyDB /usr/local /usr; do
@@ -354,7 +354,7 @@
   THIS_LIBS=$DB2_LIBS
   THIS_PREFIX=$DB2_PREFIX
 fi
-if test "$HAVE_DB4" = "1" -o "$HAVE_DB3" = "1" -o "$HAVE_DB2" = "1"; then
+if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = 
"1"; then
   AC_DEFINE_UNQUOTED(DB1_VERSION, "Berkeley DB 1.85 emulation in 
DB$THIS_VERSION", [ ])
   for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h 
include/db/db_185.h; do
 if test -f "$THIS_PREFIX/$i"; then
@@ -463,7 +463,7 @@
 
 AC_ARG_WITH(cdb,
 [  --with-cdb[=DIR]  DBA: Include CDB support],[
-  if test "$withval" = "yes" -o "$HAVE_DBA" = "1"; then
+  if test "$withval" = "yes" || test "$HAVE_DBA" = "1"; then
 PHP_DBA_BUILTIN_CDB
   elif test "$withval" != "no"; then
 PHP_DBA_STD_BEGIN
@@ -493,7 +493,7 @@
 PHP_DBA_STD_ATTACH
   fi
 ],[
-  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
 PHP_DBA_BUILTIN_CDB
   fi
 ])
@@ -511,7 +511,7 @@
 PHP_DBA_BUILTIN_INI
   fi
 ],[
-  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
 PHP_DBA_BUILTIN_INI
   fi
 ])
@@ -532,7 +532,7 @@
 PHP_DBA_BUILTIN_FLATFILE
   fi
 ],[
-  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
 PHP_DBA_BUILTIN_FLATFILE
   fi
 ])
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.154&r2=1.154.2.1&ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154 php-src/ext/gd/config.m4:1.154.2.1
--- php-src/ext/gd/config.m4:1.154  Sun May 29 19:16:41 2005
+++ php-src/ext/gd/config.m4Tue Nov 29 13:25:59 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.154 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1 2005/11/29 18:25:59 tony2001 Exp $
 dnl
 
 dnl
@@ -51,7 +51,7 @@
   if test "$PHP_JPEG_DIR" != "no"; then
 
 for i in $PHP_JPEG_DIR /usr/local /usr; do
-  test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f 
$i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
+  test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f 
$i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
 done
 
 if test -z "$GD_JPEG_DIR"; then
@@ -76,7 +76,7 @@
   if test "$PHP_PNG_DIR" != "no"; then
 
 for i in $PHP_PNG_DIR /usr/local /usr; do
-  test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f 
$i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+  test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f 
$i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
 done
 
 if test -z "$GD_PNG_DIR"; then
@@ -111,7 +111,7 @@
   if test "$PHP_XPM_DIR" != "no"; then
 
 for i in $PHP_XPM_

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_pgsql pgsql_driver.c

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 13:17:50 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql  pgsql_driver.c 
  Log:
  Fixed compiler warnings
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.3&r2=1.53.2.4&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.3 
php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.4
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.3   Mon Nov 28 23:06:03 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.cTue Nov 29 13:17:46 2005
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pgsql_driver.c,v 1.53.2.3 2005/11/29 04:06:03 wez Exp $ */
+/* $Id: pgsql_driver.c,v 1.53.2.4 2005/11/29 18:17:46 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -210,11 +210,9 @@
pdo_pgsql_stmt *S = ecalloc(1, sizeof(pdo_pgsql_stmt));
int scrollable;
 #if HAVE_PQPREPARE
-   PGresult *res;
int ret;
char *nsql = NULL;
int nsql_len = 0;
-   ExecStatusType status;
 #endif
 
S->H = H;
@@ -490,7 +488,7 @@
 
if (lfd != InvalidOid) {
char *buf;
-   spprintf(&buf, 0, "%lu", lfd);
+   spprintf(&buf, 0, "%lu", (long) lfd);
RETURN_STRING(buf, 0);
}


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

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 12:32:40 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/mysqli config.m4 
  Log:
  - Always use the right sed
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.m4?r1=1.22&r2=1.22.2.1&ty=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.22 php-src/ext/mysqli/config.m4:1.22.2.1
--- php-src/ext/mysqli/config.m4:1.22   Tue Jun  7 08:39:02 2005
+++ php-src/ext/mysqli/config.m4Tue Nov 29 12:32:40 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22 2005/06/07 12:39:02 sniper Exp $
+dnl $Id: config.m4,v 1.22.2.1 2005/11/29 17:32:40 sniper Exp $
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -30,8 +30,8 @@
   fi
   
   if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; 
then
-MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | sed -e "s/'//g"`
-MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | sed -e "s/'//g"`
+MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
+MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
   else
 AC_MSG_RESULT([mysql_config not found])
 AC_MSG_ERROR([Please reinstall the mysql distribution])

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

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 12:31:19 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/pdo_mysql  config.m4 
  Log:
  cleanup + fix link problems with old mysql versions
  
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.4&r2=1.25.2.5&ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.4 
php-src/ext/pdo_mysql/config.m4:1.25.2.5
--- php-src/ext/pdo_mysql/config.m4:1.25.2.4Fri Nov 25 12:07:49 2005
+++ php-src/ext/pdo_mysql/config.m4 Tue Nov 29 12:31:13 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25.2.4 2005/11/25 17:07:49 wez Exp $
+dnl $Id: config.m4,v 1.25.2.5 2005/11/29 17:31:13 sniper Exp $
 dnl
 
 if test "$PHP_PDO" != "no"; then
@@ -33,7 +33,7 @@
   fi
 else
   AC_MSG_RESULT([$PHP_PDO_MYSQL is not a directory])
-  AC_MSG_ERROR([can't find mysql under the "$PHP_PDO_MYSQL" that you 
specified])
+  AC_MSG_ERROR([can not find mysql under the "$PHP_PDO_MYSQL" that you 
specified])
 fi
   else
 for i in /usr/local /usr ; do
@@ -50,10 +50,9 @@
 
   if test -n "$PDO_MYSQL_CONFIG" && test -x "$PDO_MYSQL_CONFIG" ; then
 AC_MSG_RESULT($PDO_MYSQL_CONFIG)
-PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags`
-PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs`
- PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 
-PHP_SUBST_OLD(PDO_MYSQL_LIBS)
+PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
+PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
+PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 
   elif test -z "$PDO_MYSQL_DIR"; then
 AC_MSG_RESULT([not found])
 AC_MSG_ERROR([Cannot find MySQL header files under $PDO_MYSQL_DIR])
@@ -74,7 +73,7 @@
 if test -r "$PDO_MYSQL_LIB_DIR"; then
   AC_MSG_RESULT([libs under $PDO_MYSQL_LIB_DIR; seems promising])
 else
-  AC_MSG_RESULT([can't find it])
+  AC_MSG_RESULT([can not find it])
   AC_MSG_ERROR([Unable to find your mysql installation])
 fi
 
@@ -118,7 +117,7 @@
   PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, 
$ext_shared,,-I$pdo_inc_path $PDO_MYSQL_INCLUDE)
   ifdef([PHP_ADD_EXTENSION_DEP],
   [
-   PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
   ])
   PDO_MYSQL_MODULE_TYPE=external
  

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

[PHP-CVS] cvs: php-src /ext/date/tests date_default_timezone_get-1.phpt date_default_timezone_set-1.phpt

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 11:25:39 2005 EDT

  Modified files:  
/php-src/ext/date/tests date_default_timezone_get-1.phpt 
date_default_timezone_set-1.phpt 
  Log:
  MFB51: fixed date tests
  
  
http://cvs.php.net/diff.php/php-src/ext/date/tests/date_default_timezone_get-1.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/date/tests/date_default_timezone_get-1.phpt
diff -u php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.4 
php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.5
--- php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.4 Wed Oct 19 
07:18:16 2005
+++ php-src/ext/date/tests/date_default_timezone_get-1.phpt Tue Nov 29 
11:25:39 2005
@@ -9,8 +9,8 @@
echo date('e'), "\n";
 ?>
 --EXPECTF--
-Strict Standards: date_default_timezone_get(): It is not safe to rely on the 
system's timezone settings. Please use the date.timezone setting, the TZ 
environment variable or the date_default_timezone_set() function. We selected 
'Europe/London' for 'UTC/0.0/no DST' instead in 
%sdate_default_timezone_get-1.php on line 3
-Europe/London
+Strict Standards: date_default_timezone_get(): It is not safe to rely on the 
system's timezone settings. Please use the date.timezone setting, the TZ 
environment variable or the date_default_timezone_set() function. We selected 
'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 
3
+UTC
 
-Strict Standards: date(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4
-Europe/London
+Strict Standards: date(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_get-1.php on line 4
+UTC
\ No newline at end of file
http://cvs.php.net/diff.php/php-src/ext/date/tests/date_default_timezone_set-1.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/date/tests/date_default_timezone_set-1.phpt
diff -u php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.4 
php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.5
--- php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.4 Thu Nov 17 
16:07:27 2005
+++ php-src/ext/date/tests/date_default_timezone_set-1.phpt Tue Nov 29 
11:25:39 2005
@@ -18,11 +18,11 @@
echo date(date::ISO8601, $date4), "\n";
 ?>
 --EXPECTF--
-Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3
+Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_set-1.php on line 3
 
-Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4
+Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_set-1.php on line 4
 America/Indiana/Knox
 2005-01-12T03:00:00-0500
-2005-07-12T02:00:00-0500
+2005-07-12T03:00:00-0500
 2005-01-12T08:00:00-0500
 2005-07-12T08:00:00-0500

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/tests date_default_timezone_get-1.phpt date_default_timezone_set-1.phpt

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 11:25:16 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/date/tests date_default_timezone_get-1.phpt 
date_default_timezone_set-1.phpt 
  Log:
  Fixed tests
  
  
http://cvs.php.net/diff.php/php-src/ext/date/tests/date_default_timezone_get-1.phpt?r1=1.2.2.2&r2=1.2.2.3&ty=u
Index: php-src/ext/date/tests/date_default_timezone_get-1.phpt
diff -u php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.2.2.2 
php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.2.2.3
--- php-src/ext/date/tests/date_default_timezone_get-1.phpt:1.2.2.2 Wed Oct 
19 07:18:51 2005
+++ php-src/ext/date/tests/date_default_timezone_get-1.phpt Tue Nov 29 
11:25:16 2005
@@ -9,8 +9,8 @@
echo date('e'), "\n";
 ?>
 --EXPECTF--
-Strict Standards: date_default_timezone_get(): It is not safe to rely on the 
system's timezone settings. Please use the date.timezone setting, the TZ 
environment variable or the date_default_timezone_set() function. We selected 
'Europe/London' for 'UTC/0.0/no DST' instead in 
%sdate_default_timezone_get-1.php on line 3
-Europe/London
+Strict Standards: date_default_timezone_get(): It is not safe to rely on the 
system's timezone settings. Please use the date.timezone setting, the TZ 
environment variable or the date_default_timezone_set() function. We selected 
'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 
3
+UTC
 
-Strict Standards: date(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4
-Europe/London
+Strict Standards: date(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_get-1.php on line 4
+UTC
\ No newline at end of file
http://cvs.php.net/diff.php/php-src/ext/date/tests/date_default_timezone_set-1.phpt?r1=1.1.2.4&r2=1.1.2.5&ty=u
Index: php-src/ext/date/tests/date_default_timezone_set-1.phpt
diff -u php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.1.2.4 
php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.1.2.5
--- php-src/ext/date/tests/date_default_timezone_set-1.phpt:1.1.2.4 Sun Nov 
27 01:51:43 2005
+++ php-src/ext/date/tests/date_default_timezone_set-1.phpt Tue Nov 29 
11:25:16 2005
@@ -18,11 +18,11 @@
echo date(DATE_ISO8601, $date4), "\n";
 ?>
 --EXPECTF--
-Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3
+Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_set-1.php on line 3
 
-Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'Europe/London' for 
'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4
+Strict Standards: strtotime(): It is not safe to rely on the system's timezone 
settings. Please use the date.timezone setting, the TZ environment variable or 
the date_default_timezone_set() function. We selected 'UTC' for 'UTC/0.0/no 
DST' instead in %sdate_default_timezone_set-1.php on line 4
 America/Indiana/Knox
 2005-01-12T03:00:00-0500
-2005-07-12T02:00:00-0500
+2005-07-12T03:00:00-0500
 2005-01-12T08:00:00-0500
 2005-07-12T08:00:00-0500

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

[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings str_word_count.phpt

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 11:14:48 2005 EDT

  Modified files:  
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings str_word_count.phpt 
  Log:
  MFB51: Fixed bug #35427 (str_word_count() handles '-' incorrectly).
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.506&r2=1.507&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.506 php-src/ext/standard/string.c:1.507
--- php-src/ext/standard/string.c:1.506 Sat Nov 12 09:56:35 2005
+++ php-src/ext/standard/string.c   Tue Nov 29 11:14:47 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.506 2005/11/12 14:56:35 derick Exp $ */
+/* $Id: string.c,v 1.507 2005/11/29 16:14:47 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -6531,33 +6531,38 @@
if (type == 1 || type == 2) {
array_init(return_value);
}
-   
+
+   /* first character cannot be ' or -, unless explicitly allowed by the 
user */
+   if ((*p == '\'' && (!char_list || !ch['\''])) || (*p == '-' && 
(!char_list || !ch['-']))) {
+   p++;
+   }
+   /* last character cannot be -, unless explicitly allowed by the user */
+   if (*(e - 1) == '-' && (!char_list || !ch['-'])) {
+   e--;
+   }
+
while (p < e) {
-   if (isalpha(*p) || (char_list && ch[(unsigned char)*p])) {
-   s = ++p - 1;
-   while (isalpha(*p) || *p == '\'' || (*p == '-' && 
isalpha(*(p+1))) || (char_list && ch[(unsigned char)*p])) {
-   p++;
-   }
-   
+   s = p;
+   while (p < e && (isalpha(*p) || (char_list && ch[(unsigned 
char)*p]) || *p == '\'' || *p == '-')) {
+   p++;
+   }
+   if (p > s) {
switch (type)
{
case 1:
buf = estrndup(s, (p-s));
-   add_next_index_stringl(return_value, 
buf, (p-s), 1);
-   efree(buf);
+   add_next_index_stringl(return_value, 
buf, (p-s), 0);
break;
case 2:
buf = estrndup(s, (p-s));
-   add_index_stringl(return_value, (s - 
str), buf, p-s, 1);
-   efree(buf);
+   add_index_stringl(return_value, (s - 
str), buf, p-s, 0);
break;
default:
word_count++;
break;  
}
-   } else {
-   p++;
}
+   p++;
}

if (!type) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/str_word_count.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/standard/tests/strings/str_word_count.phpt
diff -u php-src/ext/standard/tests/strings/str_word_count.phpt:1.5 
php-src/ext/standard/tests/strings/str_word_count.phpt:1.6
--- php-src/ext/standard/tests/strings/str_word_count.phpt:1.5  Thu Aug 18 
02:32:39 2005
+++ php-src/ext/standard/tests/strings/str_word_count.phpt  Tue Nov 29 
11:14:47 2005
@@ -36,7 +36,11 @@
 var_dump(str_word_count($str2, 2, array()));
 var_dump(str_word_count($str2, 2, new stdClass));
 var_dump(str_word_count($str2, 2, ""));
-
+var_dump(str_word_count("foo'0 bar-0var", 2, "0"));
+var_dump(str_word_count("'foo'", 2));
+var_dump(str_word_count("'foo'", 2, "'"));
+var_dump(str_word_count("-foo-", 2));
+var_dump(str_word_count("-foo-", 2, "-"));
 ?>
 --EXPECTF--
 array(6) {
@@ -225,4 +229,26 @@
   string(3) "bar"
   [15]=>
   string(3) "foo"
-}
\ No newline at end of file
+}
+array(2) {
+  [0]=>
+  string(5) "foo'0"
+  [6]=>
+  string(8) "bar-0var"
+}
+array(1) {
+  [1]=>
+  string(4) "foo'"
+}
+array(1) {
+  [0]=>
+  string(5) "'foo'"
+}
+array(1) {
+  [1]=>
+  string(3) "foo"
+}
+array(1) {
+  [0]=>
+  string(5) "-foo-"
+}

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

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard string.c /ext/standard/tests/strings str_word_count.phpt

2005-11-29 Thread Ilia Alshanetsky

iliaa   Tue Nov 29 11:14:20 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   string.c 
/php-src/ext/standard/tests/strings str_word_count.phpt 
/php-srcNEWS 
  Log:
  Fixed bug #35427 (str_word_count() handles '-' incorrectly).
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.445.2.1&r2=1.445.2.2&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.1 
php-src/ext/standard/string.c:1.445.2.2
--- php-src/ext/standard/string.c:1.445.2.1 Wed Sep 28 18:39:52 2005
+++ php-src/ext/standard/string.c   Tue Nov 29 11:14:17 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.1 2005/09/28 22:39:52 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.2 2005/11/29 16:14:17 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4735,33 +4735,38 @@
if (type == 1 || type == 2) {
array_init(return_value);
}
-   
+
+   /* first character cannot be ' or -, unless explicitly allowed by the 
user */
+   if ((*p == '\'' && (!char_list || !ch['\''])) || (*p == '-' && 
(!char_list || !ch['-']))) {
+   p++;
+   }
+   /* last character cannot be -, unless explicitly allowed by the user */
+   if (*(e - 1) == '-' && (!char_list || !ch['-'])) {
+   e--;
+   }
+
while (p < e) {
-   if (isalpha(*p) || (char_list && ch[(unsigned char)*p])) {
-   s = ++p - 1;
-   while (isalpha(*p) || *p == '\'' || (*p == '-' && 
isalpha(*(p+1))) || (char_list && ch[(unsigned char)*p])) {
-   p++;
-   }
-   
+   s = p;
+   while (p < e && (isalpha(*p) || (char_list && ch[(unsigned 
char)*p]) || *p == '\'' || *p == '-')) {
+   p++;
+   }
+   if (p > s) {
switch (type)
{
case 1:
buf = estrndup(s, (p-s));
-   add_next_index_stringl(return_value, 
buf, (p-s), 1);
-   efree(buf);
+   add_next_index_stringl(return_value, 
buf, (p-s), 0);
break;
case 2:
buf = estrndup(s, (p-s));
-   add_index_stringl(return_value, (s - 
str), buf, p-s, 1);
-   efree(buf);
+   add_index_stringl(return_value, (s - 
str), buf, p-s, 0);
break;
default:
word_count++;
break;  
}
-   } else {
-   p++;
}
+   p++;
}

if (!type) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/str_word_count.phpt?r1=1.4&r2=1.4.2.1&ty=u
Index: php-src/ext/standard/tests/strings/str_word_count.phpt
diff -u php-src/ext/standard/tests/strings/str_word_count.phpt:1.4 
php-src/ext/standard/tests/strings/str_word_count.phpt:1.4.2.1
--- php-src/ext/standard/tests/strings/str_word_count.phpt:1.4  Sat Jul 23 
15:44:12 2005
+++ php-src/ext/standard/tests/strings/str_word_count.phpt  Tue Nov 29 
11:14:18 2005
@@ -36,7 +36,11 @@
 var_dump(str_word_count($str2, 2, array()));
 var_dump(str_word_count($str2, 2, new stdClass));
 var_dump(str_word_count($str2, 2, ""));
-
+var_dump(str_word_count("foo'0 bar-0var", 2, "0"));
+var_dump(str_word_count("'foo'", 2));
+var_dump(str_word_count("'foo'", 2, "'"));
+var_dump(str_word_count("-foo-", 2));
+var_dump(str_word_count("-foo-", 2, "-"));
 ?>
 --EXPECTF--
 array(6) {
@@ -225,4 +229,26 @@
   string(3) "bar"
   [15]=>
   string(3) "foo"
-}
\ No newline at end of file
+}
+array(2) {
+  [0]=>
+  string(5) "foo'0"
+  [6]=>
+  string(8) "bar-0var"
+}
+array(1) {
+  [1]=>
+  string(4) "foo'"
+}
+array(1) {
+  [0]=>
+  string(5) "'foo'"
+}
+array(1) {
+  [1]=>
+  string(3) "foo"
+}
+array(1) {
+  [0]=>
+  string(5) "-foo-"
+}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.249&r2=1.2027.2.250&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.249 php-src/NEWS:1.2027.2.250
--- php-src/NEWS:1.2027.2.249   Tue Nov 29 03:16:00 2005
+++ php-src/NEWSTue Nov 29 11:14:19 2005
@@ -13,6 +13,7 @@
 - Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia)
 - Fixed bug #35431 (PDO crashes when using LAZY fetch with fetchAll). (Wez)
 - Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
+- Fixed bug #35427 (str_word_count() handles '-' incorr

[PHP-CVS] cvs: php-src(PHP_5_1) / config.guess config.sub ltmain.sh /build libtool.m4

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 10:58:55 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcconfig.guess config.sub ltmain.sh 
/php-src/build  libtool.m4 
  Log:
  - Update bundled libtool to 1.5.20
  
  http://cvs.php.net/diff.php/php-src/config.guess?r1=1.19&r2=1.19.2.1&ty=u
Index: php-src/config.guess
diff -u php-src/config.guess:1.19 php-src/config.guess:1.19.2.1
--- php-src/config.guess:1.19   Fri May 27 09:06:04 2005
+++ php-src/config.guessTue Nov 29 10:58:53 2005
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-05-15'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@
;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # ([EMAIL PROTECTED] 1994-08-24)
@@ -199,44 +199,9 @@
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
-amd64:OpenBSD:*:*)
-   echo x86_64-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-amiga:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-cats:OpenBSD:*:*)
-   echo arm-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-hp300:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-luna88k:OpenBSD:*:*)
-   echo m88k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-mac68k:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-macppc:OpenBSD:*:*)
-   echo powerpc-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-mvme68k:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-mvme88k:OpenBSD:*:*)
-   echo m88k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-mvmeppc:OpenBSD:*:*)
-   echo powerpc-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-sgi:OpenBSD:*:*)
-   echo mips64-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
-sun3:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit ;;
 *:OpenBSD:*:*)
-   echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+   UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+   echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
 *:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
@@ -658,8 +623,7 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
-   # avoid double evaluation of $set_cc_for_build
-   test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+   eval $set_cc_for_build
 
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -805,9 +769,13 @@
 i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
-i*:MINGW*:* | i*:windows32*:*)
+i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+i*:windows32*:*)
+   # uname -m includes "-pc" on this system.
+   echo ${UNAME_MACHINE}-mingw32
+   exit ;;
 i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
@@ -826,7 +794,7 @@
 i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
-amd64:CYGWIN*:*:*)
+amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
 p*:CYGWIN*:*)
@@ -905,6 +873,9 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+or32:Linux:*:*)
+   echo or32-unknown-linux-gnu
+   exit ;;
 ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
http://cvs.php.net/diff.php/php-src/config.sub?r1=1.18&r2=1.18.2.1&ty=u
Index: php-src/config.sub
diff -u php-src/config.sub:1.18 php-src/config.sub:1.18.2.1
--- php-src/config.sub:1.18 Fri May 27 09:06:04 2005
+++ php-src/config.sub  Tue Nov 29 10:58:53 2005
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-05-12'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -248,6 +248,7 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+   | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -256,13 +257,14 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \

[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c

2005-11-29 Thread Dmitry Stogov

dmitry  Tue Nov 29 08:30:19 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  typo
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.14&r2=1.40.2.15&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.14 
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.15
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.14Tue Nov 29 
06:04:11 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Nov 29 08:30:11 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.40.2.14 2005/11/29 11:04:11 dmitry Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.15 2005/11/29 13:30:11 dmitry Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -451,7 +451,7 @@
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
 
-   arp_pool_clenup_run(r->pool, (void*) &SG(server_context), 
php_server_context_cleanup);
+   apr_pool_cleanup_run(r->pool, (void*) &SG(server_context), 
php_server_context_cleanup);
 
conf = ap_get_module_config(r->per_dir_config, &php5_module);
 

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

[PHP-CVS] cvs: CVSROOT / avail

2005-11-29 Thread Pierre-Alain Joye

pajoye  Tue Nov 29 06:05:46 2005 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  - peardoc karma for bate
  
  
http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1053&r2=1.1054&ty=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1053 CVSROOT/avail:1.1054
--- CVSROOT/avail:1.1053Mon Nov 28 18:04:17 2005
+++ CVSROOT/avail   Tue Nov 29 06:05:44 2005
@@ -298,7 +298,7 @@
 avail|mike|pecl/win32ps
 avail|clockwerx|pear/Validate
 avail|traufeisen|pecl/gnupg,phpdoc/en/reference/gnupg
-avail|bate|pear/Net_DNS,pear/Net_IPv4
+avail|bate|peardoc,pear/Net_DNS,pear/Net_IPv4
 avail|arpad|peardoc,pear/Validate,pear/HTML_AJAX
 avail|mikl|pecl/memcache
 avail|norro|pear/Image_3D

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

[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c

2005-11-29 Thread Dmitry Stogov

dmitry  Tue Nov 29 06:04:11 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: Resolve Apache2 subrequest problems (Ilia)
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.13&r2=1.40.2.14&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.13 
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.14
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.13Mon Oct 17 
15:35:39 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Nov 29 06:04:11 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.40.2.13 2005/10/17 19:35:39 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.14 2005/11/29 11:04:11 dmitry Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -451,6 +451,8 @@
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
 
+   arp_pool_clenup_run(r->pool, (void*) &SG(server_context), 
php_server_context_cleanup);
+
conf = ap_get_module_config(r->per_dir_config, &php5_module);
 
/* apply_config() needs r in some cases, so allocate server_context 
early */

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/curl interface.c

2005-11-29 Thread Dmitry Stogov

dmitry  Tue Nov 29 06:03:34 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/curl   interface.c 
  Log:
  MFH: Improved safe_mode/open_basedir check (Ilia)
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.12&r2=1.46.2.13&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.46.2.12 
php-src/ext/curl/interface.c:1.46.2.13
--- php-src/ext/curl/interface.c:1.46.2.12  Tue Nov 29 04:14:05 2005
+++ php-src/ext/curl/interface.cTue Nov 29 06:03:29 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.46.2.12 2005/11/29 09:14:05 dmitry Exp $ */
+/* $Id: interface.c,v 1.46.2.13 2005/11/29 11:03:29 dmitry Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -72,7 +72,7 @@
RETURN_FALSE;   

\
}   

\


\
-   if (tmp_url->query || php_check_open_basedir(tmp_url->path 
TSRMLS_CC) ||   
 \
+   if (tmp_url->query || tmp_url->fragment || 
php_check_open_basedir(tmp_url->path TSRMLS_CC) ||  
 \
(PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", 
CHECKUID_CHECK_MODE_PARAM))   \
) { 

\
php_url_free(tmp_url);  

\

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/curl interface.c

2005-11-29 Thread Dmitry Stogov

dmitry  Tue Nov 29 04:14:07 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/curl   interface.c 
  Log:
  MFH: Improved safe_mode/open_basedir check (Ilia)
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.11&r2=1.46.2.12&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.46.2.11 
php-src/ext/curl/interface.c:1.46.2.12
--- php-src/ext/curl/interface.c:1.46.2.11  Sun Oct 16 22:42:32 2005
+++ php-src/ext/curl/interface.cTue Nov 29 04:14:05 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.46.2.11 2005/10/17 02:42:32 iliaa Exp $ */
+/* $Id: interface.c,v 1.46.2.12 2005/11/29 09:14:05 dmitry Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -63,7 +63,7 @@
 
 #define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)  
\
if (((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) &&   
 \
-   strncasecmp(str, "file://", sizeof("file://") - 1) == 0)
\
+   strncasecmp(str, "file:", sizeof("file:") - 1) == 0)
\
{   

\
php_url *tmp_url;   

\


\

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

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

2005-11-29 Thread Jani Taskinen

sniper  Tue Nov 29 03:16:03 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  be very clear what you fixed
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.248&r2=1.2027.2.249&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.248 php-src/NEWS:1.2027.2.249
--- php-src/NEWS:1.2027.2.248   Mon Nov 28 22:35:33 2005
+++ php-src/NEWSTue Nov 29 03:16:00 2005
@@ -22,7 +22,7 @@
 - Fixed bug #35393 (changing static protected members from outside the class,
   one more reference issue). (Dmitry)
 - Fixed bug #35381 (ssl library is not initialized properly). (Alan)
-- Fixed bug #35028 (XML object fails FALSE test). (Marcus)
+- Fixed bug #35028 (SimpleXML object fails FALSE test). (Marcus)
 
 28 Nov 2005, PHP 5.1.1
 - Disabled native date class to prevent pear::date conflict. (Ilia)

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

40 matches

Mail list logo