date:20031204

[PHP-CVS] cvs: php-src /ext/mysql config.w32

2003-12-04 Thread Sebastian Bergmann

sebastian   Fri Dec  5 01:09:30 2003 EDT

  Added files: 
/php-src/ext/mysql  config.w32 
  Log:
  Support for new Win32 build bliss.
  

Index: php-src/ext/mysql/config.w32
+++ php-src/ext/mysql/config.w32
// $Id: config.w32,v 1.1 2003/12/05 06:09:29 sebastian Exp $
// vim:ft=javascript

ARG_WITH("mysql", "MySQL support", "no");

if (PHP_MYSQL != "no") {
if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", 
PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
EXTENSION("mysql", "php_mysql.c");
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
} else {
WARNING("mysql not enabled; libraries and headers not found");
}
}

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

[PHP-CVS] cvs: php-src /ext/iconv config.w32 iconv.c

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 22:14:55 2003 EDT

  Modified files:  
/php-src/ext/iconv  config.w32 iconv.c 
  Log:
  fix zts build
  
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.2 php-src/ext/iconv/config.w32:1.3
--- php-src/ext/iconv/config.w32:1.2Wed Dec  3 17:59:47 2003
+++ php-src/ext/iconv/config.w32Thu Dec  4 22:14:54 2003
@@ -1,15 +1,16 @@
-// $Id: config.w32,v 1.2 2003/12/03 22:59:47 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/05 03:14:54 wez Exp $
 // vim: ft=javascript
 
 ARG_WITH("iconv", "iconv support", "no");
 
-if (PHP_ICONV == "yes") {
-   EXTENSION("iconv", "iconv.c");
-   AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
-   AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
-   AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to 
use");
-   AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not");
-   CHECK_LIB("iconv.lib", "iconv");
-   CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS");
+if (PHP_ICONV != "no") {
+   if (CHECK_LIB("iconv.lib", "iconv", PHP_ICONV) && 
CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) {
+   EXTENSION("iconv", "iconv.c");
+   
+   AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
+   AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
+   AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv 
implementation to use");
+   AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or 
not");
+   }
 }
 
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.105 php-src/ext/iconv/iconv.c:1.106
--- php-src/ext/iconv/iconv.c:1.105 Thu Dec  4 18:46:53 2003
+++ php-src/ext/iconv/iconv.c   Thu Dec  4 22:14:54 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: iconv.c,v 1.105 2003/12/04 23:46:53 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.106 2003/12/05 03:14:54 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -148,8 +148,8 @@
 
 static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *str, 
size_t str_nbytes, const char *enc, const char **next_pos, int mode);
 
-static php_iconv_err_t php_iconv_stream_filter_register_factory();
-static php_iconv_err_t php_iconv_stream_filter_unregister_factory();
+static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D);
+static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D);
 /* }}} */
 
 /* {{{ static globals */
@@ -207,7 +207,7 @@
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_STRICT", 
PHP_ICONV_MIME_DECODE_STRICT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_CONTINUE_ON_ERROR", 
PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR, CONST_CS | CONST_PERSISTENT);
 
