[PHP-CVS] cvs: php-src /ext/exif config.w32
fmk Fri Dec 5 02:17:12 2003 EDT
Added files:
/php-src/ext/exif config.w32
Log:
Include exif in the new win32 build system
Index: php-src/ext/exif/config.w32
+++ php-src/ext/exif/config.w32
// $Id: config.w32,v 1.1 2003/12/05 07:17:11 fmk Exp $
// vim:ft=javascript
ARG_WITH(exif, exif, no);
if (PHP_EXIF == yes) {
EXTENSION(exif, exif.c);
AC_DEFINE('HAVE_EXIF', 1, 'Have exif');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests bug25756.phpt
helly Fri Dec 5 03:07:15 2003 EDT
Modified files:
/php-src/ext/simplexml/testsbug25756.phpt
Log:
Update test
Index: php-src/ext/simplexml/tests/bug25756.phpt
diff -u php-src/ext/simplexml/tests/bug25756.phpt:1.4
php-src/ext/simplexml/tests/bug25756.phpt:1.5
--- php-src/ext/simplexml/tests/bug25756.phpt:1.4 Sun Oct 26 14:35:08 2003
+++ php-src/ext/simplexml/tests/bug25756.phpt Fri Dec 5 03:07:14 2003
@@ -41,7 +41,7 @@
}
bool(true)
-Warning: Unknown: Malformed XML Schema in %s on line %d
+Warning: simplexml_element::validate_schema_file(): Malformed XML Schema in
%sbug25756.php on line %d
bool(false)
object(simplexml_element)#%d (1) {
[items]=
--
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
moriyoshi Fri Dec 5 04:35:22 2003 EDT Modified files: /php-src/ext/iconv iconv.c Log: Add a missing marker Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.106 php-src/ext/iconv/iconv.c:1.107 --- php-src/ext/iconv/iconv.c:1.106 Thu Dec 4 22:14:54 2003 +++ php-src/ext/iconv/iconv.c Fri Dec 5 04:35:21 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: iconv.c,v 1.106 2003/12/05 03:14:54 wez Exp $ */ +/* $Id: iconv.c,v 1.107 2003/12/05 09:35:21 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2548,6 +2548,7 @@ return PHP_ICONV_ERR_SUCCESS; } /* }}} */ +/* }}} */ #endif /* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c /main php_compat.h
moriyoshi Fri Dec 5 05:11:07 2003 EDT
Modified files:
/php-src/main php_compat.h
/php-src/ext/xmlcompat.c
Log:
Fix libexpat build.
Improve replaceEntities patch.
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.18 php-src/main/php_compat.h:1.19
--- php-src/main/php_compat.h:1.18 Sat Aug 9 10:27:16 2003
+++ php-src/main/php_compat.h Fri Dec 5 05:11:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_compat.h,v 1.18 2003/08/09 14:27:16 sniper Exp $ */
+/* $Id: php_compat.h,v 1.19 2003/12/05 10:11:05 moriyoshi Exp $ */
#ifndef PHP_COMPAT_H
#define PHP_COMPAT_H
@@ -48,7 +48,7 @@
#define hashTableIterInit php_hashTableIterInit
#define hashTableIterNext php_hashTableIterNext
-#if defined(HAVE_LIBXML) defined(HAVE_XML)
+#if defined(HAVE_LIBXML) defined(HAVE_XML) !defined(HAVE_LIBEXPAT)
#define XML_DefaultCurrent php_XML_DefaultCurrent
#define XML_ErrorString php_XML_ErrorString
#define XML_ExpatVersion php_XML_ExpatVersion
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.21 php-src/ext/xml/compat.c:1.22
--- php-src/ext/xml/compat.c:1.21 Thu Dec 4 20:16:16 2003
+++ php-src/ext/xml/compat.cFri Dec 5 05:11:06 2003
@@ -17,7 +17,7 @@
*/
#include php.h
-#if HAVE_LIBXML HAVE_XML
+#if defined(HAVE_LIBXML) defined(HAVE_XML) !defined(HAVE_LIBEXPAT)
#include expat_compat.h
typedef struct _php_xml_ns {
@@ -412,7 +412,7 @@
} else {
parser-parser-charset = XML_CHAR_ENCODING_NONE;
}
- parser-parser-replaceEntities=1;
+ xmlCtxtUseOptions(parser-parser, XML_PARSE_NO_ENT);
if (sep != NULL) {
parser-use_namespace = 1;
parser-_ns_map = xmlHashCreate(10);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml compat.c /main php_compat.h
You're using functions which only exist in the libxml 2.6 branch. Unless the mimimun libxml version is being bumped up again, Ilia's bug fix was better since it worked for both branches. Rob From: Moriyoshi Koizumi moriyoshi Fri Dec 5 05:11:07 2003 EDT Modified files: /php-src/main php_compat.h /php-src/ext/xml compat.c Log: Fix libexpat build. Improve replaceEntities patch. + xmlCtxtUseOptions(parser-parser, XML_PARSE_NO_ENT); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
moriyoshi Fri Dec 5 05:54:00 2003 EDT
Modified files:
/php-src/ext/xmlcompat.c
Log:
xmlCtxtSetOptions() isn't available in the versions up to 2.6.x
# Thanks Rob
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.22 php-src/ext/xml/compat.c:1.23
--- php-src/ext/xml/compat.c:1.22 Fri Dec 5 05:11:06 2003
+++ php-src/ext/xml/compat.cFri Dec 5 05:53:59 2003
@@ -412,7 +412,7 @@
} else {
parser-parser-charset = XML_CHAR_ENCODING_NONE;
}
- xmlCtxtUseOptions(parser-parser, XML_PARSE_NO_ENT);
+ parser-parser-replaceEntities = 1;
if (sep != NULL) {
parser-use_namespace = 1;
parser-_ns_map = xmlHashCreate(10);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/network udgloop.phpt udp6loop.phpt unixloop.phpt /main/streams streams.c
wez Fri Dec 5 08:41:03 2003 EDT
Modified files:
/php-src/ext/standard/tests/network udgloop.phpt udp6loop.phpt
unixloop.phpt
/php-src/main/streams streams.c
Log:
Be smarter about which systems should register unix transports.
Fix skip conditions in these network tests
Index: php-src/ext/standard/tests/network/udgloop.phpt
diff -u php-src/ext/standard/tests/network/udgloop.phpt:1.1
php-src/ext/standard/tests/network/udgloop.phpt:1.2
--- php-src/ext/standard/tests/network/udgloop.phpt:1.1 Sun Aug 10 21:30:55 2003
+++ php-src/ext/standard/tests/network/udgloop.phpt Fri Dec 5 08:41:01 2003
@@ -1,15 +1,15 @@
--TEST--
Streams Based Unix Domain Datagram Loopback test
--SKIPIF--
-?php
+?php # vim:ft=php:
if (array_search(udg,stream_get_transports()) === false)
- die('No support for UNIX domain sockets.');
+ die('SKIP No support for UNIX domain sockets.');
?
--FILE--
?php
$uniqid = uniqid();
if (file_exists(/tmp/$uniqid.sock))
- die('Temporary socket already exists.');
+ die('Temporary socket /tmp/$uniqid.sock already exists.');
/* Setup socket server */
$server = stream_socket_server(udg:///tmp/$uniqid.sock, $errno, $errstr,
STREAM_SERVER_BIND);
Index: php-src/ext/standard/tests/network/udp6loop.phpt
diff -u php-src/ext/standard/tests/network/udp6loop.phpt:1.2
php-src/ext/standard/tests/network/udp6loop.phpt:1.3
--- php-src/ext/standard/tests/network/udp6loop.phpt:1.2Mon Aug 11 20:44:05
2003
+++ php-src/ext/standard/tests/network/udp6loop.phptFri Dec 5 08:41:01 2003
@@ -1,10 +1,16 @@
--TEST--
Streams Based IPv6 UDP Loopback test
--SKIPIF--
-?php
-/* If IPv6 is supported on the platform this will error out with code 111 -
Connection refused.
- If IPv6 is NOT supported, $errno will be set to something else (indicating
parse/getaddrinfo error)
- Note: Might be a good idea to export an IPv6 support indicator (such as
AF_INET6 exported by ext/sockets) */
+?php # vim:ft=php:
+ /* If IPv6 is supported on the platform this will error out with code 111 -
+* Connection refused. If IPv6 is NOT supported, $errno will be set to
+* something else (indicating parse/getaddrinfo error)
+* Note: Might be a good idea to export an IPv6 support indicator
+* (such as AF_INET6 exported by ext/sockets), however, since we
+* cannot tell for sure if IPv6 works until we probe it at run time,
+* this isn't really practical.
+*/
+
@stream_socket_client('tcp://[::1]:0', $errno);
if ($errno != 111) die('skip IPv6 not supported.');
?
Index: php-src/ext/standard/tests/network/unixloop.phpt
diff -u php-src/ext/standard/tests/network/unixloop.phpt:1.1
php-src/ext/standard/tests/network/unixloop.phpt:1.2
--- php-src/ext/standard/tests/network/unixloop.phpt:1.1Sun Aug 10 21:30:55
2003
+++ php-src/ext/standard/tests/network/unixloop.phptFri Dec 5 08:41:01 2003
@@ -1,9 +1,9 @@
--TEST--
Streams Based Unix Domain Loopback test
--SKIPIF--
-?php
+?php # vim:ft=php:
if (array_search(unix,stream_get_transports()) === false)
- die('No support for UNIX domain sockets.');
+ die('SKIP No support for UNIX domain sockets.');
?
--FILE--
?php
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.43 php-src/main/streams/streams.c:1.44
--- php-src/main/streams/streams.c:1.43 Fri Nov 28 18:25:27 2003
+++ php-src/main/streams/streams.c Fri Dec 5 08:41:02 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.43 2003/11/28 23:25:27 pollita Exp $ */
+/* $Id: streams.c,v 1.44 2003/12/05 13:41:02 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1353,7 +1353,7 @@
php_stream_xport_register(tcp,
php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
php_stream_xport_register(udp,
php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
-#ifdef AF_UNIX
+#if defined(AF_UNIX) !(defined(PHP_WIN32) || defined(__riscos__) ||
defined(NETWARE))
php_stream_xport_register(unix,
php_stream_generic_socket_factory TSRMLS_CC) == SUCCESS
--
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/tests variants.phpt /ext/session/tests skipif.inc /ext/sqlite/tests blankdb.inc blankdb_oo.inc sqlite_001.phpt sqlite_015.phpt sqlite_017.phpt sqlite_oo_020.phpt /ext/standard/tests/strings bug24098.phpt nl2br.phpt
wez Fri Dec 5 08:42:05 2003 EDT
Modified files:
/php-src/ext/com_dotnet/tests variants.phpt
/php-src/ext/session/tests skipif.inc
/php-src/ext/sqlite/tests blankdb.inc blankdb_oo.inc
sqlite_001.phpt sqlite_015.phpt
sqlite_017.phpt sqlite_oo_020.phpt
/php-src/ext/standard/tests/strings bug24098.phpt nl2br.phpt
Log:
Make these tests work under win32
Index: php-src/ext/com_dotnet/tests/variants.phpt
diff -u php-src/ext/com_dotnet/tests/variants.phpt:1.1
php-src/ext/com_dotnet/tests/variants.phpt:1.2
--- php-src/ext/com_dotnet/tests/variants.phpt:1.1 Thu Aug 14 12:49:56 2003
+++ php-src/ext/com_dotnet/tests/variants.phpt Fri Dec 5 08:42:02 2003
@@ -2,9 +2,9 @@
COM: General variant tests
--SKIPIF--
?php # vim:ft=php
-if (!extension_loaded(com_dotnet)) print skip; ?
+if (!extension_loaded(com_dotnet)) print skip COM/.Net support not present; ?
--FILE--
-?php // $Id: variants.phpt,v 1.1 2003/08/14 16:49:56 wez Exp $
+?php // $Id: variants.phpt,v 1.2 2003/12/05 13:42:02 wez Exp $
error_reporting(E_ALL);
$v = new VARIANT();
@@ -30,8 +30,6 @@
}
}
}
-$a = new VARIANT('10.0', VT_DECIMAL);
-var_dump($a);
echo OK!;
?
Index: php-src/ext/session/tests/skipif.inc
diff -u php-src/ext/session/tests/skipif.inc:1.2
php-src/ext/session/tests/skipif.inc:1.3
--- php-src/ext/session/tests/skipif.inc:1.2Thu Oct 3 11:11:01 2002
+++ php-src/ext/session/tests/skipif.incFri Dec 5 08:42:03 2003
@@ -5,6 +5,9 @@
@dl(session$dlext);
}
if (!extension_loaded(session)) {
-die(skip\n);
+die(skip Session module not loaded);
+}
+if (!file_exists(ini_get(session.save_path))) {
+ die(skip Session save_path doesn't exist);
}
?
Index: php-src/ext/sqlite/tests/blankdb.inc
diff -u php-src/ext/sqlite/tests/blankdb.inc:1.2
php-src/ext/sqlite/tests/blankdb.inc:1.3
--- php-src/ext/sqlite/tests/blankdb.inc:1.2Fri Apr 18 16:53:18 2003
+++ php-src/ext/sqlite/tests/blankdb.incFri Dec 5 08:42:03 2003
@@ -1,8 +1,9 @@
?php #vim:ft=php
$dbname = tempnam(dirname(__FILE__), phpsql);
function cleanup() {
- if ($GLOBALS['db']) {
- sqlite_close($GLOBALS['db']);
+ if (is_resource($GLOBALS['db'])) {
+ @sqlite_close($GLOBALS['db']);
+ usleep(50);
}
unlink($GLOBALS['dbname']);
}
Index: php-src/ext/sqlite/tests/blankdb_oo.inc
diff -u php-src/ext/sqlite/tests/blankdb_oo.inc:1.2
php-src/ext/sqlite/tests/blankdb_oo.inc:1.3
--- php-src/ext/sqlite/tests/blankdb_oo.inc:1.2 Sun Jun 22 15:01:47 2003
+++ php-src/ext/sqlite/tests/blankdb_oo.inc Fri Dec 5 08:42:03 2003
@@ -2,9 +2,9 @@
$dbname = tempnam(dirname(__FILE__), phpsql);
function cleanup() {
global $db, $dbname;
-
$db = NULL;
- unlink($dbname);
+ usleep(50);
+ @unlink($dbname);
}
register_shutdown_function(cleanup);
$db = new sqlite_db($dbname);
Index: php-src/ext/sqlite/tests/sqlite_001.phpt
diff -u php-src/ext/sqlite/tests/sqlite_001.phpt:1.3
php-src/ext/sqlite/tests/sqlite_001.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_001.phpt:1.3Thu May 1 09:29:11 2003
+++ php-src/ext/sqlite/tests/sqlite_001.phptFri Dec 5 08:42:03 2003
@@ -9,7 +9,6 @@
require_once('blankdb.inc');
echo $db\n;
sqlite_close($db);
-$db = NULL;
echo Done\n;
?
--EXPECTF--
Index: php-src/ext/sqlite/tests/sqlite_015.phpt
diff -u php-src/ext/sqlite/tests/sqlite_015.phpt:1.2
php-src/ext/sqlite/tests/sqlite_015.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_015.phpt:1.2Thu Dec 4 21:12:21 2003
+++ php-src/ext/sqlite/tests/sqlite_015.phptFri Dec 5 08:42:03 2003
@@ -24,7 +24,7 @@
$res = sqlite_array_query(SELECT a from strings, $db, SQLITE_NUM);
var_dump($res);
-sqlite_close($db);
+$db = null;
echo DONE!\n;
?
Index: php-src/ext/sqlite/tests/sqlite_017.phpt
diff -u php-src/ext/sqlite/tests/sqlite_017.phpt:1.2
php-src/ext/sqlite/tests/sqlite_017.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_017.phpt:1.2Thu Dec 4 21:12:21 2003
+++ php-src/ext/sqlite/tests/sqlite_017.phptFri Dec 5 08:42:03 2003
@@ -22,8 +22,6 @@
}
}
-sqlite_close($db);
-
echo OK!\n;
?
Index: php-src/ext/sqlite/tests/sqlite_oo_020.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.3 Thu Sep 4 10:54:53 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_020.phpt Fri Dec 5 08:42:03 2003
@@ -41,11 +41,13 @@
var_dump($r-current(SQLITE_NUM));
$r-next();
}
+$r = null;
+$db = null;
echo DONE!\n;
?
--EXPECTF--
Message: sqlite_factory() expects at least 1 parameter, 0 given
-File: %s/sqlite_oo_020.php
+File: %ssqlite_oo_020.php
array(2) {
[0]=
string(3) one
Index: php-src/ext/standard/tests/strings/bug24098.phpt
diff -u
[PHP-CVS] cvs: php-src / run-tests.php /ext/standard proc_open.c
wez Fri Dec 5 08:45:01 2003 EDT
Modified files:
/php-src/ext/standard proc_open.c
/php-srcrun-tests.php
Log:
Add optional array argument to proc_open() to specify additional
options for the child process.
The first option is suppress_errors which will disable any
dialog boxes that arise from missing DLL's and suppress the
GPF dialog.
Use this new feature in the test suite, so that crashing tests don't block the test
run; useful for un-attended execution.
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.16 php-src/ext/standard/proc_open.c:1.17
--- php-src/ext/standard/proc_open.c:1.16 Thu Aug 28 12:49:57 2003
+++ php-src/ext/standard/proc_open.cFri Dec 5 08:45:00 2003
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.16 2003/08/28 16:49:57 sas Exp $ */
+/* $Id: proc_open.c,v 1.17 2003/12/05 13:45:00 wez Exp $ */
#include stdio.h
#include php.h
@@ -444,16 +444,16 @@
};
/* }}} */
-/* {{{ proto resource proc_open(string command, array descriptorspec, array pipes [,
string cwd [, array env]])
+/* {{{ proto resource proc_open(string command, array descriptorspec, array pipes [,
string cwd [, array env] [, array other_options]])
Run a process with more control over it's file descriptors */
PHP_FUNCTION(proc_open)
{
-
char *command, *cwd=NULL;
long command_len, cwd_len;
zval *descriptorspec;
zval *pipes;
zval *environment = NULL;
+ zval *other_options = NULL;
php_process_env_t env;
int ndesc = 0;
int i;
@@ -466,13 +466,16 @@
BOOL newprocok;
SECURITY_ATTRIBUTES security;
char *command_with_cmd;
+ UINT old_error_mode;
+ int suppress_errors = 0;
#endif
php_process_id_t child;
struct php_process_handle *proc;
int is_persistent = 0; /* TODO: ensure that persistent procs will work */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, saz|s!a!, command,
- command_len, descriptorspec, pipes, cwd, cwd_len,
environment) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, saz|s!a!a!, command,
+ command_len, descriptorspec, pipes, cwd, cwd_len,
environment,
+ other_options) == FAILURE) {
RETURN_FALSE;
}
@@ -480,6 +483,15 @@
RETURN_FALSE;
}
+ if (other_options) {
+ zval **item;
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(other_options),
suppress_errors, sizeof(suppress_errors), (void**)item)) {
+ if (Z_TYPE_PP(item) == IS_BOOL Z_BVAL_PP(item)) {
+ suppress_errors = 1;
+ }
+ }
+ }
+
command_len = strlen(command);
if (environment) {
@@ -669,7 +681,17 @@
command_with_cmd = emalloc(command_len + sizeof(COMSPEC_9X) + 1 + sizeof( /c
));
sprintf(command_with_cmd, %s /c %s, GetVersion() 0x8000 ? COMSPEC_NT :
COMSPEC_9X, command);
+
+ if (suppress_errors) {
+ old_error_mode =
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
+ }
+
newprocok = CreateProcess(NULL, command_with_cmd, security, security, TRUE,
NORMAL_PRIORITY_CLASS, env.envp, cwd, si, pi);
+
+ if (suppress_errors) {
+ SetErrorMode(old_error_mode);
+ }
+
efree(command_with_cmd);
if (FALSE == newprocok) {
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.180 php-src/run-tests.php:1.181
--- php-src/run-tests.php:1.180 Sun Nov 30 08:57:15 2003
+++ php-src/run-tests.php Fri Dec 5 08:45:00 2003
@@ -117,6 +117,7 @@
putenv(TEST_PHP_EXECUTABLE=$php);
}
}
+
if (empty($php) || !file_exists($php)) {
error(environment variable TEST_PHP_EXECUTABLE must be set to specify PHP
executable!);
}
@@ -588,7 +589,7 @@
0 = array('pipe', 'r'),
1 = array('pipe', 'w'),
2 = array('pipe', 'w')
- ), $pipes);
+ ), $pipes, null, null, array(suppress_errors = true));
if (!$proc)
return false;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
wez Fri Dec 5 08:48:40 2003 EDT Modified files: /php-src/ext/standard proc_open.c Log: fix unix build Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.17 php-src/ext/standard/proc_open.c:1.18 --- php-src/ext/standard/proc_open.c:1.17 Fri Dec 5 08:45:00 2003 +++ php-src/ext/standard/proc_open.cFri Dec 5 08:48:40 2003 @@ -15,7 +15,7 @@ | Author: Wez Furlong [EMAIL PROTECTED] | +--+ */ -/* $Id: proc_open.c,v 1.17 2003/12/05 13:45:00 wez Exp $ */ +/* $Id: proc_open.c,v 1.18 2003/12/05 13:48:40 wez Exp $ */ #include stdio.h #include php.h @@ -467,11 +467,11 @@ SECURITY_ATTRIBUTES security; char *command_with_cmd; UINT old_error_mode; - int suppress_errors = 0; #endif php_process_id_t child; struct php_process_handle *proc; int is_persistent = 0; /* TODO: ensure that persistent procs will work */ + int suppress_errors = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, saz|s!a!a!, command, command_len, descriptorspec, pipes, cwd, cwd_len, environment, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests dom_test.inc
chregu Fri Dec 5 09:52:52 2003 EDT
Modified files:
/php-src/ext/dom/tests dom_test.inc
Log:
fix test
Index: php-src/ext/dom/tests/dom_test.inc
diff -u php-src/ext/dom/tests/dom_test.inc:1.2 php-src/ext/dom/tests/dom_test.inc:1.3
--- php-src/ext/dom/tests/dom_test.inc:1.2 Sat Nov 29 15:40:18 2003
+++ php-src/ext/dom/tests/dom_test.inc Fri Dec 5 09:52:51 2003
@@ -24,7 +24,11 @@
{
print Node Name: . $node-nodeName;
print \nNode Type: . $node-nodeType;
- $child_count = $node-childNodes-length;
+ if ($node-nodeType != 3) {
+ $child_count = $node-childNodes-length;
+ } else {
+ $child_count = 0;
+ }
print \nNum Children: . $child_count;
if($child_count = 1){
print \nNode Content: . $node-nodeValue;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4 /ext/mbstring/libmbfl/mbfl mbfl_allocators.c mbfl_encoding.c mbfl_language.c
On December 4, 2003 05:49 pm, Moriyoshi Koizumi wrote: moriyoshi Thu Dec 4 17:49:47 2003 EDT Modified files: /php-src/ext/mbstring config.m4 /php-src/ext/mbstring/libmbfl/mbflmbfl_allocators.c mbfl_encoding.c mbfl_language.c Log: It'd be a bad idea to make subpackages dependent on the php build system. Mbstring extension now gives the following error during build: In file included from /home/rei/php5/ext/mbstring/oniguruma/regerror.c:15: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/include/varargs.h:4:2: #error GCC no longer implements varargs.h. /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/include/varargs.h:5:2: #error Revise your code to use stdarg.h. /home/rei/php5/ext/mbstring/oniguruma/regerror.c:149: error: parse error before code /home/rei/php5/ext/mbstring/oniguruma/regerror.c: In function `php_mb_regex_error_code_to_str': /home/rei/php5/ext/mbstring/oniguruma/regerror.c:151: error: parse error before va_dcl /home/rei/php5/ext/mbstring/oniguruma/regerror.c:157: error: parse error before va_list -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4 /ext/mbstring/libmbfl/mbfl mbfl_allocators.c mbfl_encoding.c mbfl_language.c
On 2003/12/06, at 0:53, Ilia Alshanetsky wrote: Mbstring extension now gives the following error during build: In file included from /home/rei/php5/ext/mbstring/oniguruma/regerror.c:15: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/include/varargs.h:4:2: #error GCC no longer implements varargs.h. /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/include/varargs.h:5:2: #error Revise your code to use stdarg.h. /home/rei/php5/ext/mbstring/oniguruma/regerror.c:149: error: parse error before code /home/rei/php5/ext/mbstring/oniguruma/regerror.c: In function `php_mb_regex_error_code_to_str': /home/rei/php5/ext/mbstring/oniguruma/regerror.c:151: error: parse error before va_dcl /home/rei/php5/ext/mbstring/oniguruma/regerror.c:157: error: parse error before va_list Did you run buildconf? Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring config.m4 /ext/mbstring/libmbfl/mbfl mbfl_allocators.c mbfl_encoding.c mbfl_language.c
On December 5, 2003 11:54 am, Moriyoshi Koizumi wrote: Did you run buildconf? Yup, infact the problem only appeared after I ran buildconf today. I didn't notice the problem before as I was using an old configure script. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.WIN32-BUILD-SYSTEM
wez Fri Dec 5 12:44:38 2003 EDT Modified files: /php-srcREADME.WIN32-BUILD-SYSTEM Log: rewrite Index: php-src/README.WIN32-BUILD-SYSTEM diff -u php-src/README.WIN32-BUILD-SYSTEM:1.1 php-src/README.WIN32-BUILD-SYSTEM:1.2 --- php-src/README.WIN32-BUILD-SYSTEM:1.1 Tue Dec 2 19:32:25 2003 +++ php-src/README.WIN32-BUILD-SYSTEM Fri Dec 5 12:44:37 2003 @@ -1,61 +1,158 @@ -I've committed the build infrastructure for the -real programmers don't need an IDE build system for win32. +The Win32 Build System. +$Id: README.WIN32-BUILD-SYSTEM,v 1.2 2003/12/05 17:44:37 wez Exp $ +Wez Furlong [EMAIL PROTECTED] + +NB: Please don't mail me asking for help on this, unless +you are a Core PHP developer, or you are prepared to donate +some money via paypal or buy me something from my wishlist. +http://pecl.php.net/user/wez +Thanks :-) + +=== +Contents: +1. How to build PHP under windows + a. Requirements + b. Opening a command prompt + c. Generating configure.js + d. Configuring + e. Building + f. Cleaning up + g. Running the test suite + +2. How to write config.w32 files + x. to be written. + +=== +1. How to build PHP under windows +a. Requirements + + You need: + - Windows Scripting Host (cscript.exe) + - Microsoft Build Tools from either: + Microsoft Visual Studio (VC6) or later + Microsoft Platform SDK + + You also need: + - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip] + - win32build [http://www.php.net/extra/win32build.zip] + + b. Opening the Build Environment Command Prompt: + - Using Visual Studio (VC6) +1. Install it +2. If you have a VC++ Command Prompt icon on your start menu, + click on it to get a Command Prompt with the env vars + set up correctly. + + If not, create a new shortcut and set the Target to: + + %comspec% /k C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat + + You might also want to set the prompt to start in + a convenient location (such as the root of your + PHP source checkout). + + - Using Visual Studio .Net +1. Install it. +2. Under the Visual Studio .Net Tools sub menu of your start + menu, you should have a Visual Studio .Net Command Prompt + icon. If not, create a new shortcut and set the Target to: + + %comspec% /k C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\Tools\vsvars32.bat + + You might also want to set the prompt to start in + a convenient location (such as the root of your + PHP source checkout). + + - Using the Platform SDK tools +1. Download the Platform SDK: + http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ + + - You need the Core SDK, which is approx 200MB to download + and requires approx 500MB of disk space. + - The other components of the SDK are not required by PHP + - You might be able to reduce the download size by downloading + the installer control component first and then selecting + only the Build Environment (around 30MB), but I haven't + tried this. + +2. Once installed, you will have an icon on your start menu + that will launch the build environment; the latest SDK's + install a number of different versions of this; you probably + want to choose the Windows 2000 Retail build environment. + Clicking on this will open a command prompt with its Path, + Include and Lib env vars set to point to the build tools + and win32 headers. + +c. Generating configure + + Change directory to where you have your PHP 5 sources. + Run buildconf.bat. + +d. Configuring + + cscript /nologo configure.js --help + + Will give you a list of configuration options; these will + have the form: + + --enable-foo or --disable-foo or --with-foo or --without-foo. + + --enable-foo will turn something on, and is equivalent to + specifying --enable-foo=yes + + --disable-foo will turn something off, and is equivalent to + specifying --enable-foo=no + + --enable-foo=shared will attempt to build that feature as + a shared, dynamically loadable module. + + Sometimes a configure option needs additional information + about where to find headers and libraries; quite often + you can specify --enable-foo=option where option could be + the path to where to find those files. If you want to + specify a parameter and build it as shared, you can use + this syntax instead: --enable-foo=shared,option + + The same rules all apply to --with-foo and --without-foo; + the only difference is the way the options are named; + the convention is that --enable-foo means that you are + switching on something that comes with PHP, whereas + --with-foo means that you want to build in something + external to PHP. + +e. Building + + Once you have successfully configured your build (make + sure you read the
[PHP-CVS] cvs: php-src /win32 EngineSelect.bat builddef.bat
wez Fri Dec 5 12:45:16 2003 EDT Modified files: /php-src/win32 builddef.bat EngineSelect.bat Log: convert to DOS line endings to solve win98 issues Index: php-src/win32/builddef.bat diff -u php-src/win32/builddef.bat:1.1 php-src/win32/builddef.bat:1.2 --- php-src/win32/builddef.bat:1.1 Fri Aug 22 17:45:58 2003 +++ php-src/win32/builddef.bat Fri Dec 5 12:45:15 2003 @@ -1,6 +1,6 @@ -rem Generate phpts.def file, which exports symbols from our dll that -rem are present in some of the libraries which are compiled statically -rem into PHP -rem $Id: builddef.bat,v 1.1 2003/08/22 21:45:58 wez Exp $ [EMAIL PROTECTED] off -type ..\ext\sqlite\php_sqlite.def +rem Generate phpts.def file, which exports symbols from our dll that +rem are present in some of the libraries which are compiled statically +rem into PHP +rem $Id: builddef.bat,v 1.2 2003/12/05 17:45:15 wez Exp $ [EMAIL PROTECTED] off +type ..\ext\sqlite\php_sqlite.def Index: php-src/win32/EngineSelect.bat diff -u php-src/win32/EngineSelect.bat:1.1 php-src/win32/EngineSelect.bat:1.2 --- php-src/win32/EngineSelect.bat:1.1 Thu Jun 26 15:19:44 2003 +++ php-src/win32/EngineSelect.bat Fri Dec 5 12:45:15 2003 @@ -1,5 +1,5 @@ [EMAIL PROTECTED] exist ..\ZendEngine2\OBJECTS2_HOWTO ( -move ..\Zend ..\ZendEngine1 -move ..\ZendEngine2 ..\Zend -echo PLEASE RESTART VISUAL C++ TO RELOAD THE ZEND PROJECT. -exit 1 ) [EMAIL PROTECTED] exist ..\ZendEngine2\OBJECTS2_HOWTO ( +move ..\Zend ..\ZendEngine1 +move ..\ZendEngine2 ..\Zend +echo PLEASE RESTART VISUAL C++ TO RELOAD THE ZEND PROJECT. +exit 1 ) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite php_sqlite.def
wez Fri Dec 5 12:46:05 2003 EDT Modified files: /php-src/ext/sqlite php_sqlite.def Log: dos line endings Index: php-src/ext/sqlite/php_sqlite.def diff -u php-src/ext/sqlite/php_sqlite.def:1.1 php-src/ext/sqlite/php_sqlite.def:1.2 --- php-src/ext/sqlite/php_sqlite.def:1.1 Thu Jun 12 19:22:33 2003 +++ php-src/ext/sqlite/php_sqlite.def Fri Dec 5 12:46:04 2003 @@ -1,37 +1,37 @@ -EXPORTS -sqlite_open -sqlite_close -sqlite_exec -sqlite_last_insert_rowid -sqlite_changes -sqlite_error_string -sqlite_interrupt -sqlite_complete -sqlite_busy_handler -sqlite_busy_timeout -sqlite_get_table -sqlite_free_table -sqlite_exec_printf -sqlite_exec_vprintf -sqlite_get_table_printf -sqlite_get_table_vprintf -sqlite_mprintf -sqlite_vmprintf -sqlite_freemem -sqlite_libversion -sqlite_libencoding -sqlite_create_function -sqlite_create_aggregate -sqlite_function_type -sqlite_set_result_string -sqlite_set_result_int -sqlite_set_result_double -sqlite_set_result_error -sqlite_user_data -sqlite_aggregate_context -sqlite_aggregate_count -sqlite_set_authorizer -sqlite_trace -sqlite_compile -sqlite_step -sqlite_finalize +EXPORTS +sqlite_open +sqlite_close +sqlite_exec +sqlite_last_insert_rowid +sqlite_changes +sqlite_error_string +sqlite_interrupt +sqlite_complete +sqlite_busy_handler +sqlite_busy_timeout +sqlite_get_table +sqlite_free_table +sqlite_exec_printf +sqlite_exec_vprintf +sqlite_get_table_printf +sqlite_get_table_vprintf +sqlite_mprintf +sqlite_vmprintf +sqlite_freemem +sqlite_libversion +sqlite_libencoding +sqlite_create_function +sqlite_create_aggregate +sqlite_function_type +sqlite_set_result_string +sqlite_set_result_int +sqlite_set_result_double +sqlite_set_result_error +sqlite_user_data +sqlite_aggregate_context +sqlite_aggregate_count +sqlite_set_authorizer +sqlite_trace +sqlite_compile +sqlite_step +sqlite_finalize -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv/tests iconv_stream_filter.phpt iconv_stream_filter.txt
moriyoshi Fri Dec 5 13:35:18 2003 EDT
Added files:
/php-src/ext/iconv/testsiconv_stream_filter.phpt
iconv_stream_filter.txt
Log:
Add regression test for iconv stream filters
Index: php-src/ext/iconv/tests/iconv_stream_filter.phpt
+++ php-src/ext/iconv/tests/iconv_stream_filter.phpt
--TEST--
iconv stream filter
--SKIPIF--
?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?
--INI--
iconv.internal_charset=iso-8859-1
--FILE--
?php
$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r');
var_dump(bin2hex(fread($fp, 10)));
var_dump(bin2hex(fread($fp, 5)));
var_dump(bin2hex(fread($fp, 1)));
fclose($fp);
$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r');
stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP');
var_dump(bin2hex(fread($fp, 10)));
var_dump(bin2hex(fread($fp, 5)));
var_dump(bin2hex(fread($fp, 1)));
fclose($fp);
$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r');
stream_filter_append($fp, 'string.rot13'); // this will make conversion fail.
stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP');
var_dump(bin2hex(fread($fp, 10)));
var_dump(bin2hex(fread($fp, 5)));
var_dump(bin2hex(fread($fp, 1)));
fclose($fp);
?
--EXPECTF--
string(20) 1b244224332473244b24
string(10) 41244f1b28
string(2) 42
string(20) a4b3a4f3a4cba4c1a4cf
string(10) 69636f6e76
string(2) 0a
Warning: fread(): iconv stream filter (ISO-2022-JP=EUC-JP): invalid multibyte
sequence in %s on line %d
string(0)
string(0)
string(0)
Index: php-src/ext/iconv/tests/iconv_stream_filter.txt
+++ php-src/ext/iconv/tests/iconv_stream_filter.txt
$B$3$s$K$A$O(Biconv
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv/tests iconv_stream_filter.phpt
moriyoshi Fri Dec 5 13:39:04 2003 EDT Modified files: /php-src/ext/iconv/testsiconv_stream_filter.phpt Log: A trivial implement for dos-like platforms Index: php-src/ext/iconv/tests/iconv_stream_filter.phpt diff -u php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.1 php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.2 --- php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.1Fri Dec 5 13:35:17 2003 +++ php-src/ext/iconv/tests/iconv_stream_filter.phptFri Dec 5 13:39:04 2003 @@ -6,20 +6,20 @@ iconv.internal_charset=iso-8859-1 --FILE-- ?php -$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r'); +$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); var_dump(bin2hex(fread($fp, 10))); var_dump(bin2hex(fread($fp, 5))); var_dump(bin2hex(fread($fp, 1))); fclose($fp); -$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r'); +$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); var_dump(bin2hex(fread($fp, 10))); var_dump(bin2hex(fread($fp, 5))); var_dump(bin2hex(fread($fp, 1))); fclose($fp); -$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'r'); +$fp = fopen(dirname(__FILE__).'/iconv_stream_filter.txt', 'rb'); stream_filter_append($fp, 'string.rot13'); // this will make conversion fail. stream_filter_append($fp, 'convert.iconv.ISO-2022-JP/EUC-JP'); var_dump(bin2hex(fread($fp, 10))); -- 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/domxml php_domxml.c
rrichards Fri Dec 5 14:21:07 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
Log:
Fix bug #26531: get_elements_by_tag_name() wildcard fails
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.42
php-src/ext/domxml/php_domxml.c:1.218.2.43
--- php-src/ext/domxml/php_domxml.c:1.218.2.42 Wed Dec 3 07:30:02 2003
+++ php-src/ext/domxml/php_domxml.c Fri Dec 5 14:21:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.218.2.42 2003/12/03 12:30:02 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.43 2003/12/05 19:21:05 rrichards Exp $ */
/* TODO
* - Support Notation Nodes
@@ -708,9 +708,9 @@
Namespace support
*/
if ( n != NULL name != NULL ) {
- cld = n-children;
+ cld = n;
while ( cld != NULL ) {
- if ( xmlStrcmp( name, cld-name ) == 0 ){
+ if (cld-type == XML_ELEMENT_NODE (xmlStrEqual(name, *)
|| xmlStrcmp(name, cld-name) == 0)){
if ( rv == NULL ) {
rv = xmlXPathNodeSetCreate( cld ) ;
}
@@ -718,7 +718,7 @@
xmlXPathNodeSetAdd( rv, cld );
}
}
- rv = php_get_elements_by_tagname(cld, name, rv);
+ rv = php_get_elements_by_tagname(cld-children, name, rv);
cld = cld-next;
}
}
@@ -3056,88 +3056,43 @@
PHP_FUNCTION(domxml_doc_get_elements_by_tagname)
{
zval *id, *rv, *contextnode = NULL,*ctxpin = NULL;
- xmlXPathContextPtr ctxp;
xmlDocPtr docp;
+ xmlNode *contextnodep = NULL, *nodep = NULL;
+ int name_len,i;
+ char *name;
+ xmlNodeSet *nodesetp = NULL;
- xmlXPathObjectPtr xpathobjp;
- xmlNode *contextnodep;
- int name_len;
- int free_context = 0;
- char *str,*name;
-
- contextnode = NULL;
- contextnodep = NULL;
-
- DOMXML_PARAM_FOUR(docp, id, le_domxmldocp, s|oo, name,
name_len,ctxpin,contextnodep);
-
- /* if no xpath_context was submitted, create a new one */
- if (ctxpin == NULL) {
- ctxp = xmlXPathNewContext(docp);
- free_context = 1;
- } else {
- DOMXML_GET_OBJ(ctxp, ctxpin, le_xpathctxp);
- }
+ DOMXML_PARAM_FOUR(docp, id, le_domxmldocp, s|oo, name,
name_len,ctxpin,contextnode);
if (contextnode) {
DOMXML_GET_OBJ(contextnodep, contextnode, le_domxmlnodep);
+ if (contextnodep-type == XML_ELEMENT_NODE) {
+ nodep = contextnodep-children;
+ }
+ } else {
+ nodep = xmlDocGetRootElement(docp);
}
- ctxp-node = contextnodep;
- str = (char*) emalloc((name_len+23) * sizeof(char)) ;
- if (str == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot allocate memory
for string);
- }
- sprintf(str ,//*[local-name() = '%s'], name);
- xpathobjp = xmlXPathEval(str, ctxp);
- efree(str);
- ctxp-node = NULL;
- if (!xpathobjp) {
- RETURN_FALSE;
- }
MAKE_STD_ZVAL(rv);
- if(array_init(rv) != SUCCESS)
- {
+ if(array_init(rv) != SUCCESS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot create required
array);
RETURN_FALSE;
}
- switch (Z_TYPE_P(xpathobjp)) {
-
- case XPATH_NODESET:
- {
- int i;
- xmlNodeSetPtr nodesetp;
-
- if (NULL == (nodesetp = xpathobjp-nodesetval)) {
- zval_dtor(rv);
- xmlXPathFreeObject (xpathobjp);
- if (free_context) {
- xmlXPathFreeContext(ctxp);
- }
- RETURN_FALSE;
- }
-
- for (i = 0; i nodesetp-nodeNr; i++) {
- xmlNodePtr node = nodesetp-nodeTab[i];
- zval *child;
- int retnode;
+ nodesetp = php_get_elements_by_tagname(nodep, name, NULL);
- /* construct a node object */
- child = php_domobject_new(node, retnode, NULL
TSRMLS_CC);
- zend_hash_next_index_insert(Z_ARRVAL_P(rv), child,
sizeof(zval *), NULL);
- }
+ if(nodesetp) {
+ for (i = 0; i nodesetp-nodeNr; i++) {
+ xmlNodePtr node =
[PHP-CVS] cvs: php-src /ext/libxml php_libxml2.def
rrichards Fri Dec 5 14:26:06 2003 EDT Added files: /php-src/ext/libxml php_libxml2.def Log: libxml2 and iconv export file Index: php-src/ext/libxml/php_libxml2.def +++ php-src/ext/libxml/php_libxml2.def EXPORTS __docbDefaultSAXHandler __htmlDefaultSAXHandler __oldXMLWDcompatibility __xmlBufferAllocScheme __xmlDefaultBufferSize __xmlDefaultSAXHandler __xmlDefaultSAXLocator __xmlDeregisterNodeDefaultValue __xmlDoValidityCheckingDefaultValue xmlFree DATA __xmlGenericError __xmlGenericErrorContext __xmlGetWarningsDefaultValue __xmlIndentTreeOutput __xmlKeepBlanksDefaultValue __xmlLineNumbersDefaultValue __xmlLoadExtDtdDefaultValue xmlMalloc DATA xmlMallocAtomic DATA xmlMemStrdup DATA __xmlParserDebugEntities __xmlParserVersion __xmlPedanticParserDefaultValue xmlRealloc DATA __xmlRegisterNodeDefaultValue __xmlSaveNoEmptyTags xmlStringComment DATA xmlStringText DATA xmlStringTextNoenc DATA __xmlSubstituteEntitiesDefaultValue __xmlTreeIndentString xmlXPathNAN DATA xmlXPathNINF DATA xmlXPathPINF DATA UTF8ToHtml UTF8Toisolat1 attribute attributeDecl cdataBlock characters checkNamespace comment docbCreateFileParserCtxt docbCreatePushParserCtxt docbDefaultSAXHandlerInit docbEncodeEntities docbFreeParserCtxt docbParseChunk docbParseDoc docbParseDocument docbParseFile docbSAXParseDoc docbSAXParseFile elementDecl endDocument endElement entityDecl externalSubset getColumnNumber getEntity getLineNumber getNamespace getParameterEntity getPublicId getSystemId globalNamespace hasExternalSubset hasInternalSubset htmlAttrAllowed htmlAutoCloseTag htmlCreateFileParserCtxt htmlCreateMemoryParserCtxt htmlCreatePushParserCtxt htmlDefaultSAXHandlerInit htmlDocContentDumpFormatOutput htmlDocContentDumpOutput htmlDocDump htmlDocDumpMemory htmlElementAllowedHere htmlElementStatusHere htmlEncodeEntities htmlEntityLookup htmlEntityValueLookup htmlFreeParserCtxt htmlGetMetaEncoding htmlHandleOmittedElem htmlInitAutoClose htmlIsAutoClosed htmlIsBooleanAttr htmlIsScriptAttribute htmlNewDoc htmlNewDocNoDtD htmlNodeDump htmlNodeDumpFile htmlNodeDumpFileFormat htmlNodeDumpFormatOutput htmlNodeDumpOutput htmlNodeStatus htmlParseCharRef htmlParseChunk htmlParseDoc htmlParseDocument htmlParseElement htmlParseEntityRef htmlParseFile htmlSAXParseDoc htmlSAXParseFile htmlSaveFile htmlSaveFileEnc htmlSaveFileFormat htmlSetMetaEncoding htmlTagLookup ignorableWhitespace initGenericErrorDefaultFunc initdocbDefaultSAXHandler inithtmlDefaultSAXHandler initxmlDefaultSAXHandler inputPop inputPush internalSubset isStandalone isolat1ToUTF8 namePop namePush namespaceDecl nodePop nodePush notationDecl processingInstruction reference resolveEntity setDocumentLocator setNamespace startDocument startElement unparsedEntityDecl valuePop valuePush xmlACatalogAdd xmlACatalogDump xmlACatalogRemove xmlACatalogResolve xmlACatalogResolvePublic xmlACatalogResolveSystem xmlACatalogResolveURI xmlAddAttributeDecl xmlAddChild xmlAddChildList xmlAddDocEntity xmlAddDtdEntity xmlAddElementDecl xmlAddEncodingAlias xmlAddID xmlAddNextSibling xmlAddNotationDecl xmlAddPrevSibling xmlAddRef xmlAddSibling xmlAllocOutputBuffer xmlAllocParserInputBuffer xmlAutomataCompile xmlAutomataGetInitState xmlAutomataIsDeterminist xmlAutomataNewAllTrans xmlAutomataNewCountTrans xmlAutomataNewCountedTrans xmlAutomataNewCounter xmlAutomataNewCounterTrans xmlAutomataNewEpsilon xmlAutomataNewOnceTrans xmlAutomataNewState xmlAutomataNewTransition xmlAutomataNewTransition2 xmlAutomataSetFinalState xmlBoolToText xmlBufferAdd xmlBufferAddHead xmlBufferCCat xmlBufferCat xmlBufferContent xmlBufferCreate xmlBufferCreateSize xmlBufferDump xmlBufferEmpty xmlBufferFree xmlBufferGrow xmlBufferLength xmlBufferResize xmlBufferSetAllocationScheme xmlBufferShrink xmlBufferWriteCHAR xmlBufferWriteChar xmlBufferWriteQuotedString xmlBuildQName xmlBuildURI xmlC14NDocDumpMemory xmlC14NDocSave xmlC14NDocSaveTo xmlC14NExecute xmlCanonicPath xmlCatalogAdd xmlCatalogAddLocal xmlCatalogCleanup xmlCatalogConvert xmlCatalogDump xmlCatalogFreeLocal xmlCatalogGetDefaults xmlCatalogGetPublic xmlCatalogGetSystem xmlCatalogIsEmpty xmlCatalogLocalResolve xmlCatalogLocalResolveURI xmlCatalogRemove xmlCatalogResolve xmlCatalogResolvePublic xmlCatalogResolveSystem xmlCatalogResolveURI xmlCatalogSetDebug xmlCatalogSetDefaultPrefer xmlCatalogSetDefaults xmlCharEncCloseFunc xmlCharEncFirstLine xmlCharEncInFunc xmlCharEncOutFunc xmlCharStrdup xmlCharStrndup xmlCheckFilename xmlCheckLanguageID xmlCheckUTF8 xmlCheckVersion xmlCleanupCharEncodingHandlers xmlCleanupEncodingAliases xmlCleanupGlobals xmlCleanupInputCallbacks xmlCleanupOutputCallbacks xmlCleanupParser xmlCleanupPredefinedEntities xmlCleanupThreads xmlClearNodeInfoSeq xmlClearParserCtxt xmlConvertSGMLCatalog xmlCopyAttributeTable xmlCopyChar xmlCopyCharMultiByte xmlCopyDoc xmlCopyDtd xmlCopyElementContent xmlCopyElementTable xmlCopyEntitiesTable xmlCopyEnumeration xmlCopyNamespace xmlCopyNamespaceList xmlCopyNode xmlCopyNodeList
[PHP-CVS] cvs: php-src /ext/dom config.w32 /ext/libxml config.w32 /ext/simplexml config.w32 /ext/xml config.w32 /ext/xsl config.w32
wez Fri Dec 5 16:16:48 2003 EDT
Modified files:
/php-src/ext/domconfig.w32
/php-src/ext/libxml config.w32
/php-src/ext/simplexml config.w32
/php-src/ext/xmlconfig.w32
/php-src/ext/xslconfig.w32
Log:
Tweak xml related build.
Still some warnings for ext/xsl, but I'll leave that to someone else for now.
Index: php-src/ext/dom/config.w32
diff -u php-src/ext/dom/config.w32:1.1 php-src/ext/dom/config.w32:1.2
--- php-src/ext/dom/config.w32:1.1 Tue Dec 2 18:16:52 2003
+++ php-src/ext/dom/config.w32 Fri Dec 5 16:16:44 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:52 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:44 wez Exp $
// vim:ft=javascript
ARG_WITH(dom, DOM support, yes);
@@ -13,6 +13,9 @@
notation.c xpath.c dom_iterators.c typeinfo.c domerror.c \
domlocator.c namednodemap.c userdatahandler.c);
AC_DEFINE(HAVE_DOM, 1, DOM support);
+ if (!PHP_DOM_SHARED) {
+ ADD_FLAG(CFLAGS_DOM, /D LIBXML_STATIC );
+ }
}
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.5 php-src/ext/libxml/config.w32:1.6
--- php-src/ext/libxml/config.w32:1.5 Fri Dec 5 15:17:46 2003
+++ php-src/ext/libxml/config.w32 Fri Dec 5 16:16:45 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2003/12/05 20:17:46 wez Exp $
+// $Id: config.w32,v 1.6 2003/12/05 21:16:45 wez Exp $
// vim:ft=javascript
ARG_WITH(libxml, LibXML support, yes);
@@ -10,7 +10,8 @@
EXTENSION(libxml, libxml.c, false /* never shared */);
AC_DEFINE(HAVE_LIBXML, 1, LibXML support);
- ADD_FLAG(CFLAGS, /D LIBXML_THREAD_ENABLED /D LIBXML_STATIC );
+ ADD_FLAG(CFLAGS, /D LIBXML_THREAD_ENABLED);
+ ADD_FLAG(CFLAGS_LIBXML, /D LIBXML_STATIC );
if (!PHP_LIBXML_SHARED) {
ADD_DEF_FILE(ext\\libxml\\php_libxml2.def);
}
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.1 php-src/ext/simplexml/config.w32:1.2
--- php-src/ext/simplexml/config.w32:1.1Tue Dec 2 18:16:57 2003
+++ php-src/ext/simplexml/config.w32Fri Dec 5 16:16:46 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:57 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
@@ -6,6 +6,9 @@
if (PHP_SIMPLEXML == yes PHP_LIBXML == yes) {
EXTENSION(simplexml, simplexml.c);
AC_DEFINE(HAVE_SIMPLEXML, 1, Simple XML support);
+ if (!PHP_SIMPLEXML_SHARED) {
+ ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
+ }
}
Index: php-src/ext/xml/config.w32
diff -u php-src/ext/xml/config.w32:1.1 php-src/ext/xml/config.w32:1.2
--- php-src/ext/xml/config.w32:1.1 Tue Dec 2 18:17:00 2003
+++ php-src/ext/xml/config.w32 Fri Dec 5 16:16:46 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:17:00 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
// vim:ft=javascript
ARG_WITH(xml, XML support, yes);
@@ -6,6 +6,9 @@
if (PHP_XML == yes PHP_LIBXML == yes) {
EXTENSION(xml, xml.c compat.c);
AC_DEFINE(HAVE_XML, 1, XML support);
+ if (!PHP_XML_SHARED) {
+ ADD_FLAG(CFLAGS_XML, /D LIBXML_STATIC );
+ }
}
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.4 php-src/ext/xsl/config.w32:1.5
--- php-src/ext/xsl/config.w32:1.4 Fri Dec 5 15:17:47 2003
+++ php-src/ext/xsl/config.w32 Fri Dec 5 16:16:47 2003
@@ -1,17 +1,25 @@
-// $Id: config.w32,v 1.4 2003/12/05 20:17:47 wez Exp $
+// $Id: config.w32,v 1.5 2003/12/05 21:16:47 wez Exp $
// vim: ft=javascript
ARG_WITH(xsl, xsl support, no);
if (PHP_XSL != no) {
if (PHP_DOM == yes PHP_LIBXML == yes) {
- if (CHECK_LIB(libxslt_a.lib;libxslt.lib, xsl, PHP_XSL)
- CHECK_HEADER_ADD_INCLUDE(libxslt\\xslt.h,
CFLAGS_XSL)) {
+ var ext_xsl_lib_found = false;
+
+ if (CHECK_LIB(libxslt_a.lib, xsl, PHP_XSL)) {
+ ADD_FLAG(CFLAGS_XSL, /D LIBXSL_STATIC );
+ ext_xsl_lib_found = true;
+ } else if (CHECK_LIB(libxslt.lib, xsl, PHP_XSL)) {
+ ext_xsl_lib_found = true;
+ }
+
+ if (ext_xsl_lib_found 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 );
+ ADD_FLAG(CFLAGS_XSL, /D DOM_EXPORTS /D
LIBXML_STATIC);
}
} else {
WARNING(xsl not enabled;
[PHP-CVS] cvs: php-src /ext/xsl config.w32
rrichards Fri Dec 5 16:24:49 2003 EDT
Modified files:
/php-src/ext/xslconfig.w32
Log:
Fix the xsl warnings
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.5 php-src/ext/xsl/config.w32:1.6
--- php-src/ext/xsl/config.w32:1.5 Fri Dec 5 16:16:47 2003
+++ php-src/ext/xsl/config.w32 Fri Dec 5 16:24:48 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2003/12/05 21:16:47 wez Exp $
+// $Id: config.w32,v 1.6 2003/12/05 21:24:48 rrichards Exp $
// vim: ft=javascript
ARG_WITH(xsl, xsl support, no);
@@ -8,7 +8,7 @@
var ext_xsl_lib_found = false;
if (CHECK_LIB(libxslt_a.lib, xsl, PHP_XSL)) {
- ADD_FLAG(CFLAGS_XSL, /D LIBXSL_STATIC );
+ ADD_FLAG(CFLAGS_XSL, /D LIBXSLT_STATIC );
ext_xsl_lib_found = true;
} else if (CHECK_LIB(libxslt.lib, xsl, PHP_XSL)) {
ext_xsl_lib_found = true;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl config.w32
wez Fri Dec 5 18:13:28 2003 EDT
Added files:
/php-src/ext/opensslconfig.w32
Log:
openssl support for the new build
Index: php-src/ext/openssl/config.w32
+++ php-src/ext/openssl/config.w32
// $Id: config.w32,v 1.1 2003/12/05 23:13:27 wez Exp $
// vim:ft=javascript
ARG_WITH(openssl, OpenSSL support, no);
if (PHP_OPENSSL != no) {
if (CHECK_LIB(ssleay32.lib, openssl, PHP_OPENSSL)
CHECK_LIB(libeay32.lib, openssl, PHP_OPENSSL)
CHECK_HEADER_ADD_INCLUDE(openssl/ssl.h, CFLAGS_OPENSSL)) {
EXTENSION(openssl, openssl.c xp_ssl.c);
AC_DEFINE(HAVE_OPENSSL_EXT, PHP_OPENSSL_SHARED ? 0 : 1, Have
openssl);
AC_DEFINE(HAVE_OPENSSL, 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build template.rc
wez Fri Dec 5 18:14:00 2003 EDT Modified files: /php-src/win32/buildtemplate.rc Log: 2003, not 2002. Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.3 php-src/win32/build/template.rc:1.4 --- php-src/win32/build/template.rc:1.3 Thu Dec 4 08:38:47 2003 +++ php-src/win32/build/template.rc Fri Dec 5 18:13:57 2003 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.3 2003/12/04 13:38:47 wez Exp $ + * $Id: template.rc,v 1.4 2003/12/05 23:13:57 wez Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC @@ -47,7 +47,7 @@ VALUE FileDescription, FILE_DESCRIPTION \0 VALUE FileVersion, STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_RELEASE_VERSION) VALUE InternalName, FILE_NAME \0 -VALUE LegalCopyright, Copyright © 2002 The PHP Group\0 +VALUE LegalCopyright, Copyright © 2003 The PHP Group\0 VALUE LegalTrademarks, PHP\0 VALUE OriginalFilename, FILE_NAME \0 VALUE PrivateBuild, \0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ftp ftp.c /ext/sockets sockets.c /ext/standard info.c /main network.c php_network.h /win32/build config.w32 confutils.js
wez Fri Dec 5 19:00:32 2003 EDT
Modified files:
/php-src/ext/ftpftp.c
/php-src/ext/socketssockets.c
/php-src/ext/standard info.c
/php-src/main network.c php_network.h
/php-src/win32/buildconfig.w32 confutils.js
Log:
Detect and enable IPv6 support under win32.
The ws2tcpip.h header links to IPv6 functions dynamically
and the generated binary will run on win98 and later.
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.93 php-src/ext/ftp/ftp.c:1.94
--- php-src/ext/ftp/ftp.c:1.93 Thu Sep 18 13:51:55 2003
+++ php-src/ext/ftp/ftp.c Fri Dec 5 19:00:28 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.93 2003/09/18 17:51:55 pollita Exp $ */
+/* $Id: ftp.c,v 1.94 2003/12/06 00:00:28 wez Exp $ */
#include php.h
@@ -714,7 +714,7 @@
memset(ftp-pasvaddr, 0, n);
sa = (struct sockaddr *) ftp-pasvaddr;
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
if (getpeername(ftp-fd, sa, n) 0) {
return 0;
}
@@ -1454,7 +1454,7 @@
data-listener = fd;
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
if (sa-sa_family == AF_INET6) {
/* need to use EPRT */
char eprtarg[INET6_ADDRSTRLEN + sizeof(|x||x|)];
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.155 php-src/ext/sockets/sockets.c:1.156
--- php-src/ext/sockets/sockets.c:1.155 Fri Oct 24 14:44:40 2003
+++ php-src/ext/sockets/sockets.c Fri Dec 5 19:00:29 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.155 2003/10/24 18:44:40 helly Exp $ */
+/* $Id: sockets.c,v 1.156 2003/12/06 00:00:29 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -357,12 +357,12 @@
return (buf ? (char *) buf : );
}
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
/* Sets addr by hostname, or by ip in string form (AF_INET6) */
static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket
*php_sock TSRMLS_DC)
{
struct in6_addr tmp;
-#ifdef HAVE_GETADDRINFO
+#if HAVE_GETADDRINFO
struct addrinfo hints;
struct addrinfo *addrinfo = NULL;
#endif
@@ -370,7 +370,7 @@
if (inet_pton(AF_INET6, string, tmp)) {
memcpy((sin6-sin6_addr.s6_addr), (tmp.s6_addr), sizeof(struct
in6_addr));
} else {
-#ifdef HAVE_GETADDRINFO
+#if HAVE_GETADDRINFO
memset(hints, 0, sizeof(struct addrinfo));
hints.ai_family = PF_INET6;
@@ -450,7 +450,7 @@
REGISTER_LONG_CONSTANT(AF_UNIX, AF_UNIX,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(AF_INET, AF_INET,
CONST_CS | CONST_PERSISTENT);
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
REGISTER_LONG_CONSTANT(AF_INET6, AF_INET6,
CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT(SOCK_STREAM, SOCK_STREAM,CONST_CS |
CONST_PERSISTENT);
@@ -871,7 +871,7 @@
php_socket *php_sock;
struct sockaddr *sa;
struct sockaddr_in *sin;
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
struct sockaddr_in6 *sin6;
charaddr6[INET6_ADDRSTRLEN+1];
#endif
@@ -892,7 +892,7 @@
}
switch (sa-sa_family) {
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, sin6-sin6_addr, addr6,
INET6_ADDRSTRLEN);
@@ -947,7 +947,7 @@
php_socket *php_sock;
struct sockaddr *sa;
struct sockaddr_in *sin;
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
struct sockaddr_in6 *sin6;
charaddr6[INET6_ADDRSTRLEN+1];
#endif
@@ -968,7 +968,7 @@
}
switch (sa-sa_family) {
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, sin6-sin6_addr, addr6,
INET6_ADDRSTRLEN);
@@ -1029,7 +1029,7 @@
}
if (arg1 != AF_UNIX
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
arg1 != AF_INET6
#endif
arg1 != AF_INET) {
@@ -1063,7 +1063,7 @@
zval*arg1;
php_socket *php_sock;
struct sockaddr_in sin;
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
struct sockaddr_in6 sin6;
#endif
struct sockaddr_un s_un;
@@ -1078,7 +1078,7 @@
ZEND_FETCH_RESOURCE(php_sock, php_socket *, arg1, -1, le_socket_name,
le_socket);
switch(php_sock-type) {
-#ifdef HAVE_IPV6
+#if HAVE_IPV6
[PHP-CVS] cvs: spl / config.w32 php_spl.h
wez Fri Dec 5 19:09:57 2003 EDT
Added files:
/splconfig.w32
Modified files:
/splphp_spl.h
Log:
make it build under win32
Index: spl/php_spl.h
diff -u spl/php_spl.h:1.12 spl/php_spl.h:1.13
--- spl/php_spl.h:1.12 Wed Nov 26 18:28:34 2003
+++ spl/php_spl.h Fri Dec 5 19:09:55 2003
@@ -44,6 +44,7 @@
ZEND_BEGIN_MODULE_GLOBALS(spl)
+ int dummy;
ZEND_END_MODULE_GLOBALS(spl)
#ifdef ZTS
Index: spl/config.w32
+++ spl/config.w32
// $Id: config.w32,v 1.1 2003/12/06 00:09:55 wez Exp $
// vim:ft=javascript
ARG_ENABLE(spl, SPL (Standard PHP Library) support, yes);
if (PHP_SPL != no) {
EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c
spl_array.c spl_directory.c);
AC_DEFINE('HAVE_SPL', 1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
