[PHP-CVS] cvs: php-src /sapi/cli config.w32 php_cli.c
wez Mon Dec 22 08:08:05 2003 EDT
Modified files:
/php-src/sapi/cli config.w32 php_cli.c
Log:
add win32 configure option for CLI to switch on CRT heap debugging
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.1 php-src/sapi/cli/config.w32:1.2
--- php-src/sapi/cli/config.w32:1.1 Tue Dec 2 18:17:03 2003
+++ php-src/sapi/cli/config.w32 Mon Dec 22 08:08:04 2003
@@ -1,9 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:03 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 13:08:04 wez Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
+ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
if (PHP_CLI == yes) {
SAPI('cli', 'getopt.c php_cli.c', 'php.exe');
+ if (PHP_CRT_DEBUG == yes) {
+ ADD_FLAG(CFLAGS_CLI, /D PHP_WIN32_DEBUG_HEAP);
+ }
}
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.103 php-src/sapi/cli/php_cli.c:1.104
--- php-src/sapi/cli/php_cli.c:1.103Thu Dec 11 18:51:24 2003
+++ php-src/sapi/cli/php_cli.c Mon Dec 22 08:08:04 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.103 2003/12/11 23:51:24 iliaa Exp $ */
+/* $Id: php_cli.c,v 1.104 2003/12/22 13:08:04 wez Exp $ */
#include php.h
#include php_globals.h
@@ -537,6 +537,20 @@
void ***tsrm_ls;
#endif
+#if defined(PHP_WIN32) defined(_DEBUG) defined(PHP_WIN32_DEBUG_HEAP)
+ {
+ int tmp_flag;
+
+ _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+
+ tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+ tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
+ tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
+
+ _CrtSetDbgFlag(tmp_flag);
+ }
+#endif
#ifdef HAVE_SIGNAL_H
#if defined(SIGPIPE) defined(SIG_IGN)
--
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 config.w32 confutils.js
wez Mon Dec 22 08:13:39 2003 EDT
Modified files:
/php-src/win32/buildMakefile config.w32 confutils.js
Log:
Add --enable-snapshot-build configure option for win32 build.
Using it will attempt to switch on any configure options that
were left to their default value of no.
Add a snap target to the makefile which will run a sub-process
to make each SAPI and EXT independently, so that the whole process
does not bail out if a particular extension is broken.
Add a way to specify dependencies between extensions in the
config.w32 files so that the makefile will include appropriate rules
and linkage.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.9 php-src/win32/build/Makefile:1.10
--- php-src/win32/build/Makefile:1.9Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/MakefileMon Dec 22 08:13:39 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.9 2003/12/19 12:50:11 wez Exp $
+# $Id: Makefile,v 1.10 2003/12/22 13:13:39 wez Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -80,7 +80,12 @@
$(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0
run-tests.php $(TESTS)
NOKEEP
-dist: all
+build-snap:
+ @$(MAKE) $(BUILD_DIR)\$(PHPDLL)
+ for %T in ($(SAPI_TARGETS)) do $(MAKE) /nologo %T
+ for %T in ($(EXT_TARGETS)) do $(MAKE) /nologo %T
+
+build-dist:
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
$(BUILD_DIR)\php.exe win32/build/mkdist.php $(BUILD_DIR) $(PHPDLL)
$(SAPI_TARGETS) $(EXT_TARGETS) $(SNAPSHOT_TEMPLATE)
@@ -88,6 +93,9 @@
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
cd ..\..
+dist: all build-dist
+snap: build-snap build-dist
+
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php $(BUILD_DIR)
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS)
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.16 php-src/win32/build/config.w32:1.17
--- php-src/win32/build/config.w32:1.16 Fri Dec 19 15:39:02 2003
+++ php-src/win32/build/config.w32 Mon Dec 22 08:13:39 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.16 2003/12/19 20:39:02 wez Exp $
+// $Id: config.w32,v 1.17 2003/12/22 13:13:39 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -17,11 +17,6 @@
PATH_PROG('zip');
PATH_PROG('lemon');
-// one-shot build optimizes build by asking compiler to build
-// several objects at once, reducing overhead of starting new
-// compiler processes.
-ARG_ENABLE('one-shot', 'Optimize for fast build - best for release and snapshot
builders, not so hot for edit-and-rebuild hacking', 'no');
-
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
ARG_ENABLE('zts', 'Thread safety', 'yes');
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.23 php-src/win32/build/confutils.js:1.24
--- php-src/win32/build/confutils.js:1.23 Fri Dec 19 18:19:18 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 08:13:39 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.23 2003/12/19 23:19:18 wez Exp $
+// $Id: confutils.js,v 1.24 2003/12/22 13:13:39 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -318,6 +318,10 @@
WScript.Quit(1);
}
+ var snapshot_build_exclusions = new Array(
+ 'debug', 'crt-debug', 'lzf-better-compression', 'php-build',
'snapshot-template'
+ );
+
// Now set any defaults we might have missed out earlier
for (i = 0; i configure_args.length; i++) {
arg = configure_args[i];
@@ -326,6 +330,22 @@
analyzed = analyze_arg(arg.defval);
shared = analyzed[0];
argval = analyzed[1];
+ if (PHP_SNAPSHOT_BUILD != no argval == no) {
+ var force;
+
+ force = true;
+ for (j = 0; j snapshot_build_exclusions.length; j++) {
+ if (snapshot_build_exclusions[j] == arg.optname) {
+ force = false;
+ break;
+ }
+ }
+ if (force) {
+ STDOUT.WriteLine(snapshot: forcing + arg.arg +
on);
+ argval = yes;
+ shared = true;
+ }
+ }
eval(PHP_ + arg.symval + = argval;);
eval(PHP_ + arg.symval + _SHARED = shared;);
}
@@ -611,7 +631,7
[PHP-CVS] cvs: php-src /ext/dom config.w32 /ext/exif config.w32 /ext/simplexml config.w32 /ext/wddx config.w32 /ext/xml config.w32 /ext/xmlrpc config.w32 /ext/xsl config.w32
wez Mon Dec 22 08:16:43 2003 EDT
Modified files:
/php-src/ext/domconfig.w32
/php-src/ext/exif config.w32
/php-src/ext/simplexml config.w32
/php-src/ext/wddx config.w32
/php-src/ext/xmlconfig.w32
/php-src/ext/xmlrpc config.w32
/php-src/ext/xslconfig.w32
Log:
Add dependencies for these extensions
Index: php-src/ext/dom/config.w32
diff -u php-src/ext/dom/config.w32:1.2 php-src/ext/dom/config.w32:1.3
--- php-src/ext/dom/config.w32:1.2 Fri Dec 5 16:16:44 2003
+++ php-src/ext/dom/config.w32 Mon Dec 22 08:16:39 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/05 21:16:44 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 13:16:39 wez Exp $
// vim:ft=javascript
ARG_WITH(dom, DOM support, yes);
@@ -16,6 +16,7 @@
if (!PHP_DOM_SHARED) {
ADD_FLAG(CFLAGS_DOM, /D LIBXML_STATIC );
}
+ ADD_EXTENSION_DEP('dom', 'libxml');
}
Index: php-src/ext/exif/config.w32
diff -u php-src/ext/exif/config.w32:1.1 php-src/ext/exif/config.w32:1.2
--- php-src/ext/exif/config.w32:1.1 Fri Dec 5 02:17:11 2003
+++ php-src/ext/exif/config.w32 Mon Dec 22 08:16:39 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/05 07:17:11 fmk Exp $
+// $Id: config.w32,v 1.2 2003/12/22 13:16:39 wez Exp $
// vim:ft=javascript
ARG_WITH(exif, exif, no);
@@ -6,4 +6,5 @@
if (PHP_EXIF == yes) {
EXTENSION(exif, exif.c);
AC_DEFINE('HAVE_EXIF', 1, 'Have exif');
+ ADD_EXTENSION_DEP('exif', 'mbstring');
}
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.2 php-src/ext/simplexml/config.w32:1.3
--- php-src/ext/simplexml/config.w32:1.2Fri Dec 5 16:16:46 2003
+++ php-src/ext/simplexml/config.w32Mon Dec 22 08:16:40 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 13:16:40 wez Exp $
// vim:ft=javascript
ARG_WITH(simplexml, Simple XML support, yes);
@@ -9,6 +9,7 @@
if (!PHP_SIMPLEXML_SHARED) {
ADD_FLAG(CFLAGS_SIMPLEXML, /D LIBXML_STATIC);
}
+ ADD_EXTENSION_DEP('simplexml', 'libxml');
}
Index: php-src/ext/wddx/config.w32
diff -u php-src/ext/wddx/config.w32:1.1 php-src/ext/wddx/config.w32:1.2
--- php-src/ext/wddx/config.w32:1.1 Tue Dec 2 18:16:59 2003
+++ php-src/ext/wddx/config.w32 Mon Dec 22 08:16:41 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:59 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 13:16:41 wez Exp $
// vim:ft=javascript
ARG_WITH(wddx, WDDX support, yes);
@@ -6,6 +6,7 @@
if (PHP_WDDX == yes PHP_LIBXML == yes) {
EXTENSION(wddx, wddx.c);
AC_DEFINE(HAVE_WDDX, 1, WDDX support);
+ ADD_EXTENSION_DEP('wddx', 'libxml');
}
Index: php-src/ext/xml/config.w32
diff -u php-src/ext/xml/config.w32:1.2 php-src/ext/xml/config.w32:1.3
--- php-src/ext/xml/config.w32:1.2 Fri Dec 5 16:16:46 2003
+++ php-src/ext/xml/config.w32 Mon Dec 22 08:16:42 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/05 21:16:46 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 13:16:42 wez Exp $
// vim:ft=javascript
ARG_WITH(xml, XML support, yes);
@@ -9,6 +9,7 @@
if (!PHP_XML_SHARED) {
ADD_FLAG(CFLAGS_XML, /D LIBXML_STATIC );
}
+ ADD_EXTENSION_DEP('xml', 'libxml');
}
Index: php-src/ext/xmlrpc/config.w32
diff -u php-src/ext/xmlrpc/config.w32:1.1 php-src/ext/xmlrpc/config.w32:1.2
--- php-src/ext/xmlrpc/config.w32:1.1 Fri Dec 19 11:59:37 2003
+++ php-src/ext/xmlrpc/config.w32 Mon Dec 22 08:16:42 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 16:59:37 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 13:16:42 wez Exp $
// vim:ft=javascript
ARG_WITH(xmlrpc, XMLRPC-EPI support, no);
@@ -9,5 +9,6 @@
ADD_SOURCES(configure_module_dirname + /libxmlrpc, base64.c simplestring.c
xml_to_dandarpc.c \
xmlrpc_introspection.c encodings.c system_methods.c xml_to_xmlrpc.c \
queue.c xml_element.c xmlrpc.c xml_to_soap.c, xmlrpc);
+ ADD_EXTENSION_DEP('xmlrpc', 'libxml');
}
Index: php-src/ext/xsl/config.w32
diff -u php-src/ext/xsl/config.w32:1.7 php-src/ext/xsl/config.w32:1.8
--- php-src/ext/xsl/config.w32:1.7 Sun Dec 7 06:11:46 2003
+++ php-src/ext/xsl/config.w32 Mon Dec 22 08:16:43 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7 2003/12/07 11:11:46 rrichards Exp $
+// $Id: config.w32,v 1.8 2003/12/22 13:16:43 wez Exp $
// vim: ft=javascript
ARG_WITH(xsl, xsl support, no);
@@ -25,6 +25,7 @@
ADD_FLAG(LDFLAGS_XSL,
/nodefaultlib:msvcrt);
}
}
+ ADD_EXTENSION_DEP('xsl', 'libxml');
} 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 buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
wez Mon Dec 22 10:01:06 2003 EDT
Added files:
/TSRM config.w32
Modified files:
/TSRM tsrm_win32.c tsrm_win32.h
/php-src/win32/buildbuildconf.js config.w32
Log:
Fix bug #26692; Could not find GetLongPathNameA under NT4.
This fix relies on you having the Platform SDK headers.
Using the new build system, the NewAPIs.h header will be detected
automatically, however, for people building using .dsp files,
you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project
if you have those newer headers.
Index: TSRM/tsrm_win32.c
diff -u TSRM/tsrm_win32.c:1.23 TSRM/tsrm_win32.c:1.24
--- TSRM/tsrm_win32.c:1.23 Mon Dec 1 15:18:55 2003
+++ TSRM/tsrm_win32.c Mon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tsrm_win32.c,v 1.23 2003/12/01 20:18:55 andi Exp $ */
+/* $Id: tsrm_win32.c,v 1.24 2003/12/22 15:01:05 wez Exp $ */
#include stdio.h
#include fcntl.h
@@ -29,6 +29,11 @@
#include TSRM.h
#ifdef TSRM_WIN32
+
+#if HAVE_NEWAPIS_H
+# define COMPILE_NEWAPIS_STUBS
+#endif
+
#include tsrm_win32.h
#ifdef ZTS
Index: TSRM/tsrm_win32.h
diff -u TSRM/tsrm_win32.h:1.15 TSRM/tsrm_win32.h:1.16
--- TSRM/tsrm_win32.h:1.15 Tue Sep 30 05:48:53 2003
+++ TSRM/tsrm_win32.h Mon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tsrm_win32.h,v 1.15 2003/09/30 09:48:53 stas Exp $ */
+/* $Id: tsrm_win32.h,v 1.16 2003/12/22 15:01:05 wez Exp $ */
#ifndef TSRM_WIN32_H
#define TSRM_WIN32_H
@@ -24,6 +24,11 @@
#include TSRM.h
#include windows.h
+#if HAVE_NEWAPIS_H
+# define WANT_GETLONGPATHNAME_WRAPPER
+# include NewAPIs.h
+#endif
+
struct ipc_perm {
int key;
unsigned short uid;
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.6 php-src/win32/build/buildconf.js:1.7
--- php-src/win32/build/buildconf.js:1.6Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/buildconf.jsMon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.6 2003/12/19 12:50:11 wez Exp $ */
+/* $Id: buildconf.js,v 1.7 2003/12/22 15:01:05 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -90,6 +90,8 @@
// Pull in code from sapi and extensions
modules = file_get_contents(win32/build/config.w32);
+// Pick up confs from TSRM and Zend if present
+find_config_w32(.);
find_config_w32(sapi);
find_config_w32(ext);
find_config_w32(pecl);
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.17 php-src/win32/build/config.w32:1.18
--- php-src/win32/build/config.w32:1.17 Mon Dec 22 08:13:39 2003
+++ php-src/win32/build/config.w32 Mon Dec 22 10:01:05 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.17 2003/12/22 13:13:39 wez Exp $
+// $Id: config.w32,v 1.18 2003/12/22 15:01:05 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -166,7 +166,6 @@
STDOUT.WriteLine(Build dir: + get_define('BUILD_DIR'));
STDOUT.WriteLine(PHP Core: + get_define('PHPDLL') + and +
get_define('PHPLIB'));
-ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c);
ADD_SOURCES(Zend, zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
zend_constants.c zend_dynamic_array.c zend_execute_API.c zend_highlight.c \
Index: TSRM/config.w32
+++ TSRM/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/22 15:01:05 wez Exp $
if (CHECK_HEADER_ADD_INCLUDE(NewAPIs.h, CFLAGS_PHP, php_usual_include_suspects)) {
// Need to add the flag directly, since TSRM doesn't include the config
// header
ADD_FLAG(CFLAGS_PHP, /DHAVE_NEWAPIS_H=1);
}
ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/pi3web config.w32
wez Mon Dec 22 10:32:12 2003 EDT
Modified files:
/php-src/sapi/pi3webconfig.w32
Log:
Verify that new build system works with Pi3Web 2.0.2
Index: php-src/sapi/pi3web/config.w32
diff -u php-src/sapi/pi3web/config.w32:1.1 php-src/sapi/pi3web/config.w32:1.2
--- php-src/sapi/pi3web/config.w32:1.1 Fri Dec 19 15:39:04 2003
+++ php-src/sapi/pi3web/config.w32 Mon Dec 22 10:32:11 2003
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 20:39:04 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 15:32:11 wez Exp $
ARG_WITH('pi3web', 'Pi3Web', 'no');
if (PHP_PI3WEB != no) {
- if (CHECK_HEADER_ADD_INCLUDE('PiAPI/PiAPI.h', 'CFLAGS_PI3WEB', PHP_PI3WEB)
- CHECK_LIB('piapi.lib', 'pi3web')
- CHECK_LIB('pi2api.lib', 'pi3web')
- CHECK_LIB('pi3api.lib', 'pi3web')) {
+ if (CHECK_HEADER_ADD_INCLUDE('PiAPI.h', 'CFLAGS_PI3WEB', PHP_PHP_BUILD +
\\Pi3Web\\include; + PHP_PI3WEB)
+ CHECK_LIB('piapi.lib', 'pi3web', PHP_PHP_BUILD + \\Pi3Web\\lib; +
PHP_PI3WEB)
+ CHECK_LIB('pi2api.lib', 'pi3web', PHP_PHP_BUILD + \\Pi3Web\\lib;
+ PHP_PI3WEB)
+ CHECK_LIB('pi3api.lib', 'pi3web', PHP_PHP_BUILD + \\Pi3Web\\lib;
+ PHP_PI3WEB)) {
SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll',
'/D PHP4PI3WEB_EXPORTS');
AC_DEFINE('WITH_PI3WEB', 1);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
iliaa Mon Dec 22 10:56:52 2003 EDT
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
Missing bit for bug #26625.
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.300 php-src/ext/pgsql/pgsql.c:1.301
--- php-src/ext/pgsql/pgsql.c:1.300 Mon Dec 15 20:00:34 2003
+++ php-src/ext/pgsql/pgsql.c Mon Dec 22 10:56:51 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.300 2003/12/16 01:00:34 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.301 2003/12/22 15:56:51 iliaa Exp $ */
#include stdlib.h
@@ -3772,9 +3772,8 @@
if (Z_STRLEN_PP(val) == 0) {
if (opt
PGSQL_CONV_FORCE_NULL) {
ZVAL_STRING(new_val,
NULL, 1);
- }
- else {
- ZVAL_STRING(new_val,
empty_string, 1);
+ } else {
+ ZVAL_STRING(new_val,
'', 1);
}
}
else {
--
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/pgsql pgsql.c
iliaa Mon Dec 22 10:56:53 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/pgsql pgsql.c
Log:
MFH: Missing bit for bug #26625.
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.30 php-src/ext/pgsql/pgsql.c:1.244.2.31
--- php-src/ext/pgsql/pgsql.c:1.244.2.30Mon Dec 15 20:00:45 2003
+++ php-src/ext/pgsql/pgsql.c Mon Dec 22 10:56:52 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.30 2003/12/16 01:00:45 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.31 2003/12/22 15:56:52 iliaa Exp $ */
#include stdlib.h
@@ -3631,9 +3631,8 @@
if (Z_STRLEN_PP(val) == 0) {
if (opt
PGSQL_CONV_FORCE_NULL) {
ZVAL_STRING(new_val,
NULL, 1);
- }
- else {
- ZVAL_STRING(new_val,
empty_string, 1);
+ } else {
+ ZVAL_STRING(new_val,
'', 1);
}
}
else {
--
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
iliaa Mon Dec 22 11:00:52 2003 EDT Modified files: /php-src/ext/standard basic_functions.c Log: Define INADDR_NONE for systems that don't have it (apparently solaris). Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.648 php-src/ext/standard/basic_functions.c:1.649 --- php-src/ext/standard/basic_functions.c:1.648Fri Dec 19 08:49:59 2003 +++ php-src/ext/standard/basic_functions.c Mon Dec 22 11:00:52 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.648 2003/12/19 13:49:59 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.649 2003/12/22 16:00:52 iliaa Exp $ */ #include php.h #include php_streams.h @@ -92,6 +92,10 @@ # include win32/unistd.h #endif +#ifndef INADDR_NONE +#define INADDR_NONE ((unsigned long int) -1) +#endif + #include zend_globals.h #include php_globals.h #include SAPI.h -- 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 basic_functions.c
iliaa Mon Dec 22 11:00:54 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard basic_functions.c Log: MFH: Define INADDR_NONE for systems that don't have it (apparently solaris) Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.543.2.29 php-src/ext/standard/basic_functions.c:1.543.2.30 --- php-src/ext/standard/basic_functions.c:1.543.2.29 Fri Dec 19 08:50:01 2003 +++ php-src/ext/standard/basic_functions.c Mon Dec 22 11:00:54 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.543.2.29 2003/12/19 13:50:01 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.543.2.30 2003/12/22 16:00:54 iliaa Exp $ */ #include php.h #include php_streams.h @@ -83,6 +83,10 @@ # include win32/unistd.h #endif +#ifndef INADDR_NONE +#define INADDR_NONE ((unsigned long int) -1) +#endif + #include zend_globals.h #include php_globals.h #include SAPI.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /tests/classes array_access_007.phpt ZendEngine2 zend_object_handlers.c
helly Mon Dec 22 11:27:15 2003 EDT
Added files:
/php-src/tests/classes array_access_007.phpt
Modified files:
/ZendEngine2zend_object_handlers.c
/php-srcNEWS
Log:
Fixed bug #26675 (Segfault on ArrayAccess use)
Update NEWS
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.84 ZendEngine2/zend_object_handlers.c:1.85
--- ZendEngine2/zend_object_handlers.c:1.84 Mon Dec 22 08:09:15 2003
+++ ZendEngine2/zend_object_handlers.c Mon Dec 22 11:27:13 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_object_handlers.c,v 1.84 2003/12/22 13:09:15 wez Exp $ */
+/* $Id: zend_object_handlers.c,v 1.85 2003/12/22 16:27:13 helly Exp $ */
#include zend.h
#include zend_globals.h
@@ -400,8 +400,13 @@
static void zend_std_write_dimension(zval *object, zval *offset, zval *value
TSRMLS_DC)
{
zend_class_entry *ce = Z_OBJCE_P(object);
+ zval tmp;
if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) {
+ if (!offset) {
+ INIT_ZVAL(tmp);
+ offset = tmp;
+ }
zend_call_method_with_2_params(object, ce, NULL, offsetset, NULL,
offset, value);
} else {
zend_error(E_ERROR, Cannot use object of type %s as array, ce-name);
Index: php-src/NEWS
diff -u php-src/NEWS:1.1550 php-src/NEWS:1.1551
--- php-src/NEWS:1.1550 Sun Dec 21 13:30:31 2003
+++ php-src/NEWSMon Dec 22 11:27:14 2003
@@ -1,5 +1,8 @@
PHPNEWS
|||
+?? ??? 2004, PHP 5 RC 1
+- Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus)
+
21 Dec 2003, PHP 5 Beta 3
- Bundled new tidy extension (John, Wez)
- Upgraded PCRE library to version 4.5. (Andrei)
Index: php-src/tests/classes/array_access_007.phpt
+++ php-src/tests/classes/array_access_007.phpt
--TEST--
ZE2 ArrayAccess and [] assignment
--FILE--
?php
class OverloadedArray implements ArrayAccess {
public $realArray;
function __construct() {
$this-realArray = array();
}
function offsetExists($index) {
return array_key_exists($this-realArray, $index);
}
function offsetGet($index) {
return $this-realArray[$index];
}
function offsetSet($index, $value) {
if (is_null($index)) {
$this-realArray[] = $value;
} else {
$this-realArray[$index] = $value;
}
}
function offsetUnset($index) {
unset($this-realArray[$index]);
}
function dump() {
var_dump($this-realArray);
}
}
$a = new OverloadedArray;
$a[] = 1;
$a[1] = 2;
$a[2] = 3;
$a[] = 4;
$a-dump();
?
===DONE===
--EXPECT--
array(4) {
[0]=
int(1)
[1]=
int(2)
[2]=
int(3)
[3]=
int(4)
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/xsl xsltprocessor.c
iliaa Mon Dec 22 11:32:30 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/xslxsltprocessor.c
Log:
Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1551 php-src/NEWS:1.1552
--- php-src/NEWS:1.1551 Mon Dec 22 11:27:14 2003
+++ php-src/NEWSMon Dec 22 11:32:28 2003
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2004, PHP 5 RC 1
+- Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers).
+ (Ilia)
- Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus)
21 Dec 2003, PHP 5 Beta 3
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.17 php-src/ext/xsl/xsltprocessor.c:1.18
--- php-src/ext/xsl/xsltprocessor.c:1.17Sat Nov 29 11:37:37 2003
+++ php-src/ext/xsl/xsltprocessor.c Mon Dec 22 11:32:29 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.17 2003/11/29 16:37:37 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.18 2003/12/22 16:32:29 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -297,8 +297,17 @@
ret = -1;
if (newdocp) {
- ret = xsltSaveResultToFilename(uri, newdocp, sheetp, 0);
+ int fd;
+ php_stream *stream = php_stream_open_wrapper_ex(uri, wb,
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL);
+
+ if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)fd, 1) ==
FAILURE) {
+ goto done;
+ }
+
+ ret = xsltSaveResultToFd(fd, newdocp, sheetp);
+done:
xmlFreeDoc(newdocp);
+ php_stream_close(stream);
}
RETVAL_LONG(ret);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
Does this mean we can't be binary compatible with NT4?
Andi
At 03:01 PM 12/22/2003 +, Wez Furlong wrote:
wez Mon Dec 22 10:01:06 2003 EDT
Added files:
/TSRM config.w32
Modified files:
/TSRM tsrm_win32.c tsrm_win32.h
/php-src/win32/buildbuildconf.js config.w32
Log:
Fix bug #26692; Could not find GetLongPathNameA under NT4.
This fix relies on you having the Platform SDK headers.
Using the new build system, the NewAPIs.h header will be detected
automatically, however, for people building using .dsp files,
you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project
if you have those newer headers.
Index: TSRM/tsrm_win32.c
diff -u TSRM/tsrm_win32.c:1.23 TSRM/tsrm_win32.c:1.24
--- TSRM/tsrm_win32.c:1.23 Mon Dec 1 15:18:55 2003
+++ TSRM/tsrm_win32.c Mon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tsrm_win32.c,v 1.23 2003/12/01 20:18:55 andi Exp $ */
+/* $Id: tsrm_win32.c,v 1.24 2003/12/22 15:01:05 wez Exp $ */
#include stdio.h
#include fcntl.h
@@ -29,6 +29,11 @@
#include TSRM.h
#ifdef TSRM_WIN32
+
+#if HAVE_NEWAPIS_H
+# define COMPILE_NEWAPIS_STUBS
+#endif
+
#include tsrm_win32.h
#ifdef ZTS
Index: TSRM/tsrm_win32.h
diff -u TSRM/tsrm_win32.h:1.15 TSRM/tsrm_win32.h:1.16
--- TSRM/tsrm_win32.h:1.15 Tue Sep 30 05:48:53 2003
+++ TSRM/tsrm_win32.h Mon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tsrm_win32.h,v 1.15 2003/09/30 09:48:53 stas Exp $ */
+/* $Id: tsrm_win32.h,v 1.16 2003/12/22 15:01:05 wez Exp $ */
#ifndef TSRM_WIN32_H
#define TSRM_WIN32_H
@@ -24,6 +24,11 @@
#include TSRM.h
#include windows.h
+#if HAVE_NEWAPIS_H
+# define WANT_GETLONGPATHNAME_WRAPPER
+# include NewAPIs.h
+#endif
+
struct ipc_perm {
int key;
unsigned short uid;
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.6
php-src/win32/build/buildconf.js:1.7
--- php-src/win32/build/buildconf.js:1.6Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/buildconf.jsMon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.6 2003/12/19 12:50:11 wez Exp $ */
+/* $Id: buildconf.js,v 1.7 2003/12/22 15:01:05 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -90,6 +90,8 @@
// Pull in code from sapi and extensions
modules = file_get_contents(win32/build/config.w32);
+// Pick up confs from TSRM and Zend if present
+find_config_w32(.);
find_config_w32(sapi);
find_config_w32(ext);
find_config_w32(pecl);
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.17
php-src/win32/build/config.w32:1.18
--- php-src/win32/build/config.w32:1.17 Mon Dec 22 08:13:39 2003
+++ php-src/win32/build/config.w32 Mon Dec 22 10:01:05 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.17 2003/12/22 13:13:39 wez Exp $
+// $Id: config.w32,v 1.18 2003/12/22 15:01:05 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -166,7 +166,6 @@
STDOUT.WriteLine(Build dir: + get_define('BUILD_DIR'));
STDOUT.WriteLine(PHP Core: + get_define('PHPDLL') + and +
get_define('PHPLIB'));
-ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
tsrm_win32.c);
ADD_SOURCES(Zend, zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
zend_constants.c zend_dynamic_array.c zend_execute_API.c
zend_highlight.c \
Index: TSRM/config.w32
+++ TSRM/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/22 15:01:05 wez Exp $
if (CHECK_HEADER_ADD_INCLUDE(NewAPIs.h, CFLAGS_PHP,
php_usual_include_suspects)) {
// Need to add the flag directly, since TSRM doesn't include the
config
// header
ADD_FLAG(CFLAGS_PHP, /DHAVE_NEWAPIS_H=1);
}
ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Mon Dec 22 11:46:26 2003 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
only test url_stat in read mode
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.11 php-src/ext/libxml/libxml.c:1.12
--- php-src/ext/libxml/libxml.c:1.11Fri Dec 12 08:54:06 2003
+++ php-src/ext/libxml/libxml.c Mon Dec 22 11:46:26 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.11 2003/12/12 13:54:06 rrichards Exp $ */
+/* $Id: libxml.c,v 1.12 2003/12/22 16:46:26 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -238,7 +238,7 @@
return php_stream_locate_url_wrapper(filename, NULL, 0 TSRMLS_CC) ? 1 : 0;
}
-void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode)
+void *php_libxml_streams_IO_open_wrapper(const char *filename, const char *mode,
const int read_only)
{
char resolved_path[MAXPATHLEN + 1];
php_stream_statbuf ssbuf;
@@ -257,7 +257,7 @@
may try to open files that don't exist, but it is not a failure
in xml processing (eg. DTD files) */
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open,
ENFORCE_SAFE_MODE TSRMLS_CC);
- if (wrapper wrapper-wops-url_stat) {
+ if (wrapper read_only wrapper-wops-url_stat) {
if (wrapper-wops-url_stat(wrapper, path_to_open, 0, ssbuf, NULL
TSRMLS_CC) == -1) {
return NULL;
}
@@ -272,12 +272,12 @@
void *php_libxml_streams_IO_open_read_wrapper(const char *filename)
{
- return php_libxml_streams_IO_open_wrapper(filename, rb);
+ return php_libxml_streams_IO_open_wrapper(filename, rb, 1);
}
void *php_libxml_streams_IO_open_write_wrapper(const char *filename)
{
- return php_libxml_streams_IO_open_wrapper(filename, wb);
+ return php_libxml_streams_IO_open_wrapper(filename, wb, 0);
}
int php_libxml_streams_IO_read(void *context, char *buffer, int len)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/xsl xsltprocessor.c
In cases like this I think it's sexier to use do {} while(0). I also use
goto but usually only in places where the former isn't suitable. In your
case, I think it is. It would look something like the following:
int fd;
php_stream *stream = php_stream_open_wrapper_ex(uri, wb,
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL);
do {
if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)fd, 1) ==
FAILURE) {
break;
}
ret = xsltSaveResultToFd(fd, newdocp, sheetp);
xmlFreeDoc(newdocp);
} while (0);
php_stream_close(stream);
Anyway, it's up to you. I guess it's a matter of taste.
Andi
At 04:32 PM 12/22/2003 +, Ilia Alshanetsky wrote:
iliaa Mon Dec 22 11:32:30 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/xslxsltprocessor.c
Log:
Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1551 php-src/NEWS:1.1552
--- php-src/NEWS:1.1551 Mon Dec 22 11:27:14 2003
+++ php-src/NEWSMon Dec 22 11:32:28 2003
@@ -1,6 +1,8 @@
PHP
NEWS
|||
?? ??? 2004, PHP 5 RC 1
+- Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers).
+ (Ilia)
- Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus)
21 Dec 2003, PHP 5 Beta 3
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.17
php-src/ext/xsl/xsltprocessor.c:1.18
--- php-src/ext/xsl/xsltprocessor.c:1.17Sat Nov 29 11:37:37 2003
+++ php-src/ext/xsl/xsltprocessor.c Mon Dec 22 11:32:29 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.17 2003/11/29 16:37:37 chregu Exp $ */
+/* $Id: xsltprocessor.c,v 1.18 2003/12/22 16:32:29 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -297,8 +297,17 @@
ret = -1;
if (newdocp) {
- ret = xsltSaveResultToFilename(uri, newdocp, sheetp, 0);
+ int fd;
+ php_stream *stream = php_stream_open_wrapper_ex(uri, wb,
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL);
+
+ if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)fd,
1) == FAILURE) {
+ goto done;
+ }
+
+ ret = xsltSaveResultToFd(fd, newdocp, sheetp);
+done:
xmlFreeDoc(newdocp);
+ php_stream_close(stream);
}
RETVAL_LONG(ret);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
rrichards Mon Dec 22 11:49:54 2003 EDT
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
rollback to previouos version
bug #26690 fixed in libxml.c
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.18 php-src/ext/xsl/xsltprocessor.c:1.19
--- php-src/ext/xsl/xsltprocessor.c:1.18Mon Dec 22 11:32:29 2003
+++ php-src/ext/xsl/xsltprocessor.c Mon Dec 22 11:49:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.18 2003/12/22 16:32:29 iliaa Exp $ */
+/* $Id: xsltprocessor.c,v 1.19 2003/12/22 16:49:54 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -297,17 +297,8 @@
ret = -1;
if (newdocp) {
- int fd;
- php_stream *stream = php_stream_open_wrapper_ex(uri, wb,
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, NULL);
-
- if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)fd, 1) ==
FAILURE) {
- goto done;
- }
-
- ret = xsltSaveResultToFd(fd, newdocp, sheetp);
-done:
+ ret = xsltSaveResultToFilename(uri, newdocp, sheetp, 0);
xmlFreeDoc(newdocp);
- php_stream_close(stream);
}
RETVAL_LONG(ret);
--
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 domxml.dsp
rrichards Mon Dec 22 11:51:51 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/domxml domxml.dsp Log: define LIBXML_THREAD_ENABLED Index: php-src/ext/domxml/domxml.dsp diff -u php-src/ext/domxml/domxml.dsp:1.6.4.2 php-src/ext/domxml/domxml.dsp:1.6.4.3 --- php-src/ext/domxml/domxml.dsp:1.6.4.2 Fri Dec 20 13:41:19 2002 +++ php-src/ext/domxml/domxml.dsp Mon Dec 22 11:51:50 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I mssql-70 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_report.c
georg Mon Dec 22 12:00:55 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_report.c
Log:
beautifying :)
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.3 php-src/ext/mysqli/mysqli_report.c:1.4
--- php-src/ext/mysqli/mysqli_report.c:1.3 Mon Dec 22 11:56:14 2003
+++ php-src/ext/mysqli/mysqli_report.c Mon Dec 22 12:00:54 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_report.c,v 1.3 2003/12/22 16:56:14 georg Exp $
+ $Id: mysqli_report.c,v 1.4 2003/12/22 17:00:54 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -59,9 +59,9 @@
/* {{{ void php_mysqli_report_index() */
void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC) {
+#if MYSQL_VERSION_ID 40101
char index[15];
-#if MYSQL_VERSION_ID 40101
if (status SERVER_QUERY_NO_GOOD_INDEX_USED) {
strcpy(index, Bad index);
} else if (status SERVER_QUERY_NO_INDEX_USED) {
@@ -69,11 +69,10 @@
} else {
return;
}
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s used in query %s, index,
query);
#else
return;
#endif
-
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %s used in query %s, index,
query);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/xsl xsltprocessor.c
On Mon, 22 Dec 2003, Andi Gutmans wrote:
In cases like this I think it's sexier to use do {} while(0). I also use
goto but usually only in places where the former isn't suitable.
Why hide goto with do {} while(0)? Using goto in this case is much
clearer IMO.
Derick
--
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
fmk Mon Dec 22 13:23:40 2003 EDT Modified files: /php-src/ext/sqlite php_sqlite.def Log: Convert to windows line endings Index: php-src/ext/sqlite/php_sqlite.def diff -u php-src/ext/sqlite/php_sqlite.def:1.2 php-src/ext/sqlite/php_sqlite.def:1.3 --- php-src/ext/sqlite/php_sqlite.def:1.2 Fri Dec 5 12:46:04 2003 +++ php-src/ext/sqlite/php_sqlite.def Mon Dec 22 13:23:39 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
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
The main question is how will the PHP builds be created from now on? With this SDK? Will we have to include additional dlls with the distro? Am I supposed to nuke the NEWS entry about not supporting Win95? Andi At 05:55 PM 12/22/2003 +, Wez Furlong wrote: We can if we are building against the platform SDK headers; the NewAPIs.h file defines some smart stubs that will use GetProcAddress to determine if the system really has the API, but will fall back on emulation if it is not present. If we don't use that header file, then we can not run under win95 or NT4. --Wez. - Original Message - From: Andi Gutmans [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Monday, December 22, 2003 4:39 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h Does this mean we can't be binary compatible with NT4? Andi At 03:01 PM 12/22/2003 +, Wez Furlong wrote: wez Mon Dec 22 10:01:06 2003 EDT Added files: /TSRM config.w32 Modified files: /TSRM tsrm_win32.c tsrm_win32.h /php-src/win32/buildbuildconf.js config.w32 Log: Fix bug #26692; Could not find GetLongPathNameA under NT4. This fix relies on you having the Platform SDK headers. Using the new build system, the NewAPIs.h header will be detected automatically, however, for people building using .dsp files, you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project if you have those newer headers. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
No additional DLL's are needed. We can keep the news entry about dropping win95 support I think, even if the binaries still work there; it is nice to say good riddance to it (we might end up using some other API that isn't supported under win95 in a point release). As for creating builds from now on, I'd very much prefer it if we can drop the .dsp support and go with the new build system (at least for our official snaps); I think it covers all extensions that were known to work with the snapshot builder now, as well as a number of pecl extensions that previously did not build under win32. Oh yes, and the new build system has nice icons and version info resources ;-) --Wez. - Original Message - From: Andi Gutmans [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED]; Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Monday, December 22, 2003 6:49 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h The main question is how will the PHP builds be created from now on? With this SDK? Will we have to include additional dlls with the distro? Am I supposed to nuke the NEWS entry about not supporting Win95? Andi At 05:55 PM 12/22/2003 +, Wez Furlong wrote: We can if we are building against the platform SDK headers; the NewAPIs.h file defines some smart stubs that will use GetProcAddress to determine if the system really has the API, but will fall back on emulation if it is not present. If we don't use that header file, then we can not run under win95 or NT4. -- 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 file.c
iliaa Mon Dec 22 16:03:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
Log:
Fixed memory leak.
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.46 php-src/ext/standard/file.c:1.279.2.47
--- php-src/ext/standard/file.c:1.279.2.46 Mon Dec 15 13:53:25 2003
+++ php-src/ext/standard/file.c Mon Dec 22 16:03:54 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.46 2003/12/15 18:53:25 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.47 2003/12/22 21:03:54 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2190,7 +2190,7 @@
zval **fd, **bytes, **p_delim, **p_enclosure;
int len, buf_len;
- char *buf, *p, *s, *e, *re;
+ char *buf, *p, *s, *e, *re, *buf2=NULL;
php_stream *stream;
switch(ZEND_NUM_ARGS()) {
@@ -2289,7 +2289,7 @@
s = p + 1;
}
} else {
- char *p2=NULL, *buf2=NULL;
+ char *p2=NULL;
int buf2_len=0;
enclosure:
/* handle complete fields before the enclosure */
@@ -2351,9 +2351,7 @@
}
enclosure_done:
CSV_ADD_ENTRY(buf2, buf2_len, 0);
- if (buf2) {
- efree(buf2);
- }
+
goto done;
}
}
@@ -2362,6 +2360,9 @@
CSV_ADD_ENTRY(s, e, s);
}
done:
+ if (buf2) {
+ efree(buf2);
+ }
efree(buf);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
At 07:20 PM 12/22/2003 +, Wez Furlong wrote: No additional DLL's are needed. We can keep the news entry about dropping win95 support I think, even if the binaries still work there; it is nice to say good riddance to it (we might end up using some other API that isn't supported under win95 in a point release). Okay. As for creating builds from now on, I'd very much prefer it if we can drop the .dsp support and go with the new build system (at least for our official snaps); I think it covers all extensions that were known to work with the snapshot builder now, as well as a number of pecl extensions that previously did not build under win32. Oh yes, and the new build system has nice icons and version info resources ;-) I don't really mind how the snapshots are built but it is crucial for Windows development to keep the .dsp's working and up-to-date. It's the only sane way to develop debug on Windows. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
I don't really mind how the snapshots are built but it is crucial for Windows development to keep the .dsp's working and up-to-date. It's the only sane way to develop debug on Windows. You can still use the VC++ or VS.Net IDE to debug and write code using the new build system. One of the motivations for the build system is that it is more difficult than it needs to be to keep those .dsp files up to date - for example, there are a number of them that have inconsistent defines and paths set for different targets (Debug_TS and Release_TS) and some of those targets for some projects won't even work at all. One of the Zend projects won't correctly regenerate a scanner or parser unless you build with a particular target first, before switching to the target you need (I don't recall the precise details, but you can see this by looking at the custom build steps for flex/bison in the .dsp). I know that people tend to stick to what works well for them, but hopefully you'll all get converted over to the new build system so that we can eventually drop those .dsp files ;-) --Wez. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
Hi, I would like to back this up. With the .dsp files there is too many hardcoded parameters that you need to make sure is up to date, and it requires headers and libraries to be in specific places. With the new build system you can organize your files almost as you wish and it is much easier to create a version of php with the extension that you need, even without the need to change files. - Frank I don't really mind how the snapshots are built but it is crucial for Windows development to keep the .dsp's working and up-to-date. It's the only sane way to develop debug on Windows. You can still use the VC++ or VS.Net IDE to debug and write code using the new build system. One of the motivations for the build system is that it is more difficult than it needs to be to keep those .dsp files up to date - for example, there are a number of them that have inconsistent defines and paths set for different targets (Debug_TS and Release_TS) and some of those targets for some projects won't even work at all. One of the Zend projects won't correctly regenerate a scanner or parser unless you build with a particular target first, before switching to the target you need (I don't recall the precise details, but you can see this by looking at the custom build steps for flex/bison in the dsp). I know that people tend to stick to what works well for them, but hopefully you'll all get converted over to the new build system so that we can eventually drop those .dsp files ;-) --Wez. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /win32/build confutils.js
wez Mon Dec 22 17:33:44 2003 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildconfutils.js
Log:
For GD, build the extension as php_gd2.dll instead of php_gd.dll.
Thanks again Frank :-)
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.2 php-src/ext/gd/config.w32:1.3
--- php-src/ext/gd/config.w32:1.2 Sat Dec 6 21:58:55 2003
+++ php-src/ext/gd/config.w32 Mon Dec 22 17:33:42 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/07 02:58:55 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 22:33:42 wez Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes);
@@ -8,9 +8,9 @@
CHECK_LIB(freetype2.lib, gd, PHP_GD)
CHECK_LIB(libpng.lib, gd, PHP_GD)
CHECK_LIB(zlib.lib, gd, PHP_GD)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, ext\\gd\\libgd; +
PHP_GD)) {
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)) {
- EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd);
+ EXTENSION(gd, gd.c gdttf.c, null, -Iext/gd/libgd, php_gd2.dll);
ADD_SOURCES(ext/gd/libgd, gd2copypal.c gd_arc_f_buggy.c gd.c \
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gdhelpers.c gd_io.c
gd_io_dp.c \
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.24 php-src/win32/build/confutils.js:1.25
--- php-src/win32/build/confutils.js:1.24 Mon Dec 22 08:13:39 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 17:33:43 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.24 2003/12/22 13:13:39 wez Exp $
+// $Id: confutils.js,v 1.25 2003/12/22 22:33:43 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -668,11 +668,10 @@
}
}
-function EXTENSION(extname, file_list, shared, cflags)
+function EXTENSION(extname, file_list, shared, cflags, dllname)
{
var objs = null;
var EXT = extname.toUpperCase();
- var dllname = false;
if (shared == null) {
eval(shared = PHP_ + EXT + _SHARED;);
@@ -699,10 +698,13 @@
MFO.WriteBlankLines(1);
if (shared) {
- dllname = php_ + extname + .dll;
+ if (dllname == null) {
+ dllname = php_ + extname + .dll;
+ }
+ var libname = dllname.substring(0, dllname.length-4) + .lib;
+
var resname = generate_version_info_resource(dllname,
configure_module_dirname);
var ld = $(LD);
- var libname = php_ + extname + .lib;
MFO.WriteLine($(BUILD_DIR)\\ + dllname + $(BUILD_DIR)\\ + libname
+ : $(DEPS_ + EXT + ) $( + EXT + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(BUILD_DIR)\\ + resname);
MFO.WriteLine(\t + ld + /out:$(BUILD_DIR)\\ + dllname +
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + ) $( + EXT + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS) $(BUILD_DIR)\\ + resname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Mon Dec 22 17:33:47 2003 EDT Modified files: /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1552 php-src/NEWS:1.1553 --- php-src/NEWS:1.1552 Mon Dec 22 11:32:28 2003 +++ php-src/NEWSMon Dec 22 17:33:45 2003 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 RC 1 +- Fixed bug #26695 (Reflection API does not recognize mixed-case class hints). + (Marcus) - Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers). (Ilia) - Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/yaz config.w32
wez Mon Dec 22 17:39:56 2003 EDT
Modified files:
/php-src/ext/yazconfig.w32
Log:
Proper header check for yaz.
Index: php-src/ext/yaz/config.w32
diff -u php-src/ext/yaz/config.w32:1.1 php-src/ext/yaz/config.w32:1.2
--- php-src/ext/yaz/config.w32:1.1 Fri Dec 19 11:59:06 2003
+++ php-src/ext/yaz/config.w32 Mon Dec 22 17:39:56 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 16:59:06 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/22 22:39:56 wez Exp $
// vim:ft=javascript
ARG_WITH(yaz, YAZ support (ANSI/NISO Z39.50), no);
@@ -6,31 +6,29 @@
// this is a temporary hack
function yaz_check_version()
{
- var yaz_h = PHP_PHP_BUILD + \\include\\yaz\\yaz-version.h;
var c = null;
var v;
- if (FSO.FileExists(yaz_h)) {
- c = file_get_contents(yaz_h);
- if (c.match(/YAZ_VERSIONL\s+0x([a-zA-Z0-9]{2})/)) {
- v = RegExp.$1;
- if (parseInt(v) = 2) {
- return true;
- }
+ var yaz_h = CHECK_HEADER_ADD_INCLUDE(yaz/yaz-version.h, CFLAGS_YAZ,
PHP_YAZ);
+
+ if (!yaz_h) {
+ return false;
+ }
+
+ c = file_get_contents(yaz_h + \\yaz\\yaz-version.h);
+ if (c.match(/YAZ_VERSIONL\s+(0x[a-zA-Z0-9]+)/)) {
+ v = RegExp.$1;
+ if (parseInt(v) = 0x2) {
+ return true;
}
+ WARNING(yaz not enabled; version 2.0 or higher required; you have
version + v);
}
return false;
}
if (PHP_YAZ != no) {
-
- if (CHECK_HEADER_ADD_INCLUDE(yaz/yaz-version.h, CFLAGS_YAZ, PHP_YAZ)
- CHECK_LIB(yaz.lib, yaz, PHP_YAZ)) {
- if (yaz_check_version()) {
- EXTENSION('yaz', 'php_yaz.c');
- AC_DEFINE('HAVE_YAZ', 1);
- } else {
- WARNING(yaz not enabled; version 2.0 or higher required);
- }
+ if (yaz_check_version() CHECK_LIB(yaz.lib, yaz, PHP_YAZ)) {
+ EXTENSION('yaz', 'php_yaz.c');
+ AC_DEFINE('HAVE_YAZ', 1);
} else {
WARNING(yaz 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/fbsql config.w32
wez Mon Dec 22 17:42:00 2003 EDT
Modified files:
/php-src/ext/fbsql config.w32
Log:
Allow FrontBase to build against my local version of the headers
Index: php-src/ext/fbsql/config.w32
diff -u php-src/ext/fbsql/config.w32:1.3 php-src/ext/fbsql/config.w32:1.4
--- php-src/ext/fbsql/config.w32:1.3Wed Dec 3 20:04:36 2003
+++ php-src/ext/fbsql/config.w32Mon Dec 22 17:41:59 2003
@@ -1,13 +1,17 @@
-// $Id: config.w32,v 1.3 2003/12/04 01:04:36 fmk Exp $
+// $Id: config.w32,v 1.4 2003/12/22 22:41:59 wez Exp $
// vim:ft=javascript
ARG_WITH(fbsql, FrontBase support, no);
if (PHP_FBSQL == yes) {
- if (CHECK_LIB(FBCAccess.lib, fbsql, \\usr\\FrontBase\\lib)
- CHECK_HEADER_ADD_INCLUDE(FBCAccess\\FBCAccess.h, CFLAGS,
\\usr\\FrontBase\\include)) {
+ if (CHECK_LIB(FBCAccess.lib, fbsql,
+ \\usr\\FrontBase\\lib; + PHP_PHP_BUILD + \\FrontBase\\lib;
+ + PHP_FBSQL + \\lib; + PHP_FBSQL)
+ CHECK_HEADER_ADD_INCLUDE(FBCAccess\\FBCAccess.h,
CFLAGS_FBSQL,
+ \\usr\\FrontBase\\include; + PHP_PHP_BUILD +
\\FrontBase\\include;
+ + PHP_FBSQL + \\include; + PHP_FBSQL)) {
EXTENSION(fbsql, php_fbsql.c);
- AC_DEFINE('WinNT', 1, '');
+ ADD_FLAG('CFLAGS_FBSQL', '/DWinNT=1');
AC_DEFINE('HAVE_FBSQL', 1, 'Have FrontBase support');
} else {
WARNING(fbsql not enabled; libraries and headers not found);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
The box that is currently used for building snaps and releases has psdk installed. Edin - Original Message - From: Andi Gutmans [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED]; Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Monday, December 22, 2003 7:49 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h The main question is how will the PHP builds be created from now on? With this SDK? Will we have to include additional dlls with the distro? Am I supposed to nuke the NEWS entry about not supporting Win95? Andi At 05:55 PM 12/22/2003 +, Wez Furlong wrote: We can if we are building against the platform SDK headers; the NewAPIs.h file defines some smart stubs that will use GetProcAddress to determine if the system really has the API, but will fall back on emulation if it is not present. If we don't use that header file, then we can not run under win95 or NT4. --Wez. - Original Message - From: Andi Gutmans [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Monday, December 22, 2003 4:39 PM Subject: Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h Does this mean we can't be binary compatible with NT4? Andi At 03:01 PM 12/22/2003 +, Wez Furlong wrote: wez Mon Dec 22 10:01:06 2003 EDT Added files: /TSRM config.w32 Modified files: /TSRM tsrm_win32.c tsrm_win32.h /php-src/win32/buildbuildconf.js config.w32 Log: Fix bug #26692; Could not find GetLongPathNameA under NT4. This fix relies on you having the Platform SDK headers. Using the new build system, the NewAPIs.h header will be detected automatically, however, for people building using .dsp files, you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project if you have those newer headers. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build mkdist.php
wez Mon Dec 22 17:48:29 2003 EDT
Modified files:
/php-src/win32/buildmkdist.php
Log:
Don't annoy people building snaps/dists using VC6
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.3 php-src/win32/build/mkdist.php:1.4
--- php-src/win32/build/mkdist.php:1.3 Fri Dec 19 15:39:02 2003
+++ php-src/win32/build/mkdist.php Mon Dec 22 17:48:29 2003
@@ -1,4 +1,4 @@
-?php # $Id: mkdist.php,v 1.3 2003/12/19 20:39:02 wez Exp $
+?php # $Id: mkdist.php,v 1.4 2003/12/22 22:48:29 wez Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -25,6 +25,11 @@
function get_depends($module)
{
+ // skip this for now; working on a more portable solution
+ // since VC6 ships with an old version of depends.exe that
+ // doesn't have the command line options
+ return;
+
static $no_dist = array(
/* windows system dlls that should not be bundled */
'advapi32.dll', 'comdlg32.dll', 'gdi32.dll', 'kernel32.dll',
'ntdll.dll',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug23524.phpt /tests/strings bug22592.phpt
helly Mon Dec 22 17:53:48 2003 EDT
Added files:
/php-src/tests/strings bug22592.phpt
/php-src/tests/lang bug23524.phpt
Log:
Add more tests
Index: php-src/tests/strings/bug22592.phpt
+++ php-src/tests/strings/bug22592.phpt
--TEST--
Bug #22592 (Cascading assignments to strings with curly braces broken)
--FILE--
?php
$wrong = $correct = 'abcdef';
$t = $x[] = 'x';
var_dump($correct);
var_dump($wrong);
$correct{1} = '*';
$correct{3} = '*';
$correct{5} = '*';
// This produces the
$wrong{1} = $wrong{3} = $wrong{5} = '*';
var_dump($correct);
var_dump($wrong);
?
--EXPECT--
string(6) abcdef
string(6) abcdef
string(6) a*c*e*
string(6) a*c*e*
Index: php-src/tests/lang/bug23524.phpt
+++ php-src/tests/lang/bug23524.phpt
--TEST--
Bug #23524 Improper handling of constants in array indeces
--FILE--
?php
echo Begin\n;
define(THE_CONST,123);
function f($a=array(THE_CONST=THE_CONST)) {
print_r($a);
}
f();
f();
f();
echo Done;
?
--EXPECT--
Begin
Array
(
[123] = 123
)
Array
(
[123] = 123
)
Array
(
[123] = 123
)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Mon Dec 22 17:59:45 2003 EDT Modified files: /php-srcNEWS Log: Update Index: php-src/NEWS diff -u php-src/NEWS:1.1553 php-src/NEWS:1.1554 --- php-src/NEWS:1.1553 Mon Dec 22 17:33:45 2003 +++ php-src/NEWSMon Dec 22 17:59:44 2003 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 RC 1 +- Preserve class name casing for userspace classes. (Marcus) - Fixed bug #26695 (Reflection API does not recognize mixed-case class hints). (Marcus) - Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers). -- 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 016.phpt
helly Mon Dec 22 18:15:34 2003 EDT Modified files: /php-src/ext/simplexml/tests016.phpt Log: Fix test Index: php-src/ext/simplexml/tests/016.phpt diff -u php-src/ext/simplexml/tests/016.phpt:1.2 php-src/ext/simplexml/tests/016.phpt:1.3 --- php-src/ext/simplexml/tests/016.phpt:1.2Thu Dec 18 08:35:39 2003 +++ php-src/ext/simplexml/tests/016.phptMon Dec 22 18:15:34 2003 @@ -30,10 +30,10 @@ ? --EXPECT-- string(3) Joe -string(3) JoeFoo -string(3) JoeFooBar +string(6) JoeFoo +string(9) JoeFooBar ---[0]--- string(3) Joe -string(3) JoeFoo -string(3) JoeFooBar +string(6) JoeFoo +string(9) JoeFooBar ---Done--- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session/tests 019.phpt
helly Mon Dec 22 18:17:17 2003 EDT
Modified files:
/php-src/ext/session/tests 019.phpt
Log:
Preserve casing
Index: php-src/ext/session/tests/019.phpt
diff -u php-src/ext/session/tests/019.phpt:1.7 php-src/ext/session/tests/019.phpt:1.8
--- php-src/ext/session/tests/019.phpt:1.7 Sun Nov 30 08:57:16 2003
+++ php-src/ext/session/tests/019.phpt Mon Dec 22 18:17:17 2003
@@ -48,24 +48,24 @@
--EXPECTF--
array(2) {
[o1]=
- object(tfoo)#1 (1) {
+ object(TFoo)#%d (1) {
[c]=
int(42)
}
[o2]=
- object(tfoo)#1 (1) {
+ object(TFoo)#%d (1) {
[c]=
int(42)
}
}
array(2) {
[o1]=
- object(tfoo)#1 (1) {
+ object(TFoo)#%d (1) {
[c]=
int(44)
}
[o2]=
- object(tfoo)#1 (1) {
+ object(TFoo)#%d (1) {
[c]=
int(44)
}
--
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/serialize 001.phpt
helly Mon Dec 22 18:23:07 2003 EDT
Modified files:
/php-src/ext/standard/tests/serialize 001.phpt
Log:
Fix test
Index: php-src/ext/standard/tests/serialize/001.phpt
diff -u php-src/ext/standard/tests/serialize/001.phpt:1.5
php-src/ext/standard/tests/serialize/001.phpt:1.6
--- php-src/ext/standard/tests/serialize/001.phpt:1.5 Mon May 5 15:57:32 2003
+++ php-src/ext/standard/tests/serialize/001.phpt Mon Dec 22 18:23:06 2003
@@ -14,11 +14,16 @@
class s
{
+ public $a;
+ public $b;
+ public $c;
+
function s()
{
$this-a = hallo;
$this-b = php;
$this-c = world;
+ $this-d = !;
}
function __sleep()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap config.w32 php_imap.def
fmk Mon Dec 22 18:30:21 2003 EDT
Removed files:
/php-src/ext/imap php_imap.def
Modified files:
/php-src/ext/imap config.w32
Log:
No need for these trick when linking with a correct cclient.lib
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.2 php-src/ext/imap/config.w32:1.3
--- php-src/ext/imap/config.w32:1.2 Fri Dec 19 07:53:41 2003
+++ php-src/ext/imap/config.w32 Mon Dec 22 18:30:20 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/19 12:53:41 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/22 23:30:20 fmk Exp $
// vim:ft=javascript
ARG_WITH(imap, IMAP Support, no);
@@ -14,11 +14,7 @@
EXTENSION(imap, php_imap.c);
ADD_FLAG(CFLAGS_IMAP, /D HAVE_IMAP2000=1);
- ADD_FLAG(LDFLAGS_IMAP, /nodefaultlib:LIBCMT);
AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
- if (!PHP_IMAP_SHARED) {
- ADD_DEF_FILE(ext\\imap\\php_imap.def);
- }
} else {
WARNING(imap 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 / README.SUBMITTING_PATCH /ext/exif/tests exif005.phpt /ext/standard/tests/strings str_shuffle.phpt strtr.phpt
helly Mon Dec 22 18:45:54 2003 EDT Modified files: /php-src/ext/exif/tests exif005.phpt /php-srcREADME.SUBMITTING_PATCH /php-src/ext/standard/tests/strings str_shuffle.phpt strtr.phpt Log: Typos found by Petras Kudaras. Index: php-src/ext/exif/tests/exif005.phpt diff -u php-src/ext/exif/tests/exif005.phpt:1.5 php-src/ext/exif/tests/exif005.phpt:1.6 --- php-src/ext/exif/tests/exif005.phpt:1.5 Mon Dec 16 09:54:35 2002 +++ php-src/ext/exif/tests/exif005.phpt Mon Dec 22 18:45:52 2003 @@ -7,7 +7,7 @@ zlib.output_compression=0 --FILE-- ?php -/* Do not change this test it is a REATME.TESTING example. +/* Do not change this test it is a README.TESTING example. * test5.jpg is a 1*1 image that contains an Exif section with ifd = 0009h */ $image = exif_read_data(dirname(__FILE__).'/test5.jpg','',true,false); Index: php-src/README.SUBMITTING_PATCH diff -u php-src/README.SUBMITTING_PATCH:1.7 php-src/README.SUBMITTING_PATCH:1.8 --- php-src/README.SUBMITTING_PATCH:1.7 Tue Jul 8 05:43:39 2003 +++ php-src/README.SUBMITTING_PATCH Mon Dec 22 18:45:52 2003 @@ -90,7 +90,7 @@ to include the patch as a MIME attachment even if it is short. NOTE: only MIME attachments of type 'text/*' are accepted. The - easiest way to acclomplish this, is to make the extension + easiest way to accomplish this, is to make the extension '.txt'. Test scripts should be included in the same email. @@ -100,7 +100,7 @@ What happens after you submit your patch --- + If your patch is easy to review and has obviously no side-effects, it might take up to a few hours until someone commits it. Index: php-src/ext/standard/tests/strings/str_shuffle.phpt diff -u php-src/ext/standard/tests/strings/str_shuffle.phpt:1.1 php-src/ext/standard/tests/strings/str_shuffle.phpt:1.2 --- php-src/ext/standard/tests/strings/str_shuffle.phpt:1.1 Fri Oct 25 06:46:19 2002 +++ php-src/ext/standard/tests/strings/str_shuffle.phpt Mon Dec 22 18:45:53 2003 @@ -2,7 +2,7 @@ Testing str_shuffle. --FILE-- ?php -/* Do not change this test it is a REATME.TESTING example. */ +/* Do not change this test it is a README.TESTING example. */ $s = '123'; var_dump(str_shuffle($s)); var_dump($s); Index: php-src/ext/standard/tests/strings/strtr.phpt diff -u php-src/ext/standard/tests/strings/strtr.phpt:1.3 php-src/ext/standard/tests/strings/strtr.phpt:1.4 --- php-src/ext/standard/tests/strings/strtr.phpt:1.3 Fri Oct 25 06:46:19 2002 +++ php-src/ext/standard/tests/strings/strtr.phpt Mon Dec 22 18:45:53 2003 @@ -2,7 +2,7 @@ strtr() function --FILE-- ?php -/* Do not change this test it is a REATME.TESTING example. */ +/* Do not change this test it is a README.TESTING example. */ $trans = array(hello=hi, hi=hello, a=A, world=planet); var_dump(strtr(# hi all, I said hello world! #, $trans)); ? -- 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
fmk Mon Dec 22 19:17:15 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Fix build when both a path and the keyword shared is given
Now works for both path,shared and shared,path
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.25 php-src/win32/build/confutils.js:1.26
--- php-src/win32/build/confutils.js:1.25 Mon Dec 22 17:33:43 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 19:17:15 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.25 2003/12/22 22:33:43 wez Exp $
+// $Id: confutils.js,v 1.26 2003/12/23 00:17:15 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -157,9 +157,12 @@
argval = yes;
} else if (argval == null) {
/* nothing */
- } else if (argval.match(new RegExp(^shared,(.* {
+ } else if (args = argval.match(new RegExp(^shared,(.* {
shared = true;
- argval = $1;
+ argval = args[1];
+ } else if (args = argval.match(new RegExp((.*),shared$))) {
+ shared = true;
+ argval = args[1];
}
ret[0] = shared;
--
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
fmk Mon Dec 22 19:36:33 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Use a variable name so this actually works.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.26 php-src/win32/build/confutils.js:1.27
--- php-src/win32/build/confutils.js:1.26 Mon Dec 22 19:17:15 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 19:36:32 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.26 2003/12/23 00:17:15 fmk Exp $
+// $Id: confutils.js,v 1.27 2003/12/23 00:36:32 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -157,12 +157,12 @@
argval = yes;
} else if (argval == null) {
/* nothing */
- } else if (args = argval.match(new RegExp(^shared,(.* {
+ } else if (arg_match = argval.match(new RegExp(^shared,(.* {
shared = true;
- argval = args[1];
- } else if (args = argval.match(new RegExp((.*),shared$))) {
+ argval = arg_match[1];
+ } else if (arg_match = argval.match(new RegExp(^(.*),shared$))) {
shared = true;
- argval = args[1];
+ argval = arg_match[1];
}
ret[0] = shared;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build buildconf.js
wez Mon Dec 22 20:54:07 2003 EDT
Modified files:
/php-src/win32/buildbuildconf.js
Log:
win32 buildconf now honours extension dependencies and will
try its best to ensure that the config.w32 files are amalgamated
in such a way that modules are processed before their dependents.
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.7 php-src/win32/build/buildconf.js:1.8
--- php-src/win32/build/buildconf.js:1.7Mon Dec 22 10:01:05 2003
+++ php-src/win32/build/buildconf.jsMon Dec 22 20:54:07 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.7 2003/12/22 15:01:05 wez Exp $ */
+/* $Id: buildconf.js,v 1.8 2003/12/23 01:54:07 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -24,7 +24,7 @@
var C = FSO.CreateTextFile(configure.js, true);
var modules = ;
-var seen = new Array();
+var MODULES = WScript.CreateObject(Scripting.Dictionary);
function file_get_contents(filename)
{
@@ -34,6 +34,15 @@
return t;
}
+function Module_Item(module_name, config_path, dir_line, deps, content)
+{
+ this.module_name = module_name;
+ this.config_path = config_path;
+ this.dir_line = dir_line;
+ this.deps = deps;
+ this.content = content;
+}
+
function find_config_w32(dirname)
{
if (!FSO.FolderExists(dirname)) {
@@ -43,6 +52,9 @@
var f = FSO.GetFolder(dirname);
var fc = new Enumerator(f.SubFolders);
var c, i, ok, n;
+ var item = null;
+ var re_dep_line = new
RegExp(ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\]([^'\]+)['\]\\);, gm);
+
for (; !fc.atEnd(); fc.moveNext())
{
ok = true;
@@ -54,13 +66,7 @@
continue;
// WScript.StdOut.WriteLine(checking + dirname + / + n);
- for (i = 0; i seen.length; i++) {
- if (seen[i] == n) {
- ok = false;
- break;
- }
- }
- if (!ok) {
+ if (MODULES.Exists(n)) {
WScript.StdOut.WriteLine(Skipping + dirname + / + n +
-- already have a module with that name);
continue;
}
@@ -68,13 +74,78 @@
c = FSO.BuildPath(fc.item(), config.w32);
if (FSO.FileExists(c)) {
- //WScript.StdOut.WriteLine(c);
- modules += configure_module_dirname =
condense_path(FSO.GetParentFolderName(' + c.replace(new RegExp('([])', g),
'\\$1') + '));\r\n;
- modules += file_get_contents(c);
+// WScript.StdOut.WriteLine(c);
+
+ var dir_line = configure_module_dirname =
condense_path(FSO.GetParentFolderName('
+ + c.replace(new
RegExp('([])', g), '\\$1') + '));\r\n;
+ var contents = file_get_contents(c);
+ var deps = new Array();
+
+ // parse out any deps from the file
+ var calls = contents.match(re_dep_line);
+ if (calls != null) {
+ for (i = 0; i calls.length; i++) {
+ // now we need the extension name out of this
thing
+ if (calls[i].match(re_dep_line)) {
+// WScript.StdOut.WriteLine(n depends on
+ RegExp.$1);
+ deps[deps.length] = RegExp.$1;
+ }
+ }
+ }
+
+ item = new Module_Item(n, c, dir_line, deps, contents);
+ MODULES.Add(n, item);
+ }
+ }
+}
+
+function emit_module(item)
+{
+ return item.dir_line + item.content;
+}
+
+function emit_dep_modules(module_names)
+{
+ var i, mod_name, j;
+ var output = ;
+
+ for (i in module_names) {
+ mod_name = module_names[i];
+
+ if (!MODULES.Exists(mod_name)) {
+ output += emit_module(item);
+ continue;
+ }
- seen[seen.length] = n;
+ item = MODULES.Item(mod_name);
+ output += emit_dep_modules(item.deps);
+ }
+
+ return output;
+}
+
+function gen_modules()
+{
+ var module_names = (new VBArray(MODULES.Keys())).toArray();
+ var i, mod_name, j;
+ var item;
+ var output = ;
+
+ // first, look for modules with empty deps; emit those first
+
[PHP-CVS] cvs: php-src / README.WIN32-BUILD-SYSTEM
wez Mon Dec 22 21:51:19 2003 EDT Modified files: /php-srcREADME.WIN32-BUILD-SYSTEM Log: Now that it has matured somewhat, don't discourage questions about it quite so strongly. Add note about snapshot building. # If you are building official snapshots, you need Edin's treasure-trove # of libraries/headers and the snapshot template Index: php-src/README.WIN32-BUILD-SYSTEM diff -u php-src/README.WIN32-BUILD-SYSTEM:1.3 php-src/README.WIN32-BUILD-SYSTEM:1.4 --- php-src/README.WIN32-BUILD-SYSTEM:1.3 Sat Dec 6 05:31:02 2003 +++ php-src/README.WIN32-BUILD-SYSTEM Mon Dec 22 21:51:18 2003 @@ -1,12 +1,9 @@ The Win32 Build System. -$Id: README.WIN32-BUILD-SYSTEM,v 1.3 2003/12/06 10:31:02 wez Exp $ +$Id: README.WIN32-BUILD-SYSTEM,v 1.4 2003/12/23 02:51:18 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 :-) +If you need help with the build system, send mail to [EMAIL PROTECTED]; please don't email me directly. === Contents: @@ -18,6 +15,7 @@ e. Building f. Cleaning up g. Running the test suite + h. snapshot building 2. How to write config.w32 files x. to be written. @@ -28,9 +26,8 @@ You need: - Windows Scripting Host (cscript.exe) - - Microsoft Build Tools from either: + - Microsoft Build Tools from: Microsoft Visual Studio (VC6) or later - Microsoft Platform SDK You also need: - bindlib_w32 [http://www.php.net/extra/bindlib_w32.zip] @@ -159,5 +156,19 @@ sqlite test suite only, you would type nmake /D TESTS=ext/sqlite/tests test +h. Snapshot Building + + If you want to set up an automated build that will tolerate + breakages in some of the modules, you can use the + --enable-snapshot-build configure option to generate a + makefile optimized for that purpose. A snapshot build will + switch the argument parser so that the default option for + configure switches that your don't specify will be set + to shared. The effect of this is to turn on all options + unless you explicitly disable them. When you have configured + your snapshot build, you can use nmake build-snap to build + everything, ignoring build errors in individual extensions + or SAPI. + vim:tw=78:sw=1:ts=1:et -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
georg Tue Dec 23 01:28:13 2003 EDT Modified files: /php-srcNEWS Log: #fixed bug #26680 Index: php-src/NEWS diff -u php-src/NEWS:1.1554 php-src/NEWS:1.1555 --- php-src/NEWS:1.1554 Mon Dec 22 17:59:44 2003 +++ php-src/NEWSTue Dec 23 01:28:12 2003 @@ -6,6 +6,7 @@ (Marcus) - Fixed bug #26690 (make xsltProcessor-transformToUri use streams wrappers). (Ilia) +- Fixed bug #26680 (Added version check in mysqli_report_index) (Georg) - Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus) 21 Dec 2003, PHP 5 Beta 3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