-   if (php_iconv_stream_filter_register_factory() != PHP_ICONV_ERR_SUCCESS) {
+   if (php_iconv_stream_filter_register_factory(TSRMLS_C) != 
PHP_ICONV_ERR_SUCCESS) {
return FAILURE;
}
 
@@ -218,7 +218,7 @@
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(miconv)
 {
-   php_iconv_stream_filter_unregister_factory();
+   php_iconv_stream_filter_unregister_factory(TSRMLS_C);
UNREGISTER_INI_ENTRIES();
return SUCCESS;
 }
@@ -2523,7 +2523,7 @@
 /* }}} */
 
 /* {{{ php_iconv_stream_register_factory */
-static php_iconv_err_t php_iconv_stream_filter_register_factory()
+static php_iconv_err_t php_iconv_stream_filter_register_factory(TSRMLS_D)
 {
static php_stream_filter_factory filter_factory = {
php_iconv_stream_filter_factory_create
@@ -2539,7 +2539,7 @@
 /* }}} */
 
 /* {{{ php_iconv_stream_unregister_factory */
-static php_iconv_err_t php_iconv_stream_filter_unregister_factory()
+static php_iconv_err_t php_iconv_stream_filter_unregister_factory(TSRMLS_D)
 {
if (FAILURE == php_stream_filter_unregister_factory(
php_iconv_stream_filter_ops.label TSRMLS_CC)) {

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

[PHP-CVS] cvs: php-src /ext/com_dotnet config.w32

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 21:58:32 2003 EDT

  Modified files:  
/php-src/ext/com_dotnet config.w32 
  Log:
  check for .net headers
  
Index: php-src/ext/com_dotnet/config.w32
diff -u php-src/ext/com_dotnet/config.w32:1.2 php-src/ext/com_dotnet/config.w32:1.3
--- php-src/ext/com_dotnet/config.w32:1.2   Tue Dec  2 19:15:06 2003
+++ php-src/ext/com_dotnet/config.w32   Thu Dec  4 21:58:31 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/03 00:15:06 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/05 02:58:31 wez Exp $
 // vim:ft=javascript
 
 ARG_ENABLE("com-dotnet", "COM and .Net support", "yes");
@@ -9,5 +9,5 @@
com_typeinfo.c com_variant.c");
AC_DEFINE('HAVE_COM_DOTNET', 1, 'Have COM_DOTNET support');
// TODO: do a header check for this
-   AC_DEFINE('HAVE_MSCOREE_H', 0, 'Have .net headers');
+   CHECK_HEADER_ADD_INCLUDE('mscoree.h', 'CFLAGS_COM_DOTNET');
 }

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

[PHP-CVS] cvs: php-src /sapi/isapi config.w32 /sapi/nsapi config.w32 /win32/build config.w32 confutils.js

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 21:41:00 2003 EDT

  Modified files:  
/php-src/sapi/isapi config.w32 
/php-src/sapi/nsapi config.w32 
/php-src/win32/buildconfig.w32 confutils.js 
  Log:
  use /Ox flag for release build (all optimizations on).
  If no php_build dir is specified, then look for either of the two
  "standard" things in reasonable locations.
  Allow CHECK_LIB to search for the "same" library using a ; separated
  list of alternatives.
  Tweak nsapi config and remove redundant or unused flags.
  Add ZTS checks for both isapi and nsapi configs.
  
Index: php-src/sapi/isapi/config.w32
diff -u php-src/sapi/isapi/config.w32:1.2 php-src/sapi/isapi/config.w32:1.3
--- php-src/sapi/isapi/config.w32:1.2   Thu Dec  4 08:38:46 2003
+++ php-src/sapi/isapi/config.w32   Thu Dec  4 21:40:58 2003
@@ -1,9 +1,13 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/04 13:38:46 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/05 02:40:58 wez Exp $
 
 ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'no');
 
 if (PHP_ISAPI == "yes") {
+   if (PHP_ZTS == "no") {
+   ERROR("ISAPI module requires an --enable-zts build of PHP");
+   }
+
SAPI('isapi', 'php4isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D 
PHP4ISAPI_EXPORTS');
ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php4isapi.def');
 }
Index: php-src/sapi/nsapi/config.w32
diff -u php-src/sapi/nsapi/config.w32:1.1 php-src/sapi/nsapi/config.w32:1.2
--- php-src/sapi/nsapi/config.w32:1.1   Thu Dec  4 19:00:31 2003
+++ php-src/sapi/nsapi/config.w32   Thu Dec  4 21:40:59 2003
@@ -1,28 +1,26 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/05 00:00:31 thetaphi Exp $
+// $Id: config.w32,v 1.2 2003/12/05 02:40:59 wez Exp $
 
 ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');
 
 ARG_WITH('nsapi-includes', 'Where to find NSAPI headers', null);
 ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null);
 
-if (PHP_NSAPI == "yes") {
+if (PHP_NSAPI != "no") {
 
-   if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI", 
php_usual_include_suspects + ";" + PHP_NSAPI_INCLUDES)) {
+   if (PHP_ZTS == "no") {
+   ERROR("NSAPI module requires an --enable-zts build of PHP");
+   }
+
+   if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
+   PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES)) {
ERROR("Could not find NSAPI headers");
}
 
-   if (!CHECK_LIB("ns-httpd40.lib", "nsapi", php_usual_lib_suspects + ";" + 
PHP_NSAPI_LIBS)) {
-   if (!CHECK_LIB("ns-httpd36.lib", "nsapi", php_usual_lib_suspects + ";" 
+ PHP_NSAPI_LIBS)) {
-   if (!CHECK_LIB("ns-httpd35.lib", "nsapi", 
php_usual_lib_suspects + ";" + PHP_NSAPI_LIBS)) {
-   if (!CHECK_LIB("ns-httpd30.lib", "nsapi", 
php_usual_lib_suspects + ";" + PHP_NSAPI_LIBS)) {
-   ERROR("Could not find NSAPI libraries");
-   }
-   }
-   }
+   if (!CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
+   "nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) {
+   ERROR("Could not find NSAPI libraries");
}

-   SAPI('nsapi', 'nsapi.c',
-   'php' + PHP_VERSION + 'nsapi.dll',
-   '/D "XP_WIN32" /D "php' + PHP_VERSION + 'nsapi_EXPORTS"');
+   SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 ');
 }
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.9 php-src/win32/build/config.w32:1.10
--- php-src/win32/build/config.w32:1.9  Wed Dec  3 21:12:36 2003
+++ php-src/win32/build/config.w32  Thu Dec  4 21:41:00 2003
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.9 2003/12/04 02:12:36 wez Exp $
+// $Id: config.w32,v 1.10 2003/12/05 02:41:00 wez Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -54,7 +54,7 @@
ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:msvcrt");
 } else {
// Equivalent to Release_TSInline build -> best optimization
-   ADD_FLAG("CFLAGS", "/LD /MD /W3 /O2 /D NDebug /D NDEBUG \
+   ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \
 /D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0");
// if you have VS.Net /GS hardens the binary against buffer overruns
// ADD_FLAG("CFLAGS", "/GS");
@@ -90,6 +90,14 @@
 // that we need
 ARG_WITH('php-build', 'Path to where you extracted 
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source 
dir (..\\php_build) if not specified', 'no');
 
+if (PHP_PHP_BUILD == 'no') {
+   if (FSO.FolderExists("..\\php_build")) {
+   PHP_PHP_BUILD = "..\\php_build";
+   } else if (FSO.FolderExists("..\\win32build")) {
+   PHP_PHP_BUILD = "..\\win32build";
+   }
+}
+
 ARG_WITH('extra-includes',

[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_002.phpt sqlite_003.phpt sqlite_004.phpt sqlite_005.phpt sqlite_006.phpt sqlite_007.phpt sqlite_008.phpt sqlite_009.phpt sqlite_010.phpt sqlite_011.phpt sqlite_012.phpt sqlite_013.phpt sqlite_014.phpt sqlite_015.phpt sqlite_016.phpt sqlite_017.phpt sqlite_018.phpt sqlite_019.phpt sqlite_022.phpt sqlite_023.phpt sqlite_024.phpt

2003-12-04 Thread Edin Kadribasic

edink   Thu Dec  4 21:12:22 2003 EDT

  Modified files:  
/php-src/ext/sqlite/tests   sqlite_002.phpt sqlite_003.phpt 
sqlite_004.phpt sqlite_005.phpt 
sqlite_006.phpt sqlite_007.phpt 
sqlite_008.phpt sqlite_009.phpt 
sqlite_010.phpt sqlite_011.phpt 
sqlite_012.phpt sqlite_013.phpt 
sqlite_014.phpt sqlite_015.phpt 
sqlite_016.phpt sqlite_017.phpt 
sqlite_018.phpt sqlite_019.phpt 
sqlite_022.phpt sqlite_023.phpt 
sqlite_024.phpt 
  Log:
  Made test work on windows
  Index: php-src/ext/sqlite/tests/sqlite_002.phpt
diff -u php-src/ext/sqlite/tests/sqlite_002.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_002.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_002.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_002.phptThu Dec  4 21:12:21 2003
@@ -13,6 +13,7 @@
 sqlite_query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)", $db);
 $r = sqlite_query("SELECT * from foo", $db);
 var_dump(sqlite_fetch_array($r));
+sqlite_close($db);
 ?>
 --EXPECT--
 array(6) {
Index: php-src/ext/sqlite/tests/sqlite_003.phpt
diff -u php-src/ext/sqlite/tests/sqlite_003.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_003.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_003.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_003.phptThu Dec  4 21:12:21 2003
@@ -17,6 +17,7 @@
 var_dump(sqlite_fetch_array($r, SQLITE_NUM));
 $r = sqlite_query("SELECT * from foo", $db);
 var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
+sqlite_close($db);
 ?>
 --EXPECT--
 array(6) {
Index: php-src/ext/sqlite/tests/sqlite_004.phpt
diff -u php-src/ext/sqlite/tests/sqlite_004.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_004.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_004.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_004.phptThu Dec  4 21:12:21 2003
@@ -35,6 +35,9 @@
}
$i++;
 }
+
+sqlite_close($db);
+
 echo "DONE!\n";
 ?>
 --EXPECT--
Index: php-src/ext/sqlite/tests/sqlite_005.phpt
diff -u php-src/ext/sqlite/tests/sqlite_005.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_005.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_005.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_005.phptThu Dec  4 21:12:21 2003
@@ -37,6 +37,9 @@
 while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
var_dump($row);
 }
+
+sqlite_close($db);
+
 echo "DONE!\n";
 ?>
 --EXPECT--
Index: php-src/ext/sqlite/tests/sqlite_006.phpt
diff -u php-src/ext/sqlite/tests/sqlite_006.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_006.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_006.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_006.phptThu Dec  4 21:12:21 2003
@@ -34,6 +34,9 @@
 while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
var_dump($row);
 }
+
+sqlite_close($db);
+
 echo "DONE!\n";
 ?>
 --EXPECT--
Index: php-src/ext/sqlite/tests/sqlite_007.phpt
diff -u php-src/ext/sqlite/tests/sqlite_007.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_007.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_007.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_007.phptThu Dec  4 21:12:21 2003
@@ -17,6 +17,7 @@
 var_dump(sqlite_fetch_array($r, SQLITE_NUM));
 $r = sqlite_unbuffered_query("SELECT * from foo", $db);
 var_dump(sqlite_fetch_array($r, SQLITE_ASSOC));
+sqlite_close($db);
 ?>
 --EXPECT--
 array(6) {
Index: php-src/ext/sqlite/tests/sqlite_008.phpt
diff -u php-src/ext/sqlite/tests/sqlite_008.phpt:1.3 
php-src/ext/sqlite/tests/sqlite_008.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_008.phpt:1.3Fri May  2 18:09:54 2003
+++ php-src/ext/sqlite/tests/sqlite_008.phptThu Dec  4 21:12:21 2003
@@ -25,6 +25,9 @@
 while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
var_dump($row);
 }
+
+sqlite_close($db);
+
 echo "DONE!\n";
 ?>
 --EXPECT--
Index: php-src/ext/sqlite/tests/sqlite_009.phpt
diff -u php-src/ext/sqlite/tests/sqlite_009.phpt:1.2 
php-src/ext/sqlite/tests/sqlite_009.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_009.phpt:1.2Thu May  1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_009.phptThu Dec  4 21:12:21 2003
@@ -25,6 +25,9 @@
 while ($row = sqlite_fetch_array($r, SQLITE_NUM)) {
var_dump($row);
 }
+
+sqlite_close($db);
+
 echo "DONE!\n";
 ?>
 --EXPECT--
Index: php-src/ext/sqlite/tests/sqlite_010.phpt
diff -u php-src/ext/sqlite/tests/sqlite_010.phpt:1.3 
php-src/ext/sqlite/tests/sqlite_010.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_010.phpt:1.3Fri May  2 18:09:54 2003
+++ php-src/ext/sqlite/tests/sqlite_010.phptThu Dec  4 21:12:21 2003
@@ -36,6 +36,9 @@
var_dump(sqlite_current($r, SQLITE_NUM));
sqlite_next($r);
 }
+
+sq

[PHP-CVS] cvs: php-src / NEWS /ext/xml compat.c /ext/xml/tests bug26528.phpt

2003-12-04 Thread Ilia Alshanetsky

iliaa   Thu Dec  4 20:16:17 2003 EDT

  Added files: 
/php-src/ext/xml/tests  bug26528.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/xmlcompat.c 
  Log:
  Fixed bug #26528 (HTML entities are not being decoded by 
  xml_parse()/xml_parse_into_struct()).
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1521 php-src/NEWS:1.1522
--- php-src/NEWS:1.1521 Thu Dec  4 18:32:22 2003
+++ php-src/NEWSThu Dec  4 20:16:14 2003
@@ -26,6 +26,8 @@
 - Fixed include_once() / require_once() on Windows to honor case-insensitivity
   of files. (Andi)
 - Fixed __autoload() to preserve case of the passed class name. (Andi)
+- Fixed bug #26528 (HTML entities are not being decoded by 
+  xml_parse()/xml_parse_into_struct()). (Ilia)
 - Fixed bug #26072 (--disable-libxml does not work). (Jani)
 - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
 - Fixed bug #26001 (serialize crashes when accessing an overloaded object that 
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.20 php-src/ext/xml/compat.c:1.21
--- php-src/ext/xml/compat.c:1.20   Mon Nov 24 01:04:39 2003
+++ php-src/ext/xml/compat.cThu Dec  4 20:16:16 2003
@@ -412,6 +412,7 @@
} else {
parser->parser->charset = XML_CHAR_ENCODING_NONE;
}
+   parser->parser->replaceEntities=1;
if (sep != NULL) {
parser->use_namespace = 1;
parser->_ns_map = xmlHashCreate(10);

Index: php-src/ext/xml/tests/bug26528.phpt
+++ php-src/ext/xml/tests/bug26528.phpt
--TEST--
Bug #26528 (HTML entities are not being decoded)
--FILE--
";
$parser = xml_parser_create();
$res = xml_parse_into_struct($parser,$sample,$vals,$index);
xml_parser_free($parser);
var_dump($vals);
?>
--EXPECT--
array(1) {
  [0]=>
  array(4) {
["tag"]=>
string(4) "TEST"
["type"]=>
string(8) "complete"
["level"]=>
int(1)
["attributes"]=>
array(1) {
  ["ATTR"]=>
  string(13) "anglehttp://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/pgsql config.w32 pgsql.c php_pgsql.h

2003-12-04 Thread Edin Kadribasic

edink   Thu Dec  4 20:03:36 2003 EDT

  Modified files:  
/php-src/ext/pgsql  config.w32 pgsql.c php_pgsql.h 
  Log:
  Get rid of PHPAPI usage.
  Enable shared build in the new php5 build system
  Check for the correct header.
  
  
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.1 php-src/ext/pgsql/config.w32:1.2
--- php-src/ext/pgsql/config.w32:1.1Thu Dec  4 10:32:31 2003
+++ php-src/ext/pgsql/config.w32Thu Dec  4 20:03:34 2003
@@ -1,19 +1,15 @@
-// $Id: config.w32,v 1.1 2003/12/04 15:32:31 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 01:03:34 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH("pgsql", "PostgreSQL support", "no");
 
 if (PHP_PGSQL != "no") {
-   if (!PHP_PGSQL_SHARED) {
-   ERROR("Cannot build pgsql as a static extension until someone fixes 
its bogus PHPAPI usage\r\nuse --with-pgsql=shared instead.");
+   if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) &&
+   CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PHP_BUILD + 
"\\include\\pgsql;" + PHP_PGSQL)) {
+   EXTENSION("pgsql", "pgsql.c");
+   AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
+   ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING 
/D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS");
} else {
-   if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) &&
-   CHECK_HEADER_ADD_INCLUDE("postgres.h", "CFLAGS_PGSQL", 
PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\postgresql\\src\\include;" + 
PHP_PGSQL)) {
-   EXTENSION("pgsql", "pgsql.c");
-   AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
-   ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PQCMDTUPLES /D 
HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H");
-   } else {
-   WARNING("pgsql not enabled; libraries and headers not found");
-   }
+   WARNING("pgsql not enabled; libraries and headers not found");
}
 }
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.296 php-src/ext/pgsql/pgsql.c:1.297
--- php-src/ext/pgsql/pgsql.c:1.296 Sat Sep  6 14:34:54 2003
+++ php-src/ext/pgsql/pgsql.c   Thu Dec  4 20:03:34 2003
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.296 2003/09/06 18:34:54 helly Exp $ */
+/* $Id: pgsql.c,v 1.297 2003/12/05 01:03:34 edink Exp $ */
 
 #include 
 
@@ -3315,7 +3315,7 @@
 /* {{{ php_pgsql_meta_data
  * TODO: Add meta_data cache for better performance
  */
-PHPAPI int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta 
TSRMLS_DC) 
+PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval 
*meta TSRMLS_DC) 
 {
PGresult *pg_result;
char *tmp_name;
@@ -3574,7 +3574,7 @@
 /* {{{ php_pgsql_convert
  * check and convert array values (fieldname=>vlaue pair) for sql
  */
-PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval 
*values, zval *result, ulong opt TSRMLS_DC) 
+PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, const 
zval *values, zval *result, ulong opt TSRMLS_DC) 
 {
HashPosition pos;
char *field = NULL;
@@ -4212,7 +4212,7 @@
 
 /* {{{ php_pgsql_insert
  */
-PHPAPI int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var_array, 
ulong opt, char **sql TSRMLS_DC)
+PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval 
*var_array, ulong opt, char **sql TSRMLS_DC)
 {
zval **val, *converted = NULL;
char buf[256];
@@ -4391,7 +4391,7 @@
 
 /* {{{ php_pgsql_update
  */
-PHPAPI int php_pgsql_update(PGconn *pg_link, const char *table, zval *var_array, zval 
*ids_array, ulong opt, char **sql TSRMLS_DC) 
+PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval 
*var_array, zval *ids_array, ulong opt, char **sql TSRMLS_DC) 
 {
zval *var_converted = NULL, *ids_converted = NULL;
smart_str querystr = {0};
@@ -4497,7 +4497,7 @@
 
 /* {{{ php_pgsql_delete
  */
-PHPAPI int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids_array, 
ulong opt, char **sql TSRMLS_DC) 
+PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval 
*ids_array, ulong opt, char **sql TSRMLS_DC) 
 {
zval *ids_converted = NULL;
smart_str querystr = {0};
@@ -4586,7 +4586,7 @@
 
 /* {{{ php_pgsql_result2array
  */
-PHPAPI int php_pgsql_result2array(PGresult *pg_result, zval *ret_array TSRMLS_DC) 
+PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array 
TSRMLS_DC) 
 {
zval *row;
char *field_name, *element, *data;
@@ -4628,7 +4628,7 @@
 
 /* {{{ php_pgsql_select
  */
-PHPAPI int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids_array, zval 
*ret_array, ulong

[PHP-CVS] cvs: php-src /sapi/nsapi config.w32

2003-12-04 Thread Uwe Schindler

thetaphiThu Dec  4 19:00:32 2003 EDT

  Added files: 
/php-src/sapi/nsapi config.w32 
  Log:
  First version... Wez: can you check this...
  

Index: php-src/sapi/nsapi/config.w32
+++ php-src/sapi/nsapi/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/05 00:00:31 thetaphi Exp $

ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');

ARG_WITH('nsapi-includes', 'Where to find NSAPI headers', null);
ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null);

if (PHP_NSAPI == "yes") {

if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI", 
php_usual_include_suspects + ";" + PHP_NSAPI_INCLUDES)) {
ERROR("Could not find NSAPI headers");
}

if (!CHECK_LIB("ns-httpd40.lib", "nsapi", php_usual_lib_suspects + ";" + 
PHP_NSAPI_LIBS)) {
if (!CHECK_LIB("ns-httpd36.lib", "nsapi", php_usual_lib_suspects + ";" 
+ PHP_NSAPI_LIBS)) {
if (!CHECK_LIB("ns-httpd35.lib", "nsapi", 
php_usual_lib_suspects + ";" + PHP_NSAPI_LIBS)) {
if (!CHECK_LIB("ns-httpd30.lib", "nsapi", 
php_usual_lib_suspects + ";" + PHP_NSAPI_LIBS)) {
ERROR("Could not find NSAPI libraries");
}
}
}
}

SAPI('nsapi', 'nsapi.c',
'php' + PHP_VERSION + 'nsapi.dll',
'/D "XP_WIN32" /D "php' + PHP_VERSION + 'nsapi_EXPORTS"');
}

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

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

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 18:46:54 2003 EDT

  Modified files:  
/php-src/ext/iconv  iconv.c 
  Log:
  Type-punning is evil.
  
  
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.104 php-src/ext/iconv/iconv.c:1.105
--- php-src/ext/iconv/iconv.c:1.104 Thu Dec  4 18:31:31 2003
+++ php-src/ext/iconv/iconv.c   Thu Dec  4 18:46:53 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: iconv.c,v 1.104 2003/12/04 23:31:31 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.105 2003/12/04 23:46:53 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -985,6 +985,7 @@
size_t ini_in_left;
const char *ini_in_p;
size_t out_reserved = 4;
+   int dummy;
 
smart_str_appendc(pretval, 'B');
char_cnt--;
@@ -1066,7 +1067,9 @@
 
prev_in_left = in_left;
 
-   encoded = php_base64_encode(buf, (int)(out_size - 
out_left), &encoded_len);
+   encoded = php_base64_encode(buf, (int)(out_size - 
out_left), &dummy);
+   encoded_len = (size_t)dummy;
+
if (char_cnt < encoded_len) {
/* something went wrong! */
err = PHP_ICONV_ERR_UNKNOWN;
@@ -1480,10 +1483,12 @@
case '\r': case '\n': case ' ': case '\t': {
char *decoded_text;
size_t decoded_text_len;
+   int dummy;
 
switch (enc_scheme) {
case 
PHP_ICONV_ENC_SCHEME_BASE64:
-   decoded_text = (char 
*)php_base64_decode((unsigned char*)encoded_text, (int)encoded_text_len, 
&decoded_text_len);
+   decoded_text = (char 
*)php_base64_decode((unsigned char*)encoded_text, (int)encoded_text_len, &dummy);
+   decoded_text_len = 
(size_t)dummy;
break;
 
case 
PHP_ICONV_ENC_SCHEME_QPRINT:

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

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

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 18:32:23 2003 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  NFN
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1520 php-src/NEWS:1.1521
--- php-src/NEWS:1.1520 Thu Dec  4 07:05:54 2003
+++ php-src/NEWSThu Dec  4 18:32:22 2003
@@ -10,6 +10,7 @@
 - Added possibility to call PHP functions as XSLT-functions. (Christian)
 - Added possibility to prevent PHP from registering variables when
   input filter support is used. (Derick)
+- Added iconv stream filter (convert.iconv.*). (Moriyoshi)
 - Added EXSLT support in ext/xsl. (Christian)
 - Added proxy support to http wrapper. (Sara)
 - Added new functions:

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

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

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 18:31:32 2003 EDT

  Modified files:  
/php-src/ext/iconv  iconv.c 
  Log:
  Add iconv stream filter.
  
  # a quick synopsis:
  #
  # 
  #
  
  Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.103 php-src/ext/iconv/iconv.c:1.104
--- php-src/ext/iconv/iconv.c:1.103 Tue Dec  2 02:36:42 2003
+++ php-src/ext/iconv/iconv.c   Thu Dec  4 18:31:31 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: iconv.c,v 1.103 2003/12/02 07:36:42 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.104 2003/12/04 23:31:31 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -115,7 +115,8 @@
PHP_ICONV_ERR_ILLEGAL_SEQ   = 4,
PHP_ICONV_ERR_ILLEGAL_CHAR  = 5,
PHP_ICONV_ERR_UNKNOWN   = 6,
-   PHP_ICONV_ERR_MALFORMED = 7
+   PHP_ICONV_ERR_MALFORMED = 7,
+   PHP_ICONV_ERR_ALLOC = 8
 } php_iconv_err_t;
 /* }}} */
 
@@ -146,6 +147,9 @@
 static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fname, 
size_t fname_nbytes, const char *fval, size_t fval_nbytes, unsigned int max_line_len, 
const char *lfchars, php_iconv_enc_scheme_t enc_scheme, const char *out_charset, const 
char *enc);
 
 static php_iconv_err_t _php_iconv_mime_decode(smart_str *pretval, const char *str, 
size_t str_nbytes, const char *enc, const char **next_pos, int mode);
+
+static php_iconv_err_t php_iconv_stream_filter_register_factory();
+static php_iconv_err_t php_iconv_stream_filter_unregister_factory();
 /* }}} */
 
 /* {{{ static globals */
@@ -203,6 +207,10 @@
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_STRICT", 
PHP_ICONV_MIME_DECODE_STRICT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("ICONV_MIME_DECODE_CONTINUE_ON_ERROR", 
PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR, CONST_CS | CONST_PERSISTENT);
 
+   if (php_iconv_stream_filter_register_factory() != PHP_ICONV_ERR_SUCCESS) {
+   return FAILURE;
+   }
+
return SUCCESS;
 }
 /* }}} */
@@ -210,6 +218,7 @@
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(miconv)
 {
+   php_iconv_stream_filter_unregister_factory();
UNREGISTER_INI_ENTRIES();
return SUCCESS;
 }
@@ -2212,6 +2221,328 @@
 }
 /* }}} */
 
+/* {{{ iconv stream filter */
+typedef struct _php_iconv_stream_filter {
+   iconv_t cd;
+   int persistent;
+   char *to_charset;
+   size_t to_charset_len;
+   char *from_charset;
+   size_t from_charset_len;
+} php_iconv_stream_filter;
+
+/* {{{ php_iconv_stream_filter_dtor */
+static void php_iconv_stream_filter_dtor(php_iconv_stream_filter *self)
+{
+   pefree(self->to_charset, self->persistent);
+   pefree(self->from_charset, self->persistent);
+}
+/* }}} */
+
+/* {{{ php_iconv_stream_filter_ctor() */
+static php_iconv_err_t php_iconv_stream_filter_ctor(php_iconv_stream_filter *self,
+   const char *to_charset, size_t to_charset_len,
+   const char *from_charset, size_t from_charset_len, int persistent)
+{
+   if (NULL == (self->to_charset = pemalloc(to_charset_len + 1, persistent))) {
+   return PHP_ICONV_ERR_ALLOC;
+   }
+   self->to_charset_len = to_charset_len;
+   if (NULL == (self->from_charset = pemalloc(from_charset_len + 1, persistent))) 
{
+   pefree(self->to_charset, persistent);
+   return PHP_ICONV_ERR_ALLOC;
+   }
+   self->from_charset_len = from_charset_len;
+
+   memcpy(self->to_charset, to_charset, to_charset_len);
+   self->to_charset[to_charset_len] = '\0';
+   memcpy(self->from_charset, from_charset, from_charset_len);
+   self->from_charset[from_charset_len] = '\0';
+
+   if ((iconv_t)-1 == (self->cd = iconv_open(self->to_charset, 
self->from_charset))) {
+   pefree(self->from_charset, persistent);
+   pefree(self->to_charset, persistent);
+   return PHP_ICONV_ERR_UNKNOWN;
+   }
+   self->persistent = persistent;
+
+   return PHP_ICONV_ERR_SUCCESS;
+}
+/* }}} */
+
+/* {{{ php_iconv_stream_filter_do_filter */
+static php_stream_filter_status_t php_iconv_stream_filter_do_filter(
+   php_stream *stream, php_stream_filter *filter,
+   php_stream_bucket_brigade *buckets_in,
+   php_stream_bucket_brigade *buckets_out,
+   size_t *bytes_consumed, int flags TSRMLS_DC)
+{
+   php_stream_bucket *bucket = NULL, *new_bucket;
+   size_t consumed = 0;
+   php_iconv_stream_filter *self = (php_iconv_stream_filter *)filter->abstract;
+   char *out_buf = NULL;
+   size_t out_buf_size;
+   char *pd;
+   size_t ocnt, prev_ocnt;
+
+   if (flags != PSFS_FLAG_NORMAL) {
+   /* flush operation */
+
+   out_buf_size = 64;
+   out_buf = pemalloc(out_buf_size, self->persistent);
+   ocnt = prev_ocnt =

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

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 17:53:39 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mbstring   config.m4 
  Log:
  MFH
  
  
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.28.2.6 php-src/ext/mbstring/config.m4:1.28.2.7
--- php-src/ext/mbstring/config.m4:1.28.2.6 Thu Dec  4 17:50:54 2003
+++ php-src/ext/mbstring/config.m4  Thu Dec  4 17:53:38 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.28.2.6 2003/12/04 22:50:54 moriyoshi Exp $
+dnl $Id: config.m4,v 1.28.2.7 2003/12/04 22:53:38 moriyoshi Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -144,6 +144,7 @@
  libmbfl/nls/nls_uni.c
  libmbfl/nls/nls_zh.c
 ])
+PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H])
   else
 dnl
 dnl External libmfl

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

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

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 17:53:17 2003 EDT

  Modified files:  
/php-src/ext/mbstring   config.m4 
  Log:
  This part is accidentially left on the previous commit.
  
  
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.41 php-src/ext/mbstring/config.m4:1.42
--- php-src/ext/mbstring/config.m4:1.41 Thu Dec  4 17:49:45 2003
+++ php-src/ext/mbstring/config.m4  Thu Dec  4 17:53:16 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.41 2003/12/04 22:49:45 moriyoshi Exp $
+dnl $Id: config.m4,v 1.42 2003/12/04 22:53:16 moriyoshi Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -167,6 +167,7 @@
  libmbfl/nls/nls_uni.c
  libmbfl/nls/nls_zh.c
 ])
+PHP_MBSTRING_ADD_CFLAG([-DHAVE_CONFIG_H])
   else
 dnl
 dnl External libmfl

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring config.m4 /ext/mbstring/libmbfl/mbfl mbfl_allocators.c mbfl_encoding.c mbfl_language.c

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 17:50:55 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_allocators.c 
mbfl_encoding.c mbfl_language.c 
  Log:
  MFH: it'd be a bad idea to make subpackages dependent on the php build system.
  
  
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.28.2.5 php-src/ext/mbstring/config.m4:1.28.2.6
--- php-src/ext/mbstring/config.m4:1.28.2.5 Mon Oct 27 12:50:07 2003
+++ php-src/ext/mbstring/config.m4  Thu Dec  4 17:50:54 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.28.2.5 2003/10/27 17:50:07 moriyoshi Exp $
+dnl $Id: config.m4,v 1.28.2.6 2003/12/04 22:50:54 moriyoshi Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -34,7 +34,7 @@
 PHP_ADD_BUILD_DIR([$ext_builddir/$dir])
   done
   
-  if test "$ext_shared" = "no"; then
+  if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then
 out="php_config.h"
   else
 out="$abs_builddir/config.h"
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.1 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4.2.1 Sat Oct 25 07:58:44 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c Thu Dec  4 17:50:54 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.1 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4.2.1   Sat Oct 25 07:58:44 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c   Thu Dec  4 17:50:54 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.1 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4.2.1   Sat Oct 25 07:58:44 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c   Thu Dec  4 17:50:54 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

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

[PHP-CVS] cvs: php-src /ext/mbstring config.m4 /ext/mbstring/libmbfl/mbfl mbfl_allocators.c mbfl_encoding.c mbfl_language.c

2003-12-04 Thread Moriyoshi Koizumi

moriyoshi   Thu Dec  4 17:49:47 2003 EDT

  Modified files:  
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_allocators.c 
mbfl_encoding.c mbfl_language.c 
  Log:
  It'd be a bad idea to make subpackages dependent on the php build system. 
  
  
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.40 php-src/ext/mbstring/config.m4:1.41
--- php-src/ext/mbstring/config.m4:1.40 Thu Oct  2 07:02:54 2003
+++ php-src/ext/mbstring/config.m4  Thu Dec  4 17:49:45 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.40 2003/10/02 11:02:54 moriyoshi Exp $
+dnl $Id: config.m4,v 1.41 2003/12/04 22:49:45 moriyoshi Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -34,7 +34,7 @@
 PHP_ADD_BUILD_DIR([$ext_builddir/$dir])
   done
   
-  if test "$ext_shared" = "no"; then
+  if test "$ext_shared" = "no" -o ! -e "$ext_builddir/config.h.in"; then
 out="php_config.h"
   else
 out="$abs_builddir/config.h"
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c:1.4 Wed Sep 17 01:42:57 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c Thu Dec  4 17:49:46 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.4   Wed Sep 17 01:42:57 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c   Thu Dec  4 17:49:46 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4 
php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.5
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c:1.4   Wed Sep 17 01:42:57 
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_language.c   Thu Dec  4 17:49:46 2003
@@ -28,8 +28,6 @@
  *
  */
 
-#include "php.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

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

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

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 17:38:23 2003 EDT

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Work around a bug in putenv() in the VS.Net C run time library (MSVCRT71) where it 
will double free a string.
  
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.644 
php-src/ext/standard/basic_functions.c:1.645
--- php-src/ext/standard/basic_functions.c:1.644Sat Nov 29 16:46:47 2003
+++ php-src/ext/standard/basic_functions.c  Thu Dec  4 17:38:22 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.644 2003/11/29 21:46:47 wez Exp $ */
+/* $Id: basic_functions.c,v 1.645 2003/12/04 22:38:22 wez Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1448,6 +1448,14 @@
}
}
 
+#if _MSC_VER >= 1300
+   /* VS.Net has a bug in putenv() when setting a variable that
+* is already set; if the SetEnvironmentVariable() API call
+* fails, the Crt will double free() a string.
+* We try to avoid this by setting our own value first */
+   SetEnvironmentVariable(pe.key, "bugbug");
+#endif
+   
if (putenv(pe.putenv_string) == 0) {/* success */
zend_hash_add(&BG(putenv_ht), pe.key, pe.key_len+1, (void **) 
&pe, sizeof(putenv_entry), NULL);
 #ifdef HAVE_TZSET

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

[PHP-CVS] cvs: spl / spl_directory.c /examples cachingiterator.inc

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 15:56:33 2003 EDT

  Modified files:  
/splspl_directory.c 
/spl/examples   cachingiterator.inc 
  Log:
  Update __toString() issues
  
Index: spl/spl_directory.c
diff -u spl/spl_directory.c:1.16 spl/spl_directory.c:1.17
--- spl/spl_directory.c:1.16Tue Dec  2 02:13:53 2003
+++ spl/spl_directory.c Thu Dec  4 15:56:31 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_directory.c,v 1.16 2003/12/02 07:13:53 helly Exp $ */
+/* $Id: spl_directory.c,v 1.17 2003/12/04 20:56:31 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -59,7 +59,6 @@
 SPL_METHOD(RecursiveDirectoryIterator, key);
 SPL_METHOD(RecursiveDirectoryIterator, hasChildren);
 SPL_METHOD(RecursiveDirectoryIterator, getChildren);
-SPL_METHOD(RecursiveDirectoryIterator, __toString);
 
 
 /* declare method parameters */
@@ -94,7 +93,6 @@
SPL_ME(RecursiveDirectoryIterator, key,   NULL, ZEND_ACC_PUBLIC)
SPL_ME(RecursiveDirectoryIterator, hasChildren,   NULL, ZEND_ACC_PUBLIC)
SPL_ME(RecursiveDirectoryIterator, getChildren,   NULL, ZEND_ACC_PUBLIC)
-   SPL_MA(RecursiveDirectoryIterator, __toString, DirectoryIterator, getPathname, 
NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
 };
 
Index: spl/examples/cachingiterator.inc
diff -u spl/examples/cachingiterator.inc:1.2 spl/examples/cachingiterator.inc:1.3
--- spl/examples/cachingiterator.inc:1.2Sat Nov 22 15:51:15 2003
+++ spl/examples/cachingiterator.incThu Dec  4 15:56:32 2003
@@ -24,7 +24,11 @@
if ($this->more = $this->it->hasMore()) {
$this->current = $this->it->current();
$this->key = $this->it->key();
-   $this->strvalue = (string)$this->current;
+   if (is_object($this->current)) {
+   $this->strvalue = $this->current->__toString();
+   } else {
+   $this->strvalue = (string)$this->current;
+   }
} else {
$this->current = NULL;
$this->key = NULL;

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

[PHP-CVS] cvs: spl /examples directorytreeiterator.inc

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 15:24:07 2003 EDT

  Modified files:  
/spl/examples   directorytreeiterator.inc 
  Log:
  __toString() must be called explicitly now
  
Index: spl/examples/directorytreeiterator.inc
diff -u spl/examples/directorytreeiterator.inc:1.4 
spl/examples/directorytreeiterator.inc:1.5
--- spl/examples/directorytreeiterator.inc:1.4  Sat Nov 22 15:51:15 2003
+++ spl/examples/directorytreeiterator.inc  Thu Dec  4 15:24:06 2003
@@ -14,7 +14,7 @@
$tree .= $this->getSubIterator($l)->hasNext() ? '| ' : '  ';
}
return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') 
-  . $this->getSubIterator($l);
+  . $this->getSubIterator($l)->__toString();
}

function __call($func, $params)

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

[PHP-CVS] cvs: spl / spl.php

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 15:01:47 2003 EDT

  Modified files:  
/splspl.php 
  Log:
  Update
  
Index: spl/spl.php
diff -u spl/spl.php:1.11 spl/spl.php:1.12
--- spl/spl.php:1.11Thu Dec  4 14:39:46 2003
+++ spl/spl.php Thu Dec  4 15:01:46 2003
@@ -149,6 +149,9 @@
function hasMore();
 }
 
+/** Iterator that wrapps around another iterator and only returns selected
+ * elements of the inner iterator.
+ */
 abstract class FilterIterator implements Iterator {
/** Construct an instance form a Iterator.
 *
@@ -182,6 +185,9 @@
function hasMore();
 }
 
+/** A recursive iterator that only returns elements that themselves can be 
+ * trversed.
+ */
 class ParentIterator extends FilterIterator implements RecursiveIterator {
/** Construct an instance form a RecursiveIterator.
 *
@@ -265,7 +271,7 @@
function isDot();   
 }
 
-/** \brief Directory iterator
+/** \brief recursive directory iterator
  */
 class RecursiveDirectoryIterator extends DirectoryIterator implements 
RecursiveIterator {
 

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

[PHP-CVS] cvs: spl / package.xml

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 14:53:34 2003 EDT

  Added files: 
/splpackage.xml 
  Log:
  Add package file
  

Index: spl/package.xml
+++ spl/package.xml



 SPL
 Standard PHP Library
 
  
   helly
   Marcus Boerger
   [EMAIL PROTECTED]
   lead
  
 
 
SPL is a collection of interfaces and classes that are meant to solve
standard problems.
 
 PHP
 
  stable
  0.1-dev
  TBA
  
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   
   






















   
  
  
   5.0.0
  
 



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

[PHP-CVS] cvs: spl / README.PROFILING

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 14:47:10 2003 EDT

  Removed files:   
/splREADME.PROFILING 
  Log:
  No longer true
  

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

[PHP-CVS] cvs: spl / README spl.php /examples autoload.inc dba_array.php dba_dump.php directorytree.php findfile.php ini_groups.php tree.php

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 14:39:47 2003 EDT

  Added files: 
/spl/examples   autoload.inc 

  Modified files:  
/splREADME spl.php 
/spl/examples   dba_array.php dba_dump.php directorytree.php 
findfile.php ini_groups.php tree.php 
  Log:
  Update documentation
  Index: spl/README
diff -u spl/README:1.3 spl/README:1.4
--- spl/README:1.3  Mon Jun 23 18:37:12 2003
+++ spl/README  Thu Dec  4 14:39:46 2003
@@ -1,88 +1,26 @@
 This is an extension that aims to implement some efficient data access 
 interfaces and classes. You'll find the classes documented using php
-code in the file spl.php.
+code in the file spl.php or in the corresponding .inc file in the examples
+subdirectory. Based on the internal implementations or the files in the 
+examples subdirectory there are also some .php files to experiment with.
+
+The .inc files are not included automatically because the are sooner or 
+later intergrated into the extension. That means that you either need to 
+put the code of examples/autoload into your autoprepend file or that you
+have to point your ini setting auto_prepend_file to this file.
 
-There are special SPL interfaces that provides the ability to hook into 
-foreach and array reading/writng. By inheriting these interfaces, instances 
-of the resulting classes can be iterated using the foreach construct or
-use array read write notation.
+1) Iterators
 
-Look into the examples subdirectory for some basic examples which will
-demonstracte this.
+SPL offers some advanced iterator algorythmns:
 
-Also some classes of extensions like SQLite inherit SPL interfaces so that
-they take advantage of the foreach or array overloading.
+interface RecursiveIterator implements Iterator
+class RecursiveIteratorIterator implements Iterator
+abstract class FilterIterator implements Iterator
+class ParentIterator extends FilterIterator implements RecursiveIterator
 
-1) Iterators
+2) Directories
+
+SPL offers two advanced directory classes.
 
-Iterator is design pattern that allows to enumerate and list all elements of 
-a collection whatsoever using an oo protocol. The minimalistic Iterator needs
-a method that returns the current value, a method that moves to the next value
-and a method that checks whether or not the Iterator can provide more elements.
-
-In SPL this basich Iterator is defined by the interface spl_forward:
-
-interface spl_forward {
-   function current();
-   function next();
-   function has_more();
-}
-
-This basic Iterator does not allow to rewind itself nor does it in anyway 
-support to name the values by some kind association as key/value mappings
-provided by the standard PHP arrays. All these additions to the basic Iterator
-are done in specialized interfaces as described in detail in the file spl.php.
-
-SPL allows to hook into the engine opcodes that realize the foreach construct.
-This construct normally works on arrays the following way. First it rewinds 
-the current array position to the beginning. Then it loops through the whole
-array by first checking whether or not the end of the array is reached and
-if not returning the current array value and or key. After that it move the
-current array pointer forward and does starts the loop process again. As you 
-can see this perfectly maps to the interface spl_forward. So the foreach
-hooking simply checks whether or not the variable passed to foreach is an
-object of a class implementing the interface spl_forward. The foreach hook
-can be activated by --enable-spl-foreach which is on by default.
-
-class it implements spl_forward...
-$obj = new it();
-foreach($obj as $value) ...
-
-2) Arrays
-
-Arrays in general, not specifically PHP arrays, provide a collection of pairs
-normally referred to as key and value. A PHP object consists of properties and
-a class type specifing the methods available for the object. SPL now allows
-this to be combined using the spl_array_ interfaces.
-
-The minimalistic array interface is spl_array_read which only support reading:
-
-interface spl_array_read {
-   function exists($key);
-   function get($key);
-}
-
-Any instance of a class that implements spl_array_read can be used with array
-read notation when the corresponding hook is activated --enable-spl-array-read.
-
-class ar implements spl_array_read...
-$obj = new ar();
-$value = $obj[$key];
-
-SPL also supports the write notation by the interface spl_array_access:
-
-interface spl_array_access extends spl_array_read {
-   function set($value, $index);
-}
-
-When the array write hook is activated by --enable-spl-array-write the 
-following can be done:
-
-class ar implements spl_array_access...
-$obj = new ar();
-$value = $obj[$key];
-$obj[$key] = $value;
-
-However this hook should only be activated when it is made use of, since it 
-slows down noticeable. That is the case because first there is some not used
-overhead and second the overhea

[PHP-CVS] cvs: spl / TODO

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 12:45:37 2003 EDT

  Modified files:  
/splTODO 
  Log:
  Update
  
Index: spl/TODO
diff -u spl/TODO:1.1.1.1 spl/TODO:1.2
--- spl/TODO:1.1.1.1Thu May  1 19:28:28 2003
+++ spl/TODOThu Dec  4 12:45:36 2003
@@ -1,13 +1,4 @@
 This is the ToDo of ext/spl:
 
-- spl::array_access cals set() which is supposed to return a value.
-  Currently you *must* return a value even when it is not used.
-$obj[$idx] = $val;  // doesn't use the return value
-$x = $obj[$idx] = $val; // here it is used
-  Since array_access.phpt is a test with a return value there
-  should be a test without a return value. Maybe an error message
-  is required in case there is no return value.
-
-- spl::array_access_ex is not completely done and not tested.
-
-If you have further questions: mailto:[EMAIL PROTECTED]
+Implement the classes/interfaces from the .inc files in
+directory examples.
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_spl_001.phpt

2003-12-04 Thread Marcus Boerger

helly   Thu Dec  4 12:33:09 2003 EDT

  Removed files:   
/php-src/ext/sqlite/tests   sqlite_spl_001.phpt 
  Log:
  No longer needed
  

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

[PHP-CVS] cvs: php-src /win32/build Makefile

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 12:28:09 2003 EDT

  Modified files:  
/php-src/win32/buildMakefile 
  Log:
  Avoid killing files that we didn't generate when making clean.
  
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.6 php-src/win32/build/Makefile:1.7
--- php-src/win32/build/Makefile:1.6Wed Dec  3 20:37:52 2003
+++ php-src/win32/build/MakefileThu Dec  4 12:28:08 2003
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.6 2003/12/04 01:37:52 wez Exp $
+# $Id: Makefile,v 1.7 2003/12/04 17:28:08 wez Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -61,9 +61,13 @@
mkdir $(BUILD_DIR)
for %D in ($(BUILD_DIRS_SUB)) do mkdir %D
 
-clean:
+clean-sapi:
+   for %D in ($(EXT_TARGETS) $(SAPI_TARGETS)) do del /F /Q $(BUILD_DIR)\%D
+   del /F /Q $(BUILD_DIR)\$(PHPDLL)
+
+clean: clean-sapi
for %D in ($(BUILD_DIRS_SUB)) do del /F /Q %D\*.*
-   del /F /Q $(BUILD_DIR)\*.*
+   del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk 
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp
 
 test:

[PHP-CVS] cvs: CVSROOT / avail

2003-12-04 Thread Andrei Zmievski

andrei  Thu Dec  4 12:25:13 2003 EDT

  Modified files:  
/CVSROOTavail 
  Log:
  
  
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.777 CVSROOT/avail:1.778
--- CVSROOT/avail:1.777 Wed Dec  3 12:31:51 2003
+++ CVSROOT/avail   Thu Dec  4 12:25:12 2003
@@ -85,6 +85,10 @@
 
 avail|mohrt,cellog,messju,andreas,boots|smarty
 
+# The Smarty docs translators
+
+avail|gerald,arno|smarty/docs
+
 # The Smarty Web Group has access to the Smarty website.
 
 avail|cmv,mohrt,imajes,darkelder,messju,mose,jrieger,boots,mose,marclaporte|smarty-web

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

[PHP-CVS] cvs: php-src /win32/build confutils.js

2003-12-04 Thread Frank M. Kromann

fmk Thu Dec  4 12:03:21 2003 EDT

  Modified files:  
/php-src/win32/buildconfutils.js 
  Log:
  fix remaining ext/
  
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.15 php-src/win32/build/confutils.js:1.16
--- php-src/win32/build/confutils.js:1.15   Thu Dec  4 08:38:47 2003
+++ php-src/win32/build/confutils.jsThu Dec  4 12:03:20 2003
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.15 2003/12/04 13:38:47 wez Exp $
+// $Id: confutils.js,v 1.16 2003/12/04 17:03:20 fmk Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -573,7 +573,7 @@
 
/* find the header that declars the module pointer,
 * so we can include it in internal_functions.c */
-   var ext_dir = FSO.GetFolder("ext/" + extname);
+   var ext_dir = FSO.GetFolder(configure_module_dirname);
var fc = new Enumerator(ext_dir.Files);
var re = /\.h$/;
var s, c;

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

[PHP-CVS] cvs: php-src / EXTENSIONS /ext/standard credits_ext.h

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:01:11 2003 EDT

  Modified files:  
/php-srcEXTENSIONS 
/php-src/ext/standard   credits_ext.h 
  Log:
  - Update after moving extensions to PECL
  
  
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.64 php-src/EXTENSIONS:1.65
--- php-src/EXTENSIONS:1.64 Tue Dec  2 09:48:22 2003
+++ php-src/EXTENSIONS  Thu Dec  4 10:01:09 2003
@@ -289,11 +289,6 @@
 MAINTENANCE: Maintained
 STATUS:  Working
 ---
-EXTENSION:   crack
-MAINTENANCE: Unknown
-STATUS:  Experimental
-SINCE:   4.0.5

 EXTENSION:   ctype
 PRIMARY MAINTAINER:  Hartmut Holzgraefe <[EMAIL PROTECTED]>
 MAINTENANCE: Maintained
@@ -355,11 +350,6 @@
 MAINTENANCE: Maintained
 STATUS:  Working
 ---
-EXTENSION:   mcal
-PRIMARY MAINTAINER:  Chuck Hagenbuch <[EMAIL PROTECTED]>
-MAINTENANCE: Odd Fixes
-STATUS:  Working

 EXTENSION:   mcrypt
 PRIMARY MAINTAINER:  Derick Rethans <[EMAIL PROTECTED]>
 MAINTENANCE: Maintained
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.21 php-src/ext/standard/credits_ext.h:1.22
--- php-src/ext/standard/credits_ext.h:1.21 Tue Dec  2 09:50:37 2003
+++ php-src/ext/standard/credits_ext.h  Thu Dec  4 10:01:10 2003
@@ -16,7 +16,6 @@
 CREDIT_LINE("Calendar", "Shane Caraveo, Colin Viebrock, Hartmut Holzgraefe, Wez 
Furlong");
 CREDIT_LINE("COM and .Net", "Wez Furlong");
 CREDIT_LINE("cpdf", "Uwe Steinmann");
-CREDIT_LINE("crack", "Alexander Feldman");
 CREDIT_LINE("ctype", "Hartmut Holzgraefe");
 CREDIT_LINE("cURL", "Sterling Hughes");
 CREDIT_LINE("DBA", "Sascha Schumann, Marcus Boerger");
@@ -41,7 +40,6 @@
 CREDIT_LINE("IRCG", "Sascha Schumann");
 CREDIT_LINE("LDAP", "Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig 
Venaas");
 CREDIT_LINE("LIBXML", "Christian Stocker, Rob Richards, Marcus Boerger, Wez Furlong, 
Shane Caraveo");
-CREDIT_LINE("MCAL", "Mark Musone, Chuck Hagenbuch");
 CREDIT_LINE("mcrypt", "Sascha Schumann, Derick Rethans");
 CREDIT_LINE("MCVE", "Brad House, Chris Faulhaber, Steven Schoch");
 CREDIT_LINE("mhash", "Sascha Schumann");

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

[PHP-CVS] cvs: php-src(PHP_4_3) / Makefile.global acinclude.m4 configure.in

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:59:05 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcMakefile.global acinclude.m4 configure.in 
  Log:
  MFH: Only add 'install-modules' into install targets when there are such
   modules to install
  
  
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.40.2.13 php-src/Makefile.global:1.40.2.14
--- php-src/Makefile.global:1.40.2.13   Thu Jul 24 13:45:15 2003
+++ php-src/Makefile.global Thu Dec  4 10:59:04 2003
@@ -38,10 +38,10 @@
 
 install-modules: build-modules
@test -d modules && \
-   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
-   echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
-   rm -f modules/*.la && \
-   $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
+   @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/"
+   @rm -f modules/*.la >/dev/null 2>&1
+   @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 install-tester:
@echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.32 php-src/acinclude.m4:1.218.2.33
--- php-src/acinclude.m4:1.218.2.32 Thu Nov 13 09:18:02 2003
+++ php-src/acinclude.m4Thu Dec  4 10:59:04 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.32 2003/11/13 14:18:02 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.33 2003/12/04 15:59:04 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1159,6 +1159,7 @@
 dnl from object_var in build-dir.
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
+  install_modules="install-modules"
   PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
   PHP_SUBST($2)
   cat >>Makefile.objects

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:57:56 2003 EDT

  Modified files:  
/php-srcMakefile.global acinclude.m4 configure.in 
  Log:
  - Only add 'install-modules' into install targets when there are such
modules to install.
  
  
  
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.50 php-src/Makefile.global:1.51
--- php-src/Makefile.global:1.50Thu Jul 24 13:44:16 2003
+++ php-src/Makefile.global Thu Dec  4 10:57:55 2003
@@ -38,10 +38,10 @@
 
 install-modules: build-modules
@test -d modules && \
-   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
-   echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
-   rm -f modules/*.la && \
-   $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
+   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
+   @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/"
+   @rm -f modules/*.la >/dev/null 2>&1
+   @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 install-tester:
@echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.265 php-src/acinclude.m4:1.266
--- php-src/acinclude.m4:1.265  Thu Nov 13 09:17:47 2003
+++ php-src/acinclude.m4Thu Dec  4 10:57:55 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.265 2003/11/13 14:17:47 sniper Exp $
+dnl $Id: acinclude.m4,v 1.266 2003/12/04 15:57:55 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1153,6 +1153,7 @@
 dnl from object_var in build-dir.
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
+  install_modules="install-modules"
   PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
   PHP_SUBST($2)
   cat >>Makefile.objects

[PHP-CVS] cvs: php-src /win32 php4dllts.dsp

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:14:04 2003 EDT

  Modified files:  
/php-src/win32  php4dllts.dsp 
  Log:
  - remove non-existing files
  
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.139 php-src/win32/php4dllts.dsp:1.140
--- php-src/win32/php4dllts.dsp:1.139   Thu Dec  4 10:02:48 2003
+++ php-src/win32/php4dllts.dsp Thu Dec  4 10:14:03 2003
@@ -1907,10 +1907,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\ext\mcal\php_mcal.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\ext\odbc\php_odbc.h
 # End Source File
 # Begin Source File

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

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

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 10:32:32 2003 EDT

  Added files: 
/php-src/ext/pgsql  config.w32 
  Log:
  Make this build using new build system
  

Index: php-src/ext/pgsql/config.w32
+++ php-src/ext/pgsql/config.w32
// $Id: config.w32,v 1.1 2003/12/04 15:32:31 wez Exp $
// vim:ft=javascript

ARG_WITH("pgsql", "PostgreSQL support", "no");

if (PHP_PGSQL != "no") {
if (!PHP_PGSQL_SHARED) {
ERROR("Cannot build pgsql as a static extension until someone fixes 
its bogus PHPAPI usage\r\nuse --with-pgsql=shared instead.");
} else {
if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) &&
CHECK_HEADER_ADD_INCLUDE("postgres.h", "CFLAGS_PGSQL", 
PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\postgresql\\src\\include;" + 
PHP_PGSQL)) {
EXTENSION("pgsql", "pgsql.c");
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PQCMDTUPLES /D 
HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H");
} else {
WARNING("pgsql not enabled; libraries and headers not found");
}
}
}

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

[PHP-CVS] cvs: php-src /win32 php4dllts.dsp

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:02:48 2003 EDT

  Modified files:  
/php-src/win32  php4dllts.dsp 
  Log:
  - remove non-existing files
  
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.138 php-src/win32/php4dllts.dsp:1.139
--- php-src/win32/php4dllts.dsp:1.138   Sat Nov 29 15:55:18 2003
+++ php-src/win32/php4dllts.dsp Thu Dec  4 10:02:48 2003
@@ -1708,10 +1708,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\ext\mcal\php_mcal.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\ext\odbc\php_odbc.c
 # End Source File
 # Begin Source File

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

[PHP-CVS] cvs: php-src /win32 php_modules.dsw

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 09:53:28 2003 EDT

  Modified files:  
/php-src/win32  php_modules.dsw 
  Log:
  - remove non-existing modules
  
Index: php-src/win32/php_modules.dsw
diff -u php-src/win32/php_modules.dsw:1.59 php-src/win32/php_modules.dsw:1.60
--- php-src/win32/php_modules.dsw:1.59  Mon Sep  1 02:14:24 2003
+++ php-src/win32/php_modules.dsw   Thu Dec  4 09:53:27 2003
@@ -27,18 +27,6 @@
 
 ###
 
-Project: "crack"=..\ext\crack\crack.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###
-
 Project: "ctype"=..\ext\ctype\ctype.dsp - Package Owner=<4>
 
 Package=<5>
@@ -63,18 +51,6 @@
 
 ###
 
-Project: "db"=..\ext\db\db.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###
-
 Project: "dba"=..\ext\dba\dba.dsp - Package Owner=<4>
 
 Package=<5>

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

[PHP-CVS] cvs: php-src /ext/libxml config.w32 /sapi/apache config.w32 /sapi/isapi config.w32 /win32/build buildconf.js confutils.js template.rc

2003-12-04 Thread Wez Furlong

wez Thu Dec  4 08:38:48 2003 EDT

  Modified files:  
/php-src/ext/libxml config.w32 
/php-src/sapi/apacheconfig.w32 
/php-src/sapi/isapi config.w32 
/php-src/win32/buildbuildconf.js confutils.js template.rc 
  Log:
  Fix libxml to use static lib if found.
  Disable apache and isapi by default.
  Add some smarts so that we can really build extensions and SAPI found in 
php-src/pecl and/or php-src/../pecl.
  Only include a logo in the resources if we are building an .exe.
  
  Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.3 php-src/ext/libxml/config.w32:1.4
--- php-src/ext/libxml/config.w32:1.3   Wed Dec  3 09:29:42 2003
+++ php-src/ext/libxml/config.w32   Thu Dec  4 08:38:45 2003
@@ -1,16 +1,17 @@
-// $Id: config.w32,v 1.3 2003/12/03 14:29:42 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/04 13:38:45 wez Exp $
 // vim:ft=javascript
 
 ARG_WITH("libxml", "LibXML support", "yes");
 
 if (PHP_LIBXML == "yes") {
-   EXTENSION("libxml", "libxml.c", false /* never shared */);
-   AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
 
-   CHECK_LIB("iconv.lib", "libxml");
-   CHECK_LIB("libxml2.lib", "libxml");
-   CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS");
-   ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED");
+   if ((CHECK_LIB("libxml2_a.lib", "libxml") || CHECK_LIB("libxml2.lib", 
"libxml")) &&
+   CHECK_LIB("iconv.lib", "libxml") &&
+   CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS")) {
+   EXTENSION("libxml", "libxml.c", false /* never shared */);
+   AC_DEFINE("HAVE_LIBXML", 1, "LibXML support");
+   ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED");
+   }
 }
 
 
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.4 php-src/sapi/apache/config.w32:1.5
--- php-src/sapi/apache/config.w32:1.4  Wed Dec  3 09:29:44 2003
+++ php-src/sapi/apache/config.w32  Thu Dec  4 08:38:45 2003
@@ -1,7 +1,7 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.4 2003/12/03 14:29:44 wez Exp $
+// $Id: config.w32,v 1.5 2003/12/04 13:38:45 wez Exp $
 
-ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'yes');
+ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
 
 ARG_WITH('apache-includes', 'Where to find Apache 1.3 headers', null);
 ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
Index: php-src/sapi/isapi/config.w32
diff -u php-src/sapi/isapi/config.w32:1.1 php-src/sapi/isapi/config.w32:1.2
--- php-src/sapi/isapi/config.w32:1.1   Tue Dec  2 18:17:04 2003
+++ php-src/sapi/isapi/config.w32   Thu Dec  4 08:38:46 2003
@@ -1,7 +1,7 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/04 13:38:46 wez Exp $
 
-ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'yes');
+ARG_ENABLE('isapi', 'Build ISAPI version of PHP', 'no');
 
 if (PHP_ISAPI == "yes") {
SAPI('isapi', 'php4isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D 
PHP4ISAPI_EXPORTS');
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.4 php-src/win32/build/buildconf.js:1.5
--- php-src/win32/build/buildconf.js:1.4Wed Dec  3 20:59:46 2003
+++ php-src/win32/build/buildconf.jsThu Dec  4 08:38:47 2003
@@ -1,4 +1,4 @@
-// $Id: buildconf.js,v 1.4 2003/12/04 01:59:46 wez Exp $
+// $Id: buildconf.js,v 1.5 2003/12/04 13:38:47 wez Exp $
 /*
   +--+
   | PHP Version 5|
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: buildconf.js,v 1.4 2003/12/04 01:59:46 wez Exp $ */
+/* $Id: buildconf.js,v 1.5 2003/12/04 13:38:47 wez Exp $ */
 // This generates a configure script for win32 build
 
 WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -25,6 +25,7 @@
 var C = FSO.CreateTextFile("configure.js", true);
 
 var modules = "";
+var seen = new Array();
 
 function file_get_contents(filename)
 {
@@ -42,12 +43,34 @@
 
var f = FSO.GetFolder(dirname);
var fc = new Enumerator(f.SubFolders);
-   var c;
+   var c, i, ok, n;
for (; !fc.atEnd(); fc.moveNext())
{
+   ok = true;
+   /* check if we already picked up a module with the same dirname;
+* if we have, don't include it here */
+   n = FSO.GetFileName(fc.item());
+   
+   if (n == 'CVS' || n == 'tests')
+   continue;
+   
+   //  WScript.StdOut.WriteLine("checking " + dirname + "/" + n);
+   for (i = 0; i < seen.length; i++) {
+   if (seen[i] == n) {
+   ok = false;
+   break;
+   }
+   }
+

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

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 08:42:25 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
  Log:
  MFH: Fix for "make install" with empty INSTALL_IT
  
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.89 php-src/configure.in:1.396.2.90
--- php-src/configure.in:1.396.2.89 Mon Dec  1 11:12:36 2003
+++ php-src/configure.inThu Dec  4 08:42:25 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.89 2003/12/01 16:12:36 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.90 2003/12/04 13:42:25 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1138,10 +1138,19 @@
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build 
install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
-  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-modules $install_pear install-build install-headers 
install-programs"
+
+case $PHP_SAPI in
+  cgi)
+install_targets="install-sapi $install_targets"
+;;
+  cli)
+install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+;;
+  *)
+install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
+;;
+esac
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)

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

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

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 08:41:48 2003 EDT

  Modified files:  
/php-srcconfigure.in 
  Log:
  - Fixed "make install" when INSTALL_IT is empty, like when configured
with "./configure --disable-cgi" (CLI has it's own build target)
  
  
Index: php-src/configure.in
diff -u php-src/configure.in:1.481 php-src/configure.in:1.482
--- php-src/configure.in:1.481  Wed Dec  3 00:06:04 2003
+++ php-src/configure.inThu Dec  4 08:41:48 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.481 2003/12/03 05:06:04 jon Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.482 2003/12/04 13:41:48 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1149,10 +1149,19 @@
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build 
install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
-  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-modules $install_pear install-build install-headers 
install-programs"
+
+case $PHP_SAPI in
+  cgi)
+install_targets="install-sapi $install_targets"
+;;
+  cli)
+install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+;;
+  *)
+install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
+;;
+esac
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)

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

[PHP-CVS] cvs: php-src /ext/xsl config.w32

2003-12-04 Thread Rob Richards

rrichards   Thu Dec  4 08:32:22 2003 EDT

  Modified files:  
/php-src/ext/xslconfig.w32 
  Log:
  test for dom extension
  
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.2 php-src/ext/xsl/config.w32:1.3
--- php-src/ext/xsl/config.w32:1.2  Thu Dec  4 07:46:20 2003
+++ php-src/ext/xsl/config.w32  Thu Dec  4 08:32:22 2003
@@ -1,18 +1,22 @@
-// $Id: config.w32,v 1.2 2003/12/04 12:46:20 rrichards Exp $
+// $Id: config.w32,v 1.3 2003/12/04 13:32:22 rrichards Exp $
 // vim: ft=javascript
 
 ARG_WITH("xsl", "xsl support", "no");
 
 if (PHP_XSL != "no") {
-   if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
-   CHECK_LIB("libxml2.lib", "xsl") &&
-   CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
-   EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
-   AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
-   if (! PHP_XSL_SHARED) {
-   ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+   if (PHP_DOM == "yes" && PHP_LIBXML == "yes") {
+   if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
+   CHECK_LIB("libxml2.lib", "xsl") &&
+   CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", 
"CFLAGS_XSL")) {
+   EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
+   AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
+   if (! PHP_XSL_SHARED) {
+   ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
+   }
+   } else {
+   WARNING("xsl not enabled; libraries and headers not found");
}
} else {
-   WARNING("xsl not enabled; libraries and headers not found");
+   WARNING("xsl not enabled; DOM extension required");
}
 }

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

[PHP-CVS] cvs: php-src /ext/xsl config.w32

2003-12-04 Thread Rob Richards

rrichards   Thu Dec  4 07:46:20 2003 EDT

  Modified files:  
/php-src/ext/xslconfig.w32 
  Log:
  correct test
  
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.1 php-src/ext/xsl/config.w32:1.2
--- php-src/ext/xsl/config.w32:1.1  Thu Dec  4 07:37:04 2003
+++ php-src/ext/xsl/config.w32  Thu Dec  4 07:46:20 2003
@@ -1,9 +1,9 @@
-// $Id: config.w32,v 1.1 2003/12/04 12:37:04 rrichards Exp $
+// $Id: config.w32,v 1.2 2003/12/04 12:46:20 rrichards Exp $
 // vim: ft=javascript
 
 ARG_WITH("xsl", "xsl support", "no");
 
-if (PHP_XSL == "yes") {
+if (PHP_XSL != "no") {
if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
CHECK_LIB("libxml2.lib", "xsl") &&
CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard php_string.h

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 07:45:32 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   php_string.h 
  Log:
  MFH: Fix compile with c++ (bug #26519)
  
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.65.2.2 
php-src/ext/standard/php_string.h:1.65.2.3
--- php-src/ext/standard/php_string.h:1.65.2.2  Mon Feb 24 17:47:12 2003
+++ php-src/ext/standard/php_string.h   Thu Dec  4 07:45:32 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: php_string.h,v 1.65.2.2 2003/02/24 22:47:12 moriyoshi Exp $ */
+/* $Id: php_string.h,v 1.65.2.3 2003/12/04 12:45:32 sniper Exp $ */
 
 /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
 
@@ -139,7 +139,7 @@
end -= needle_len;
 
while (p <= end) {
-   if ((p = memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
+   if ((p = (char *) memchr(p, *needle, (end-p+1))) && ne == 
p[needle_len-1]) {
if (!memcmp(needle, p, needle_len-1)) {
return p;
}

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

[PHP-CVS] cvs: php-src /ext/xsl config.w32

2003-12-04 Thread Rob Richards

rrichards   Thu Dec  4 07:37:05 2003 EDT

  Added files: 
/php-src/ext/xslconfig.w32 
  Log:
  Add xsl config for new win build
  

Index: php-src/ext/xsl/config.w32
+++ php-src/ext/xsl/config.w32
// $Id: config.w32,v 1.1 2003/12/04 12:37:04 rrichards Exp $
// vim: ft=javascript

ARG_WITH("xsl", "xsl support", "no");

if (PHP_XSL == "yes") {
if (CHECK_LIB("libxslt.lib", "xsl", PHP_XSL) && 
CHECK_LIB("libxml2.lib", "xsl") &&
CHECK_HEADER_ADD_INCLUDE("libxslt\\xslt.h", "CFLAGS_XSL")) {
EXTENSION("xsl", "php_xsl.c xsltprocessor.c", PHP_XSL_SHARED);
AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled");
if (! PHP_XSL_SHARED) {
ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS ");
}
} else {
WARNING("xsl not enabled; libraries and headers not found");
}
}

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

[PHP-CVS] cvs: php-src /win32/build confutils.js

2003-12-04 Thread Rob Richards

rrichards   Thu Dec  4 07:34:29 2003 EDT

  Modified files:  
/php-src/win32/buildconfutils.js 
  Log:
  return status of have so extra libs return correct status
  
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.13 php-src/win32/build/confutils.js:1.14
--- php-src/win32/build/confutils.js:1.13   Wed Dec  3 21:24:23 2003
+++ php-src/win32/build/confutils.jsThu Dec  4 07:34:29 2003
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.13 2003/12/04 02:24:23 wez Exp $
+// $Id: confutils.js,v 1.14 2003/12/04 12:34:29 rrichards Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -376,7 +376,7 @@
 
 // AC_DEFINE("HAVE_" + header_name.toUpperCase().replace(new RegExp("/-\.", 
"g"), "_"), have);
 
-   return p;
+   return have;
 
 }
 

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

[PHP-CVS] cvs: php-src / NEWS php.ini-dist php.ini-recommended /ext/crack .cvsignore CREDITS EXPERIMENTAL config.m4 config.w32 crack.c crack.dsp php_crack.h /ext/crack/tests .cvsignore 001.phpt /ext/mcal .cvsignore CREDITS config.m4 php_mcal.c php_mcal.h

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 07:05:57 2003 EDT

  Removed files:   
/php-src/ext/mcal   .cvsignore CREDITS config.m4 php_mcal.c 
php_mcal.h 
/php-src/ext/crack  .cvsignore CREDITS EXPERIMENTAL config.m4 
config.w32 crack.c crack.dsp php_crack.h 
/php-src/ext/crack/tests.cvsignore 001.phpt 

  Modified files:  
/php-srcNEWS php.ini-dist php.ini-recommended 
  Log:
  - Moved ext/crack and ext/mcal to PECL.
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1519 php-src/NEWS:1.1520
--- php-src/NEWS:1.1519 Thu Dec  4 01:40:08 2003
+++ php-src/NEWSThu Dec  4 07:05:54 2003
@@ -3,7 +3,9 @@
 ?? Oct 2003, PHP 5 Beta 3
 - Dropped Windows 95 support. (Andi)
 - Moved extensions to PECL:
+  . ext/crack (Jani, Derick)
   . ext/db (Jani, Derick)
+  . ext/mcal (Jani, Derick)
   . ext/qtdom (Jani, Derick)
 - Added possibility to call PHP functions as XSLT-functions. (Christian)
 - Added possibility to prevent PHP from registering variables when
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.201 php-src/php.ini-dist:1.202
--- php-src/php.ini-dist:1.201  Fri Nov 28 21:49:57 2003
+++ php-src/php.ini-distThu Dec  4 07:05:54 2003
@@ -535,9 +535,7 @@
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
-;extension=php_crack.dll
 ;extension=php_curl.dll
-;extension=php_db.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
@@ -546,13 +544,11 @@
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
-;extension=php_hyperwave.dll
 ;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
-;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
@@ -567,7 +563,6 @@
 ;extension=php_oracle.dll
 ;extension=php_pdf.dll
 ;extension=php_pgsql.dll
-;extension=php_printer.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
@@ -1113,11 +1108,6 @@
 ;fbsql.max_results = 128
 ;fbsql.batchSize = 1000
 
-[Crack]
-; Modify the setting below to match the directory location of the cracklib
-; dictionary files.  Include the base filename, but not the file extension.
-; crack.default_dictionary = "c:\php\lib\cracklib_dict"
-
 [exif]
 ; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. 
 ; With mbstring support this will automatically be converted into the encoding
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.146 php-src/php.ini-recommended:1.147
--- php-src/php.ini-recommended:1.146   Fri Nov 28 21:49:57 2003
+++ php-src/php.ini-recommended Thu Dec  4 07:05:54 2003
@@ -554,9 +554,7 @@
 ;
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
-;extension=php_crack.dll
 ;extension=php_curl.dll
-;extension=php_db.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
@@ -565,7 +563,6 @@
 ;extension=php_filepro.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
-;extension=php_hyperwave.dll
 ;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
@@ -586,7 +583,6 @@
 ;extension=php_oracle.dll
 ;extension=php_pdf.dll
 ;extension=php_pgsql.dll
-;extension=php_printer.dll
 ;extension=php_shmop.dll
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
@@ -1126,11 +1122,6 @@
 ;fbsql.max_results = 128
 ;fbsql.batchSize = 1000
 
-[Crack]
-; Modify the setting below to match the directory location of the cracklib
-; dictionary files.  Include the base filename, but not the file extension.
-; crack.default_dictionary = "c:\php\lib\cracklib_dict"
-
 [exif]
 ; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. 
 ; With mbstring support this will automatically be converted into the encoding

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

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

2003-12-04 Thread Uwe Schindler

thetaphiThu Dec  4 04:00:25 2003 EDT

  Modified files:  
/php-src/ext/standard   browscap.c 
  Log:
  MFB
  
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.79 php-src/ext/standard/browscap.c:1.80
--- php-src/ext/standard/browscap.c:1.79Wed Aug 13 18:31:22 2003
+++ php-src/ext/standard/browscap.c Thu Dec  4 04:00:24 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.79 2003/08/13 22:31:22 wez Exp $ */
+/* $Id: browscap.c,v 1.80 2003/12/04 09:00:24 thetaphi Exp $ */
 
 #include "php.h"
 #include "php_regex.h"
@@ -149,7 +149,7 @@
zend_file_handle fh;
memset(&fh, 0, sizeof(fh));
 
-   if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1)==FAILURE) {
+   if (zend_hash_init_ex(&browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1, 0)==FAILURE) {
return FAILURE;
}
 

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

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard browscap.c

2003-12-04 Thread Uwe Schindler

thetaphiThu Dec  4 03:56:08 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/standard   browscap.c 
  Log:
  Fix bug #25916: get_browser() -> PHP Fatal error: Nesting level too deep - recursive 
dependency?
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.491 php-src/NEWS:1.1247.2.492
--- php-src/NEWS:1.1247.2.491   Thu Dec  4 01:37:14 2003
+++ php-src/NEWSThu Dec  4 03:56:06 2003
@@ -5,6 +5,8 @@
   (Jani)
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #25916 (get_browser() -> PHP Fatal error: Nesting level
+  too deep - recursive dependency?). (Uwe Schindler)
 - Fixed bug #26488 (Missing declaration of CRTSCTS in ext/dio/dio.c). (Jani)
 - Fixed bug #26467 (flock() does not force the "wouldblock" parameter to be 
   passed by reference). (Wez)
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.60.2.15 
php-src/ext/standard/browscap.c:1.60.2.16
--- php-src/ext/standard/browscap.c:1.60.2.15   Wed Aug 13 19:39:03 2003
+++ php-src/ext/standard/browscap.c Thu Dec  4 03:56:07 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.60.2.15 2003/08/13 23:39:03 sniper Exp $ */
+/* $Id: browscap.c,v 1.60.2.16 2003/12/04 08:56:07 thetaphi Exp $ */
 
 #include "php.h"
 #include "php_regex.h"
@@ -149,7 +149,7 @@
zend_file_handle fh;
memset(&fh, 0, sizeof(fh));
 
-   if (zend_hash_init(&browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1)==FAILURE) {
+   if (zend_hash_init_ex(&browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1, 0)==FAILURE) {
return FAILURE;
}
 

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

45 matches

Mail list logo