Re: [PHP-CVS] cvs: php-src /win32/build Makefile
You're welcome to submit a patch ;-) --Wez. From: "Hartmut Holzgraefe" <[EMAIL PROTECTED]> > Wez Furlong wrote: > > + @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) > > @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul > > @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >nul > > what if that fails? ;) -- 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
wez Thu Feb 12 08:01:15 2004 EDT Modified files: /php-src/win32/buildMakefile Log: ensure that install exists before copying files. http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.19&r2=1.20&ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.19 php-src/win32/build/Makefile:1.20 --- php-src/win32/build/Makefile:1.19 Thu Feb 12 07:30:41 2004 +++ php-src/win32/build/MakefileThu Feb 12 08:01:14 2004 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.19 2004/02/12 12:30:41 wez Exp $ +# $Id: Makefile,v 1.20 2004/02/12 13:01:14 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -110,6 +110,7 @@ $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" install: all + @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >nul -- 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 buildconf.js confutils.js
wez Thu Feb 12 07:30:43 2004 EDT
Modified files:
/php-src/win32/buildMakefile buildconf.js confutils.js
Log:
Tidy up "nmake clean" for people that don't have a PECL checkout.
Be paranoid when building a snapshot: if the module is not a core
module (eg: it comes from outside of ext or sapi) and it defaults to "yes",
then force it to become shared. This will prevent a pecl ext from
accidentally being compiled statically into the core, and prevent that
ext from breaking the core build. You can still manually force a static
build by explicitly specifying the args for that extension on your configure
line.
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.18&r2=1.19&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.18 php-src/win32/build/Makefile:1.19
--- php-src/win32/build/Makefile:1.18 Fri Jan 9 20:11:42 2004
+++ php-src/win32/build/MakefileThu Feb 12 07:30:41 2004
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.18 2004/01/10 01:11:42 wez Exp $
+# $Id: Makefile,v 1.19 2004/02/12 12:30:41 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -65,15 +65,15 @@
clean-sapi:
@echo Cleaning SAPI
- @for %D in ($(EXT_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL
- @for %D in ($(PECL_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL
- @for %D in ($(SAPI_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL
- @del /F /Q $(BUILD_DIR)\$(PHPDLL)
+ @for %D in (_x $(EXT_TARGETS)) do @if exist $(BUILD_DIR)\%D @del /F /Q
$(BUILD_DIR)\%D > NUL
+ @for %D in (_x $(PECL_TARGETS)) do @if exist $(BUILD_DIR)\%D @del /F /Q
$(BUILD_DIR)\%D > NUL
+ @for %D in (_x $(SAPI_TARGETS)) do @if exist $(BUILD_DIR)\%D @del /F /Q
$(BUILD_DIR)\%D > NUL
+ [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\$(PHPDLL)
clean: clean-sapi
- @echo Cleaning
- @for %D in ($(BUILD_DIRS_SUB)) do @del /F /Q %D\*.* > NUL
- @del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip > NUL
+ @echo Cleaning build dirs
+ @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist @del /F /Q %D\*.* > NUL
+ [EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip > NUL
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
test:
@@ -84,9 +84,9 @@
build-snap:
@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
- for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
- for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
- for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
+ -for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
+ -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
+ -for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T"
build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
http://cvs.php.net/diff.php/php-src/win32/build/buildconf.js?r1=1.10&r2=1.11&ty=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.10 php-src/win32/build/buildconf.js:1.11
--- php-src/win32/build/buildconf.js:1.10 Thu Jan 8 16:53:48 2004
+++ php-src/win32/build/buildconf.jsThu Feb 12 07:30:41 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.10 2004/01/08 21:53:48 wez Exp $ */
+/* $Id: buildconf.js,v 1.11 2004/02/12 12:30:41 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -99,6 +99,30 @@
}
}
+// Emit core modules array. This is used by a snapshot
+// build to override a default "yes" value so that external
+// modules don't break the build by becoming statically compiled
+function emit_core_module_list()
+{
+ var module_names = (new VBArray(MODULES.Keys())).toArray();
+ var i, mod_name, j;
+ var item;
+ var output = "";
+
+ C.WriteLine("core_module_list = new Array(");
+
+ // first, look for modules with empty deps; emit those first
+ for (i in module_names) {
+ mod_name = module_names[i];
+ C.WriteLine("\"" + mod_name.replace(/_/g, "-") + "\",");
+ }
+
+ C.WriteLine("false // dummy");
+
+ C.WriteLine(");");
+}
+
+
function emit_module(item)
{
return item.
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c
wez Thu Feb 12 07:11:22 2004 EDT Modified files: /php-src/ext/com_dotnet com_handlers.c Log: fix copy-n-past error in constructor. Spotted by Eric Colinet. http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.16 php-src/ext/com_dotnet/com_handlers.c:1.17 --- php-src/ext/com_dotnet/com_handlers.c:1.16 Thu Feb 12 05:43:19 2004 +++ php-src/ext/com_dotnet/com_handlers.c Thu Feb 12 07:11:21 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_handlers.c,v 1.16 2004/02/12 10:43:19 zeev Exp $ */ +/* $Id: com_handlers.c,v 1.17 2004/02/12 12:11:21 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -392,10 +392,10 @@ #endif case 'c': - POPULATE_CTOR(d, com_create_instance); + POPULATE_CTOR(c, com_create_instance); case 'v': - POPULATE_CTOR(d, com_variant_create_instance); + POPULATE_CTOR(v, com_variant_create_instance); default: return NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Thu Feb 12 06:55:16 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Fix build; line continuation character should be the very last character
on a line, otherwise things b0rk.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.24&r2=1.25&ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.24 php-src/win32/build/config.w32:1.25
--- php-src/win32/build/config.w32:1.24 Thu Feb 12 05:53:08 2004
+++ php-src/win32/build/config.w32 Thu Feb 12 06:55:16 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.24 2004/02/12 10:53:08 edink Exp $
+// $Id: config.w32,v 1.25 2004/02/12 11:55:16 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -175,7 +175,7 @@
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_exceptions.c \
+ zend_constants.c zend_dynamic_array.c zend_exceptions.c \
zend_execute_API.c zend_highlight.c \
zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap config.w32
wez Fri Feb 6 04:18:55 2004 EDT
Modified files:
/php-src/ext/soap config.w32
Log:
prefer != "no" over = "yes". (it doesn't really matter for ext/soap, but
it's still the best practice).
http://cvs.php.net/diff.php/php-src/ext/soap/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/soap/config.w32
diff -u php-src/ext/soap/config.w32:1.3 php-src/ext/soap/config.w32:1.4
--- php-src/ext/soap/config.w32:1.3 Fri Feb 6 03:01:35 2004
+++ php-src/ext/soap/config.w32 Fri Feb 6 04:18:51 2004
@@ -1,9 +1,9 @@
-// $Id: config.w32,v 1.3 2004/02/06 08:01:35 dmitry Exp $
+// $Id: config.w32,v 1.4 2004/02/06 09:18:51 wez Exp $
// vim:ft=javascript
ARG_WITH("soap", "SOAP support", "no");
-if (PHP_SOAP == "yes" && PHP_LIBXML == "yes") {
+if (PHP_SOAP != "no" && PHP_LIBXML == "yes") {
EXTENSION('soap', 'soap.c php_encoding.c php_http.c php_packet_soap.c
php_schema.c php_sdl.c php_xml.c');
AC_DEFINE('HAVE_PHP_SOAP', 1, "SOAP support");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
It should be more like 4.2.x and return in a very short time;
it returns immediately for me using php5 + my patch.
Is your default_socket_timeout set to 30 seconds?
--Wez.
- Original Message -
From: "Jani Taskinen" <[EMAIL PROTECTED]>
To: "Wez Furlong" <[EMAIL PROTECTED]>
Cc: "Wez Furlong" <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>
Sent: Thursday, February 05, 2004 1:31 AM
Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c
xp_socket.c
>
> I'm propably missing the point..but that test completes
> without any errors in ~30 secs with latest builds of both
> PHP_4_3 and HEAD. (HEAD without your patch does exactly same..)
>
> (propably irrelevant, but with 4.2.3 it completes in less
> than a second, also without any errors)
>
> --Jani
>
> On Thu, 5 Feb 2004, Wez Furlong wrote:
>
> >Possibly :)
> >I found the code hanging around in my tree after being there for a week
or
> >more;
> >I can't remember what I was working towards when I wrote it, and I'm a
> >little
> >too busy to check into it right now.
> >
> >Try this with php4.3:
> >
> >php -r '$fp = pfsockopen("localhost",80); $fp =
pfsockopen("localhost",80);'
> >
> >the patch needs MFH'ing if that takes ~60 seconds to complete with no
> >error message; I'll merge it if it needs doing (it won't be simple since
> >the guts have changed from 4.3 to 5).
> >
> >--Wez.
> >
> >- Original Message -
> >From: "Jani Taskinen" <[EMAIL PROTECTED]>
> >To: "Wez Furlong" <[EMAIL PROTECTED]>
> >Cc: <[EMAIL PROTECTED]>
> >Sent: Thursday, February 05, 2004 12:53 AM
> >Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c
> >xp_socket.c
> >
> >
> >>
> >> Does this fix have possibly anything to do with bug #26863 ??
> >> And how about doing a nice little MFH?
> >
> >
>
>
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
Possibly :)
I found the code hanging around in my tree after being there for a week or
more;
I can't remember what I was working towards when I wrote it, and I'm a
little
too busy to check into it right now.
Try this with php4.3:
php -r '$fp = pfsockopen("localhost",80); $fp = pfsockopen("localhost",80);'
the patch needs MFH'ing if that takes ~60 seconds to complete with no
error message; I'll merge it if it needs doing (it won't be simple since
the guts have changed from 4.3 to 5).
--Wez.
- Original Message -----
From: "Jani Taskinen" <[EMAIL PROTECTED]>
To: "Wez Furlong" <[EMAIL PROTECTED]>
Cc: <[EMAIL PROTECTED]>
Sent: Thursday, February 05, 2004 12:53 AM
Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c
xp_socket.c
>
> Does this fix have possibly anything to do with bug #26863 ??
> And how about doing a nice little MFH?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
wez Wed Feb 4 17:46:45 2004 EDT
Modified files:
/php-src/main/streams streams.c transports.c xp_socket.c
Log:
Fix a bug in the persistent socket liveness checks and feof(); they were
using the default socket timeout of 60 seconds before returning the socket
to the calling script. The reason they were using that value is that the
same code is used for feof(), so the fix is allowing the caller to
indicate the timeout value for liveness checks.
A possible remaining issue now is that 0 second timeout[1] for pfsockopen
is possibly too short; it's impossible to specify a sane value for all
possible uses, so maybe we need a stream context or an .ini option to
control this, or maybe use the timeout value that was passed to
pfsockopen().
# [1] by timeout, I mean the time that PHP will wait for data on a
# persistent socket before deciding if a new connection should be made;
# NOT the timeout while waiting for a new connection to be established.
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.48&r2=1.49&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.48 php-src/main/streams/streams.c:1.49
--- php-src/main/streams/streams.c:1.48 Wed Jan 28 17:21:54 2004
+++ php-src/main/streams/streams.c Wed Feb 4 17:46:44 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.48 2004/01/28 22:21:54 pollita Exp $ */
+/* $Id: streams.c,v 1.49 2004/02/04 22:46:44 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -602,9 +602,10 @@
return 0;
}
+ /* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS,
- 0, NULL)) {
+ -1, NULL)) {
stream->eof = 1;
}
http://cvs.php.net/diff.php/php-src/main/streams/transports.c?r1=1.11&r2=1.12&ty=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.11 php-src/main/streams/transports.c:1.12
--- php-src/main/streams/transports.c:1.11 Tue Jan 27 17:40:44 2004
+++ php-src/main/streams/transports.c Wed Feb 4 17:46:44 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: transports.c,v 1.11 2004/01/27 22:40:44 wez Exp $ */
+/* $Id: transports.c,v 1.12 2004/02/04 22:46:44 wez Exp $ */
#include "php.h"
#include "php_streams_int.h"
@@ -74,6 +74,8 @@
if (persistent_id) {
switch(php_stream_from_persistent_id(persistent_id, &stream
TSRMLS_CC)) {
case PHP_STREAM_PERSISTENT_SUCCESS:
+ /* use a 0 second timeout when checking if the socket
+* has already died */
if (PHP_STREAM_OPTION_RETURN_OK ==
php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL)) {
return stream;
}
http://cvs.php.net/diff.php/php-src/main/streams/xp_socket.c?r1=1.21&r2=1.22&ty=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.21 php-src/main/streams/xp_socket.c:1.22
--- php-src/main/streams/xp_socket.c:1.21 Thu Jan 8 03:17:59 2004
+++ php-src/main/streams/xp_socket.cWed Feb 4 17:46:44 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.21 2004/01/08 08:17:59 andi Exp $ */
+/* $Id: xp_socket.c,v 1.22 2004/02/04 22:46:44 wez Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -230,10 +230,14 @@
char buf;
int alive = 1;
- if (sock->timeout.tv_sec == -1) {
- tv.tv_sec = FG(default_socket_timeout);
+ if (value == -1) {
+ if (sock->timeout.tv_sec == -1) {
+ tv.tv_sec = FG(default_socket_timeout);
+ } else {
+ tv = sock->timeout;
+ }
} else {
- tv = sock->timeout;
+ tv.tv_sec = value;
}
if (sock->socket == -1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard var.c var_unserializer.c var_unserializer.re
You'll probably want to touch var_unserializer.c and commit it so that people without re2c don't get bitten :-) --Wez. - Original Message - From: "Stanislav Malyshev" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Tuesday, February 03, 2004 2:13 PM Subject: [PHP-CVS] cvs: php-src /ext/standard var.c var_unserializer.c var_unserializer.re > stas Tue Feb 3 09:13:06 2004 EDT > > Modified files: > /php-src/ext/standard var.c var_unserializer.c var_unserializer.re > Log: > fix bug #27120 and bug #25975 - preserve is_ref when bound > objects are serialized > > > -- > 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 / CODING_STANDARDS
wez Fri Jan 30 05:15:30 2004 EDT Modified files: /php-srcCODING_STANDARDS Log: word fix http://cvs.php.net/diff.php/php-src/CODING_STANDARDS?r1=1.31&r2=1.32&ty=u Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.31 php-src/CODING_STANDARDS:1.32 --- php-src/CODING_STANDARDS:1.31 Fri Jan 30 02:53:12 2004 +++ php-src/CODING_STANDARDSFri Jan 30 05:15:24 2004 @@ -204,7 +204,7 @@ four spaces. It is important to maintain consistency in indenture so that definitions, comments, and control structures line up correctly. -[5] Precompiler statements (#if and such) MUST start at column one. To +[5] Preprocessor statements (#if and such) MUST start at column one. To indent preprocessor directives you should put the # at the beginning of a line, followed by any number of whitespace. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams transports.c
wez Tue Jan 27 17:40:45 2004 EDT
Modified files:
/php-src/main/streams transports.c
Log:
Fix segfault for scripts like this:
Where the transport fails to connect (since args are bogus);
the problem was that the persistent stream entry was not
correctly freed.
http://cvs.php.net/diff.php/php-src/main/streams/transports.c?r1=1.10&r2=1.11&ty=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.10 php-src/main/streams/transports.c:1.11
--- php-src/main/streams/transports.c:1.10 Thu Jan 8 03:17:59 2004
+++ php-src/main/streams/transports.c Tue Jan 27 17:40:44 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: transports.c,v 1.10 2004/01/08 08:17:59 andi Exp $ */
+/* $Id: transports.c,v 1.11 2004/01/27 22:40:44 wez Exp $ */
#include "php.h"
#include "php_streams_int.h"
@@ -163,7 +163,11 @@
if (failed) {
/* failure means that they don't get a stream to play with */
- php_stream_close(stream);
+ if (persistent_id) {
+ php_stream_pclose(stream);
+ } else {
+ php_stream_close(stream);
+ }
stream = NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
I thought that the 4.3 branch was off limits except for critical bug fixes. --Wez. - Original Message - From: "Moriyoshi Koizumi" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Monday, January 26, 2004 12:27 AM Subject: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c > moriyoshi Sun Jan 25 19:27:54 2004 EDT > > Modified files: (Branch: PHP_4_3) > /php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.c > Log: > - MFH(r-1.3): Suppress a compiler warning by a rather useless typecasting. > > > http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c?r1=1.1.2.2&r2=1.1.2.3&ty=u > Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c > diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.2 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.3 > --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.2 Sun Jan 25 19:21:57 2004 > +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Sun Jan 25 19:27:54 2004 > @@ -44,7 +44,7 @@ > mbfl_no_encoding_8bit, > "8bit", > "8bit", > - &mbfl_encoding_8bit_aliases, > + (const char *(*)[])&mbfl_encoding_8bit_aliases, > NULL, > MBFL_ENCTYPE_SBCS > }; > > -- > 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/spl config.w32
wez Tue Jan 20 12:18:42 2004 EDT
Modified files:
/php-src/ext/splconfig.w32
Log:
default to compiled in to match unix.
http://cvs.php.net/diff.php/php-src/ext/spl/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.3 php-src/ext/spl/config.w32:1.4
--- php-src/ext/spl/config.w32:1.3 Mon Jan 19 03:31:16 2004
+++ php-src/ext/spl/config.w32 Tue Jan 20 12:18:41 2004
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.3 2004/01/19 08:31:16 sebastian Exp $
+// $Id: config.w32,v 1.4 2004/01/20 17:18:41 wez Exp $
// vim:ft=javascript
-ARG_ENABLE("spl", "SPL (Standard PHP Library) support", "no");
+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 spl_sxe.c");
--
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 README
wez Tue Jan 20 06:01:17 2004 EDT Modified files: /php-src/ext/com_dotnet README Log: update todo part of readme http://cvs.php.net/diff.php/php-src/ext/com_dotnet/README?r1=1.2&r2=1.3&ty=u Index: php-src/ext/com_dotnet/README diff -u php-src/ext/com_dotnet/README:1.2 php-src/ext/com_dotnet/README:1.3 --- php-src/ext/com_dotnet/README:1.2 Sat Jan 17 07:59:13 2004 +++ php-src/ext/com_dotnet/README Tue Jan 20 06:01:16 2004 @@ -65,14 +65,9 @@ TODO: -- Dispatch wrapper for PHP objects. - The wrapper will enable you to sink events sourced from COM objects, - and allow ActiveScript sapi to function again. -- Indexed array function for (g|s)etting array-style properties that are not - actually arrays. -- SafeArray support for variant class. - Currently there is no way to access a safearray from php. -- A few other com_xxx functions need to be ported from the PHP 4 extension. +- Mapping PHP arrays as SafeArray's. This is currently not done. + Probably will implement this into $a = new variant($php_array, VT_ARRAY) + or something similar. - documentation * dotnet support requires that you have the mscoree.h header from the .net sdk -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/libsqlite/src sqlite.w32.h
wez Fri Jan 16 18:48:40 2004 EDT Modified files: /php-src/ext/sqlite/libsqlite/src sqlite.w32.h Log: update file for win32 build Index: php-src/ext/sqlite/libsqlite/src/sqlite.w32.h diff -u php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.4 php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.5 --- php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.4 Thu Jan 8 11:18:38 2004 +++ php-src/ext/sqlite/libsqlite/src/sqlite.w32.h Fri Jan 16 18:48:39 2004 @@ -12,7 +12,7 @@ ** This header file defines the interface that the SQLite library ** presents to client programs. ** -** @(#) $Id: sqlite.w32.h,v 1.4 2004/01/08 16:18:38 wez Exp $ +** @(#) $Id: sqlite.w32.h,v 1.5 2004/01/16 23:48:39 wez Exp $ */ #ifndef _SQLITE_H_ #define _SQLITE_H_ @@ -28,7 +28,7 @@ /* ** The version of the SQLite library. */ -#define SQLITE_VERSION "2.8.9" +#define SQLITE_VERSION "2.8.11" /* ** The version string is also compiled into the library so that a program -- 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) /main network.c
wez Wed Jan 14 09:54:15 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main network.c
Log:
Probable fix for:
Bug #25575 stream_set_blocking with STDIN doesnt block
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.83.2.22 php-src/main/network.c:1.83.2.23
--- php-src/main/network.c:1.83.2.22Sat Nov 29 07:02:40 2003
+++ php-src/main/network.c Wed Jan 14 09:54:14 2004
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: network.c,v 1.83.2.22 2003/11/29 12:02:40 wez Exp $ */
+/* $Id: network.c,v 1.83.2.23 2004/01/14 14:54:14 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -628,6 +628,22 @@
memset(sock, 0, sizeof(php_netstream_data_t));
sock->is_blocked = 1;
+
+#if !defined(PHP_WIN32) && (defined(O_NONBLOCK) || defined(O_NDELAY))
+ if (socket >= 0 && socket < 3) {
+ /* mini-hack: if we are opening stdin, stdout or stderr,
+* we need to check to see if they are currently in
+* blocking or non-blocking mode. */
+ int flags = fcntl(socket, F_GETFL);
+
+#ifdef O_NONBLOCK
+ sock->is_blocked = !(flags & O_NONBLOCK);
+#else
+ sock->is_blocked = !(flags & O_NDELAY);
+#endif
+ }
+#endif
+
sock->timeout.tv_sec = FG(default_socket_timeout);
sock->timeout.tv_usec = 0;
sock->socket = socket;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
wez Wed Jan 14 09:37:39 2004 EDT
Modified files:
/php-src/ext/standard file.c
Log:
Remove stale code from flock();
spotted by Hartmut.
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.375 php-src/ext/standard/file.c:1.376
--- php-src/ext/standard/file.c:1.375 Wed Jan 14 09:25:01 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:37:38 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.375 2004/01/14 14:25:01 wez Exp $ */
+/* $Id: file.c,v 1.376 2004/01/14 14:37:38 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -247,7 +247,7 @@
PHP_FUNCTION(flock)
{
zval *arg1, *arg3 = NULL;
- int fd, act;
+ int act;
php_stream *stream;
long operation = 0;
@@ -257,10 +257,6 @@
php_stream_from_zval(stream, &arg1);
- if (php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fd, 1) == FAILURE) {
- RETURN_FALSE;
- }
-
act = operation & 3;
if (act < 1 || act > 3) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal operation
argument");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard file.c
wez Wed Jan 14 09:31:28 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard file.c
Log:
Fixed bug #26772 (fgets returns NULL instead of FALSE). (Wez)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.524 php-src/NEWS:1.1247.2.525
--- php-src/NEWS:1.1247.2.524 Tue Jan 13 18:31:44 2004
+++ php-src/NEWSWed Jan 14 09:31:25 2004
@@ -4,6 +4,7 @@
- Fixed bug #26878 (problem with multiple references to the same variable
with different types). (Ilia)
- Fixed bug #26896 (ext/ftp does not work as shared extension). (Jani)
+- Fixed bug #26772 (fgets returns NULL instead of FALSE). (Wez)
12 Jan 2004, Version 4.3.5RC1
- Synchronized bundled GD library with GD 2.0.17
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.52 php-src/ext/standard/file.c:1.279.2.53
--- php-src/ext/standard/file.c:1.279.2.52 Fri Jan 2 19:50:01 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:31:27 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.52 2004/01/03 00:50:01 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.53 2004/01/14 14:31:27 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1363,7 +1363,11 @@
WRONG_PARAM_COUNT;
}
- php_stream_from_zval(stream, arg1);
+ php_stream_from_zval_no_verify(stream, arg1);
+ if (stream == NULL) {
+ /* want a false return value here */
+ goto exit_failed;
+ }
if (argc == 1) {
/* ask streams to give us a buffer of an appropriate size */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
wez Wed Jan 14 09:25:02 2004 EDT
Modified files:
/php-src/ext/standard file.c
Log:
Fix #26772: fgets returns NULL instead of FALSE.
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.374 php-src/ext/standard/file.c:1.375
--- php-src/ext/standard/file.c:1.374 Thu Jan 8 03:17:31 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:25:01 2004
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.374 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: file.c,v 1.375 2004/01/14 14:25:01 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -907,7 +907,11 @@
WRONG_PARAM_COUNT;
}
- php_stream_from_zval(stream, arg1);
+ php_stream_from_zval_no_verify(stream, arg1);
+ if (stream == NULL) {
+ /* we want false return value, rather than NULL */
+ goto exit_failed;
+ }
if (argc == 1) {
/* ask streams to give us a buffer of an appropriate size */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/libsqlite/src parse.c
wez Wed Jan 14 07:47:05 2004 EDT Modified files: /php-src/ext/sqlite/libsqlite/src parse.c Log: touch Index: php-src/ext/sqlite/libsqlite/src/parse.c diff -u php-src/ext/sqlite/libsqlite/src/parse.c:1.8 php-src/ext/sqlite/libsqlite/src/parse.c:1.9 --- php-src/ext/sqlite/libsqlite/src/parse.c:1.8Thu Jan 8 13:23:52 2004 +++ php-src/ext/sqlite/libsqlite/src/parse.cWed Jan 14 07:47:04 2004 @@ -1,6 +1,6 @@ /* Driver template for the LEMON parser generator. ** The author disclaims copyright to this source code. -*/ +*/ /* First off, code is include which follows the "include" declaration ** in the input file. */ #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
wez Wed Jan 14 07:19:18 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
fix crash when throwing an exception
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.34 php-src/ext/tidy/tidy.c:1.35
--- php-src/ext/tidy/tidy.c:1.34Wed Jan 14 03:15:57 2004
+++ php-src/ext/tidy/tidy.c Wed Jan 14 07:19:17 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.34 2004/01/14 08:15:57 john Exp $ */
+/* $Id: tidy.c,v 1.35 2004/01/14 12:19:17 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -768,7 +768,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.34 2004/01/14 08:15:57 john Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.35 2004/01/14 12:19:17 wez Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -897,6 +897,7 @@
if (!(contents = php_tidy_file_to_mem(inputfile, use_include_path TSRMLS_CC)))
{
TIDY_THROW("Cannot Load '%s' into memory %s", inputfile,
(use_include_path) ? "(Using include path)" : "");
+ return;
}
TIDY_APPLY_CONFIG_ZVAL(obj->ptdoc->doc, options);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli cli_win32.c config.w32 php_cli.c
wez Tue Jan 13 22:14:18 2004 EDT
Added files:
/php-src/sapi/cli cli_win32.c
Modified files:
/php-src/sapi/cli config.w32 php_cli.c
Log:
Add optional php-win.exe variation of the CLI sapi.
php-win.exe runs in the windows GUI subsystem, and thus
has no console; stdio handles are effectively set to /dev/null
and no "dos box" will appear on screen when running scripts
using this sapi (php-gtk people will be familiar with this concept).
Aside from those differences, php-win.exe is 100% identical to
regular CLI
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.2 php-src/sapi/cli/config.w32:1.3
--- php-src/sapi/cli/config.w32:1.2 Mon Dec 22 08:08:04 2003
+++ php-src/sapi/cli/config.w32 Tue Jan 13 22:14:17 2004
@@ -1,8 +1,9 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/22 13:08:04 wez Exp $
+// $Id: config.w32,v 1.3 2004/01/14 03:14:17 wez Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
+ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
if (PHP_CLI == "yes") {
SAPI('cli', 'getopt.c php_cli.c', 'php.exe');
@@ -11,3 +12,7 @@
}
}
+if (PHP_CLI_WIN32 == "yes") {
+ SAPI('cli_win32', 'getopt.c cli_win32.c', 'php-win.exe');
+}
+
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.106 php-src/sapi/cli/php_cli.c:1.107
--- php-src/sapi/cli/php_cli.c:1.106Thu Jan 8 03:18:09 2004
+++ php-src/sapi/cli/php_cli.c Tue Jan 13 22:14:17 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.106 2004/01/08 08:18:09 andi Exp $ */
+/* $Id: php_cli.c,v 1.107 2004/01/14 03:14:17 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -204,7 +204,11 @@
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
+#ifdef PHP_CLI_WIN32_NO_CONSOLE
+ break;
+#else
php_handle_aborted_connection();
+#endif
}
ptr += ret;
remaining -= ret;
@@ -217,7 +221,9 @@
static void sapi_cli_flush(void *server_context)
{
if (fflush(stdout)==EOF) {
+#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
+#endif
}
}
@@ -510,7 +516,11 @@
/* {{{ main
*/
+#ifdef PHP_CLI_WIN32_NO_CONSOLE
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int
nShowCmd)
+#else
int main(int argc, char *argv[])
+#endif
{
int exit_status = SUCCESS;
int c;
@@ -536,6 +546,10 @@
sapi_globals_struct *sapi_globals;
void ***tsrm_ls;
#endif
+#ifdef PHP_CLI_WIN32_NO_CONSOLE
+ int argc = __argc;
+ char **argv = __argv;
+#endif
#if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
{
Index: php-src/sapi/cli/cli_win32.c
+++ php-src/sapi/cli/cli_win32.c
#define PHP_CLI_WIN32_NO_CONSOLE 1
#include "php_cli.c"
--
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 com_handlers.c
wez Tue Jan 13 11:05:39 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c
Log:
reinstate this ifdef for people without .Net SDK
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.12
php-src/ext/com_dotnet/com_handlers.c:1.13
--- php-src/ext/com_dotnet/com_handlers.c:1.12 Tue Jan 13 11:02:56 2004
+++ php-src/ext/com_dotnet/com_handlers.c Tue Jan 13 11:05:38 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.12 2004/01/13 16:02:56 wez Exp $ */
+/* $Id: com_handlers.c,v 1.13 2004/01/13 16:05:38 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -386,8 +386,10 @@
return (union _zend_function*)&f;
switch (obj->ce->name[0]) {
+#if HAVE_MSCOREE_H
case 'd':
POPULATE_CTOR(d, com_dotnet_create_instance);
+#endif
case 'c':
POPULATE_CTOR(d, com_create_instance);
--
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 com_handlers.c
wez Tue Jan 13 11:02:57 2004 EDT Modified files: /php-src/ext/com_dotnet com_handlers.c Log: Fix refcount on these return values to avoid a leak and allow object dtor's to be called. This in turn prevents a massive slow-down in CoUninitialize which would have to forcibly destroy the COM objects in request shutdown. Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.11 php-src/ext/com_dotnet/com_handlers.c:1.12 --- php-src/ext/com_dotnet/com_handlers.c:1.11 Tue Jan 13 08:38:11 2004 +++ php-src/ext/com_dotnet/com_handlers.c Tue Jan 13 11:02:56 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_handlers.c,v 1.11 2004/01/13 13:38:11 wez Exp $ */ +/* $Id: com_handlers.c,v 1.12 2004/01/13 16:02:56 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,6 +37,8 @@ MAKE_STD_ZVAL(return_value); ZVAL_NULL(return_value); + return_value->refcount = 0; + return_value->is_ref = 0; obj = CDNO_FETCH(object); @@ -110,6 +112,8 @@ MAKE_STD_ZVAL(return_value); ZVAL_NULL(return_value); + return_value->refcount = 0; + return_value->is_ref = 0; obj = CDNO_FETCH(object); -- 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 com_com.c com_extension.c com_handlers.c php_com_dotnet_internal.h
wez Tue Jan 13 08:38:12 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_com.c com_extension.c com_handlers.c
php_com_dotnet_internal.h
Log:
Fix leaking constructors.
Implement a cache for method signatures and DISPID's to
greatly improve performance when repeatedly accessing
members with the same names.
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.9 php-src/ext/com_dotnet/com_com.c:1.10
--- php-src/ext/com_dotnet/com_com.c:1.9Mon Jan 12 19:40:14 2004
+++ php-src/ext/com_dotnet/com_com.cTue Jan 13 08:38:11 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_com.c,v 1.9 2004/01/13 00:40:14 wez Exp $ */
+/* $Id: com_com.c,v 1.10 2004/01/13 13:38:11 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -355,7 +355,17 @@
{
OLECHAR *olename;
HRESULT hr;
+ DISPID *dispid_ptr;
+ if (namelen == -1) {
+ namelen = strlen(name);
+ }
+
+ if (obj->id_of_name_cache && SUCCESS == zend_hash_find(obj->id_of_name_cache,
name, namelen, (void**)&dispid_ptr)) {
+ *dispid = *dispid_ptr;
+ return S_OK;
+ }
+
olename = php_com_string_to_olestring(name, namelen, obj->code_page TSRMLS_CC);
if (obj->typeinfo) {
@@ -373,6 +383,15 @@
}
efree(olename);
+ if (SUCCEEDED(hr)) {
+ /* cache the mapping */
+ if (!obj->id_of_name_cache) {
+ ALLOC_HASHTABLE(obj->id_of_name_cache);
+ zend_hash_init(obj->id_of_name_cache, 2, NULL, NULL, 0);
+ }
+ zend_hash_update(obj->id_of_name_cache, name, namelen, dispid,
sizeof(*dispid), NULL);
+ }
+
return hr;
}
@@ -388,7 +407,7 @@
zend_internal_function *f =
(zend_internal_function*)EG(function_state_ptr)->function;
/* assumption: that the active function (f) is the function we generated for
the engine */
- if (!f || f->type != ZEND_OVERLOADED_FUNCTION_TEMPORARY || f->arg_info ==
NULL) {
+ if (!f || f->arg_info == NULL) {
f = NULL;
}
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.7
php-src/ext/com_dotnet/com_extension.c:1.8
--- php-src/ext/com_dotnet/com_extension.c:1.7 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_extension.c Tue Jan 13 08:38:11 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_extension.c,v 1.7 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_extension.c,v 1.8 2004/01/13 13:38:11 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,6 +31,7 @@
ZEND_DECLARE_MODULE_GLOBALS(com_dotnet)
TsHashTable php_com_typelibraries;
+
zend_class_entry
*php_com_variant_class_entry,
*php_com_exception_class_entry,
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.10
php-src/ext/com_dotnet/com_handlers.c:1.11
--- php-src/ext/com_dotnet/com_handlers.c:1.10 Mon Jan 12 19:40:14 2004
+++ php-src/ext/com_dotnet/com_handlers.c Tue Jan 13 08:38:11 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.10 2004/01/13 00:40:14 wez Exp $ */
+/* $Id: com_handlers.c,v 1.11 2004/01/13 13:38:11 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -231,12 +231,21 @@
return NULL;
}
+static void function_dtor(void *pDest)
+{
+ zend_internal_function *f = (zend_internal_function*)pDest;
+
+ efree(f->function_name);
+ if (f->arg_info) {
+ efree(f->arg_info);
+ }
+}
+
static union _zend_function *com_method_get(zval *object, char *name, int len
TSRMLS_DC)
{
- zend_internal_function *f;
+ zend_internal_function f, *fptr = NULL;
php_com_dotnet_object *obj;
-
- /* TODO: cache this */
+ union _zend_function *func;
obj = CDNO_FETCH(object);
@@ -244,64 +253,79 @@
return NULL;
}
- f = emalloc(sizeof(zend_internal_function));
- f->type = ZEND_OVERLOADED_FUNCTION_TEMPORARY;
- f->num_args = 0;
- f->arg_info = NULL;
- f->scope = obj->ce;
- f->fn_flags = 0;
- f->function_name = estrndup(name, len);
-
- if (obj->typeinfo) {
- /* look for byref params */
- ITypeComp *comp;
- ITypeInfo *TI = NULL;
- DESCKIND kind;
- BINDPTR bindptr;
- OLECHAR *olename;
- ULONG lhash;
- int i;
-
- if (SUCCEEDED(ITypeInfo_GetTypeComp(obj->typeinfo, &comp))) {
- olename = php_com_string_to_olestring(name, len,
obj->code_p
[PHP-CVS] cvs: php-src /win32 time.c
wez Mon Jan 12 21:07:05 2004 EDT Modified files: /php-src/win32 time.c Log: make usleep actually work properly Index: php-src/win32/time.c diff -u php-src/win32/time.c:1.8 php-src/win32/time.c:1.9 --- php-src/win32/time.c:1.8Sat Nov 29 17:59:33 2003 +++ php-src/win32/time.cMon Jan 12 21:07:04 2004 @@ -11,7 +11,7 @@ * */ -/* $Id: time.c,v 1.8 2003/11/29 22:59:33 wez Exp $ */ +/* $Id: time.c,v 1.9 2004/01/13 02:07:04 wez Exp $ */ /** * @@ -136,9 +136,9 @@ HANDLE timer; LARGE_INTEGER due; - due.QuadPart = -1000 * useconds; - timer = CreateWaitableTimer(NULL, TRUE, NULL); + due.QuadPart = -(10 * (__int64)useconds); + timer = CreateWaitableTimer(NULL, TRUE, NULL); SetWaitableTimer(timer, &due, 0, NULL, NULL, 0); WaitForSingleObject(timer, INFINITE); CloseHandle(timer); -- 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 com_com.c com_handlers.c php_com_dotnet_internal.h
wez Mon Jan 12 19:40:15 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_com.c com_handlers.c
php_com_dotnet_internal.h
Log:
Support automatic handling of byref parameters
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.8 php-src/ext/com_dotnet/com_com.c:1.9
--- php-src/ext/com_dotnet/com_com.c:1.8Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_com.cMon Jan 12 19:40:14 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_com.c,v 1.8 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_com.c,v 1.9 2004/01/13 00:40:14 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -377,6 +377,127 @@
}
/* the core of COM */
+int php_com_do_invoke_byref(php_com_dotnet_object *obj, char *name, int namelen,
+ WORD flags, VARIANT *v, int nargs, zval ***args TSRMLS_DC)
+{
+ DISPID dispid, altdispid;
+ DISPPARAMS disp_params;
+ HRESULT hr;
+ VARIANT *vargs = NULL, *byref_vals = NULL;
+ int i, byref_count = 0, j;
+ zend_internal_function *f =
(zend_internal_function*)EG(function_state_ptr)->function;
+
+ /* assumption: that the active function (f) is the function we generated for
the engine */
+ if (!f || f->type != ZEND_OVERLOADED_FUNCTION_TEMPORARY || f->arg_info ==
NULL) {
+ f = NULL;
+ }
+
+ hr = php_com_get_id_of_name(obj, name, namelen, &dispid TSRMLS_CC);
+
+ if (FAILED(hr)) {
+ char *winerr = NULL;
+ char *msg = NULL;
+ winerr = php_win_err(hr);
+ spprintf(&msg, 0, "Unable to lookup `%s': %s", name, winerr);
+ LocalFree(winerr);
+ php_com_throw_exception(hr, msg TSRMLS_CC);
+ efree(msg);
+ return FAILURE;
+ }
+
+
+ if (nargs) {
+ vargs = (VARIANT*)safe_emalloc(sizeof(VARIANT), nargs, 0);
+ }
+
+ if (f) {
+ for (i = 0; i < nargs; i++) {
+ if (f->arg_info[nargs - i - 1].pass_by_reference) {
+ byref_count++;
+ }
+ }
+ }
+
+ if (byref_count) {
+ byref_vals = (VARIANT*)safe_emalloc(sizeof(VARIANT), byref_count, 0);
+ for (j = 0, i = 0; i < nargs; i++) {
+ if (f->arg_info[nargs - i - 1].pass_by_reference) {
+ /* put the value into byref_vals instead */
+ php_com_variant_from_zval(&byref_vals[j], *args[nargs
- i - 1], obj->code_page TSRMLS_CC);
+
+ /* if it is already byref, "move" it into the vargs
array, otherwise
+* make vargs a reference to this value */
+ if (V_VT(&byref_vals[j]) & VT_BYREF) {
+ memcpy(&vargs[i], &byref_vals[j],
sizeof(vargs[i]));
+ VariantInit(&byref_vals[j]); /* leave the
variant slot empty to simplify cleanup */
+ } else {
+ VariantInit(&vargs[i]);
+ V_VT(&vargs[i]) = V_VT(&byref_vals[j]) |
VT_BYREF;
+ /* union magic ensures that this works out */
+ vargs[i].byref = &V_UINT(&byref_vals[j]);
+ }
+ j++;
+ } else {
+ php_com_variant_from_zval(&vargs[i], *args[nargs - i -
1], obj->code_page TSRMLS_CC);
+ }
+ }
+
+ } else {
+ /* Invoke'd args are in reverse order */
+ for (i = 0; i < nargs; i++) {
+ php_com_variant_from_zval(&vargs[i], *args[nargs - i - 1],
obj->code_page TSRMLS_CC);
+ }
+ }
+
+ disp_params.cArgs = nargs;
+ disp_params.cNamedArgs = 0;
+ disp_params.rgvarg = vargs;
+ disp_params.rgdispidNamedArgs = NULL;
+
+ if (flags & DISPATCH_PROPERTYPUT) {
+ altdispid = DISPID_PROPERTYPUT;
+ disp_params.rgdispidNamedArgs = &altdispid;
+ disp_params.cNamedArgs = 1;
+ }
+
+ /* this will create an exception if needed */
+ hr = php_com_invoke_helper(obj, dispid, flags, &disp_params, v TSRMLS_CC);
+
+ /* release variants */
+ if (vargs) {
+ for (i = 0, j = 0; i < nargs; i++) {
+ /* if this was byref, update the zval */
+ if (f && f->arg_info[nargs - i - 1].pass_by_reference) {
+ SEPARATE_ZVAL_IF_NOT_REF(args[nargs - i - 1]);
+
+
[PHP-CVS] cvs: CVSROOT / avail loginfo
wez Sat Jan 10 16:53:25 2004 EDT Modified files: /CVSROOTavail loginfo Log: Imported livedocs (+revision history) into PHP CVS. Commit messages and karma as per phpdoc rules. Index: CVSROOT/avail diff -u CVSROOT/avail:1.811 CVSROOT/avail:1.812 --- CVSROOT/avail:1.811 Fri Jan 9 17:49:25 2004 +++ CVSROOT/avail Sat Jan 10 16:53:24 2004 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt,livedocs # People who work on the Engine @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h
[PHP-CVS] cvs: php-src /win32/build Makefile
wez Fri Jan 9 20:11:44 2004 EDT Modified files: /php-src/win32/buildMakefile Log: include PECL targets in snap build... Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.17 php-src/win32/build/Makefile:1.18 --- php-src/win32/build/Makefile:1.17 Fri Jan 9 08:32:20 2004 +++ php-src/win32/build/MakefileFri Jan 9 20:11:42 2004 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.17 2004/01/09 13:32:20 wez Exp $ +# $Id: Makefile,v 1.18 2004/01/10 01:11:42 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -86,6 +86,7 @@ @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)" for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T" for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T" + for %T in ($(PECL_TARGETS)) do $(MAKE) /I /nologo "%T" build-dist: $(BUILD_DIR)\deplister.exe -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session php_session.h session.c
wez Fri Jan 9 10:30:10 2004 EDT Modified files: /php-src/ext/sessionphp_session.h session.c Log: export tsrm id for session globals. Index: php-src/ext/session/php_session.h diff -u php-src/ext/session/php_session.h:1.96 php-src/ext/session/php_session.h:1.97 --- php-src/ext/session/php_session.h:1.96 Thu Jan 8 12:32:44 2004 +++ php-src/ext/session/php_session.h Fri Jan 9 10:30:07 2004 @@ -228,7 +228,7 @@ } \ } -ZEND_EXTERN_MODULE_GLOBALS(ps); +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps); void php_session_auto_start(void *data); void php_session_shutdown(void *data); Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.381 php-src/ext/session/session.c:1.382 --- php-src/ext/session/session.c:1.381 Thu Jan 8 03:17:24 2004 +++ php-src/ext/session/session.c Fri Jan 9 10:30:07 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: session.c,v 1.381 2004/01/08 08:17:24 andi Exp $ */ +/* $Id: session.c,v 1.382 2004/01/09 15:30:07 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -81,7 +81,7 @@ }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(ps); +PHPAPI ZEND_DECLARE_MODULE_GLOBALS(ps); static ps_module *_php_find_ps_module(char *name TSRMLS_DC); static const ps_serializer *_php_find_ps_serializer(char *name TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/informix config.w32 /win32/build confutils.js
wez Fri Jan 9 10:11:32 2004 EDT
Added files:
/php-src/ext/informix config.w32
Modified files:
/php-src/win32/buildconfutils.js
Log:
let informix build
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.36 php-src/win32/build/confutils.js:1.37
--- php-src/win32/build/confutils.js:1.36 Fri Jan 9 08:17:58 2004
+++ php-src/win32/build/confutils.jsFri Jan 9 10:11:19 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.36 2004/01/09 13:17:58 wez Exp $
+// $Id: confutils.js,v 1.37 2004/01/09 15:11:19 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -84,6 +84,20 @@
get_version_numbers();
+/* execute a command and return the output as a string */
+function execute(command_line)
+{
+ var e = WshShell.Exec(command_line);
+ var ret = "";
+
+ ret = e.StdOut.ReadAll();
+
+//STDOUT.WriteLine("command " + command_line);
+//STDOUT.WriteLine(ret);
+
+ return ret;
+}
+
function condense_path(path)
{
path = FSO.GetAbsolutePathName(path);
Index: php-src/ext/informix/config.w32
+++ php-src/ext/informix/config.w32
// $Id: config.w32,v 1.1 2004/01/09 15:11:31 wez Exp $
// vim:ft=javascript
ARG_WITH("informix", "informix support", "no");
if (PHP_INFORMIX != "no") {
php_ifx_esql = PATH_PROG('esql', PHP_INFORMIX + ";\\ifx-client\\bin",
'IFX_ESQL');
if (php_ifx_esql) {
php_ifx_libs = execute(php_ifx_esql + " -thread -libs");
php_ifx_libs = php_ifx_libs.replace("Libraries to be used:",
"").replace(/^\s+/, "");
ADD_FLAG("LIBS_INFORMIX", php_ifx_libs);
php_ifx_bin = FSO.GetParentFolderName(php_ifx_esql);
php_ifx_dir = FSO.GetParentFolderName(php_ifx_bin);
ADD_FLAG("CFLAGS_INFORMIX", "/I " + php_ifx_dir + "\\incl\\esql ");
EXTENSION('informix', 'ifx.c', null, "/D IFX_VERSION=921 /D
HAVE_IFX_IUS=1", "php_ifx.dll");
MFO.WriteLine(configure_module_dirname + "\\ifx.c: " +
configure_module_dirname + "\\ifx.ec");
MFO.WriteLine("\t
[PHP-CVS] cvs: php-src /ext/mhash config.w32
wez Fri Jan 9 08:42:15 2004 EDT
Added files:
/php-src/ext/mhash config.w32
Log:
let mhash build
Index: php-src/ext/mhash/config.w32
+++ php-src/ext/mhash/config.w32
// $Id: config.w32,v 1.1 2004/01/09 13:42:14 wez Exp $
// vim:ft=javascript
ARG_WITH("mhash", "mhash support", "no");
if (PHP_MHASH != "no") {
if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_MHASH') &&
CHECK_LIB('libmhash.lib', 'mhash')) {
EXTENSION('mhash', 'mhash.c');
AC_DEFINE('HAVE_LIBMHASH', 1);
} else {
WARNING("mhash 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 Makefile
wez Fri Jan 9 08:32:21 2004 EDT Modified files: /php-src/win32/buildMakefile Log: add a rule to clean pecl things; split up the command line into 3 to try to avoid possible problems with line-length under VC6 Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.16 php-src/win32/build/Makefile:1.17 --- php-src/win32/build/Makefile:1.16 Fri Jan 9 08:17:58 2004 +++ php-src/win32/build/MakefileFri Jan 9 08:32:20 2004 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.16 2004/01/09 13:17:58 wez Exp $ +# $Id: Makefile,v 1.17 2004/01/09 13:32:20 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -65,7 +65,9 @@ clean-sapi: @echo Cleaning SAPI - @for %D in ($(EXT_TARGETS) $(SAPI_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL + @for %D in ($(EXT_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL + @for %D in ($(PECL_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL + @for %D in ($(SAPI_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL @del /F /Q $(BUILD_DIR)\$(PHPDLL) clean: clean-sapi -- 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 confutils.js mkdist.php
wez Fri Jan 9 08:17:59 2004 EDT
Modified files:
/php-src/win32/buildMakefile confutils.js mkdist.php
Log:
Separate pecl extensions and sapi into their own target, and have mkdist.php
create a separate pecl dir and zip when building a win32 snapshot.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.15 php-src/win32/build/Makefile:1.16
--- php-src/win32/build/Makefile:1.15 Thu Jan 8 12:33:29 2004
+++ php-src/win32/build/MakefileFri Jan 9 08:17:58 2004
@@ -14,13 +14,13 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.15 2004/01/08 17:33:29 sniper Exp $
+# $Id: Makefile,v 1.16 2004/01/09 13:17:58 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
LD="$(LINK)"
-all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(SAPI_TARGETS)
+all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(PECL_TARGETS)
$(SAPI_TARGETS)
generated_files: Zend\zend_ini_parser.c \
Zend\zend_language_parser.c Zend\zend_ini_scanner.c \
@@ -87,11 +87,15 @@
build-dist: $(BUILD_DIR)\deplister.exe
-rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
+ -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-pecl
-del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip
- $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
+ $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
cd ..\..
+ cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-pecl
+ -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-pecl.zip .
+ cd ..\..
dist: all build-dist
snap: build-snap build-dist
@@ -100,7 +104,7 @@
$(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR)
-o$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
msi-installer: dist
- $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)"
+ $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"
install: all
@copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.35 php-src/win32/build/confutils.js:1.36
--- php-src/win32/build/confutils.js:1.35 Fri Jan 9 06:19:40 2004
+++ php-src/win32/build/confutils.jsFri Jan 9 08:17:58 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.35 2004/01/09 11:19:40 wez Exp $
+// $Id: confutils.js,v 1.36 2004/01/09 13:17:58 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -773,7 +773,13 @@
MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget + "
" + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LDFLAGS_" + SAPI
+ ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
- ADD_FLAG("SAPI_TARGETS", makefiletarget);
+
+ if (configure_module_dirname.match("pecl")) {
+ ADD_FLAG("PECL_TARGETS", makefiletarget);
+ } else {
+ ADD_FLAG("SAPI_TARGETS", makefiletarget);
+ }
+
MFO.WriteBlankLines(1);
}
@@ -865,7 +871,11 @@
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);
MFO.WriteBlankLines(1);
- ADD_FLAG("EXT_TARGETS", dllname);
+ if (configure_module_dirname.match("pecl")) {
+ ADD_FLAG("PECL_TARGETS", dllname);
+ } else {
+ ADD_FLAG("EXT_TARGETS", dllname);
+ }
MFO.WriteLine(dllname + ": $(BUILD_DIR)\\" + dllname);
MFO.WriteLine("[EMAIL PROTECTED] EXT " + extname + " build complete&quo
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Fri Jan 9 06:19:41 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
fix PHP_SPL problem when you don't have a pecl checkout.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.34 php-src/win32/build/confutils.js:1.35
--- php-src/win32/build/confutils.js:1.34 Thu Jan 8 16:53:48 2004
+++ php-src/win32/build/confutils.jsFri Jan 9 06:19:40 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.34 2004/01/08 21:53:48 wez Exp $
+// $Id: confutils.js,v 1.35 2004/01/09 11:19:40 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -792,15 +792,22 @@
{
var EXT = extname.toUpperCase();
var DEP = dependson.toUpperCase();
+ var dep_present = false;
+ var dep_shared = false;
+ try {
+ dep_present = eval("PHP_" + DEP);
+ dep_shared = eval("PHP_" + DEP + "_SHARED");
+ } catch (e) {
+ dep_present = "no";
+ dep_shared = false;
+ }
+
if (optional) {
- var dep_present = eval("PHP_" + DEP);
-
if (dep_present == "no")
return;
}
- var dep_shared = eval("PHP_" + DEP + "_SHARED");
var ext_shared = eval("PHP_" + EXT + "_SHARED");
if (dep_shared) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml config.w32 /win32/build buildconf.js confutils.js
wez Thu Jan 8 16:53:49 2004 EDT
Modified files:
/php-src/ext/simplexml config.w32
/php-src/win32/buildbuildconf.js confutils.js
Log:
add optional dep on spl for simplexml.
Fix dep handling in buildconf
Index: php-src/ext/simplexml/config.w32
diff -u php-src/ext/simplexml/config.w32:1.3 php-src/ext/simplexml/config.w32:1.4
--- php-src/ext/simplexml/config.w32:1.3Mon Dec 22 08:16:40 2003
+++ php-src/ext/simplexml/config.w32Thu Jan 8 16:53:48 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2003/12/22 13:16:40 wez Exp $
+// $Id: config.w32,v 1.4 2004/01/08 21:53:48 wez Exp $
// vim:ft=javascript
ARG_WITH("simplexml", "Simple XML support", "yes");
@@ -10,6 +10,7 @@
ADD_FLAG("CFLAGS_SIMPLEXML", "/D LIBXML_STATIC");
}
ADD_EXTENSION_DEP('simplexml', 'libxml');
+ ADD_EXTENSION_DEP('simplexml', 'spl', true);
}
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.9 php-src/win32/build/buildconf.js:1.10
--- php-src/win32/build/buildconf.js:1.9Thu Jan 8 12:33:29 2004
+++ php-src/win32/build/buildconf.jsThu Jan 8 16:53:48 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.9 2004/01/08 17:33:29 sniper Exp $ */
+/* $Id: buildconf.js,v 1.10 2004/01/08 21:53:48 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -53,7 +53,7 @@
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");
+ var re_dep_line = new
RegExp("ADD_EXTENSION_DEP\\([^,]*\\s*,\\s*['\"]([^'\"]+)['\"].*\\);", "gm");
for (; !fc.atEnd(); fc.moveNext())
{
@@ -108,17 +108,19 @@
{
var i, mod_name, j;
var output = "";
+ var item = null;
for (i in module_names) {
mod_name = module_names[i];
- if (!MODULES.Exists(mod_name)) {
+ if (MODULES.Exists(mod_name)) {
+ item = MODULES.Item(mod_name);
+ MODULES.Remove(mod_name);
+ if (item.deps.length) {
+ output += emit_dep_modules(item.deps);
+ }
output += emit_module(item);
- continue;
}
-
- item = MODULES.Item(mod_name);
- output += emit_dep_modules(item.deps);
}
return output;
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.33 php-src/win32/build/confutils.js:1.34
--- php-src/win32/build/confutils.js:1.33 Thu Jan 8 12:33:29 2004
+++ php-src/win32/build/confutils.jsThu Jan 8 16:53:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.33 2004/01/08 17:33:29 sniper Exp $
+// $Id: confutils.js,v 1.34 2004/01/08 21:53:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -788,16 +788,26 @@
// Add a dependency on another extension, so that
// the dependencies are built before extname
-function ADD_EXTENSION_DEP(extname, dependson)
+function ADD_EXTENSION_DEP(extname, dependson, optional)
{
var EXT = extname.toUpperCase();
var DEP = dependson.toUpperCase();
+ if (optional) {
+ var dep_present = eval("PHP_" + DEP);
+
+ if (dep_present == "no")
+ return;
+ }
+
var dep_shared = eval("PHP_" + DEP + "_SHARED");
var ext_shared = eval("PHP_" + EXT + "_SHARED");
if (dep_shared) {
if (!ext_shared) {
+ if (optional) {
+ return;
+ }
ERROR("static " + extname + " cannot depend on shared " +
dependson);
}
ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests blankdb.inc sqlite_oo_029.phpt
wez Thu Jan 8 11:55:38 2004 EDT
Modified files:
/php-src/ext/sqlite/tests blankdb.inc sqlite_oo_029.phpt
Log:
fix tests for win32
Index: php-src/ext/sqlite/tests/blankdb.inc
diff -u php-src/ext/sqlite/tests/blankdb.inc:1.3
php-src/ext/sqlite/tests/blankdb.inc:1.4
--- php-src/ext/sqlite/tests/blankdb.inc:1.3Fri Dec 5 08:42:03 2003
+++ php-src/ext/sqlite/tests/blankdb.incThu Jan 8 11:55:37 2004
@@ -1,11 +1,16 @@
query("CREATE TABLE strings(key VARCHAR(10), var VARCHAR(10))");
-$db->query("INSERT INTO strings VALUES('foo', 'foo')");
-
-class sqlite_help
-{
- function sqlite_help($db){
- $this->db = $db;
- $this->db->create_function('link_keywords', array(&$this, 'linkers'),
1);
- }
-
- function get_single($key)
- {
- return $this->db->single_query('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
- }
-
- function linkers($str)
- {
- $str = str_replace('foo', 'bar', $str);
- return $str;
- }
-
- function free()
- {
- unset($this->db);
- }
-
- function __destruct()
- {
- echo "DESTRUCTED\n";
- }
-}
-
-$obj = new sqlite_help($db);
-echo $obj->get_single('foo')."\n";;
-$obj->free();
-unset($obj);
-
-?>
-===DONE===
---EXPECT--
-bar
-===DONE===
-DESTRUCTED
\ No newline at end of file
+--TEST--
+sqlite-oo: call method with $this
+--FILE--
+query("CREATE TABLE strings(key VARCHAR(10), var VARCHAR(10))");
+$db->query("INSERT INTO strings VALUES('foo', 'foo')");
+
+class sqlite_help
+{
+ function sqlite_help($db){
+ $this->db = $db;
+ $this->db->create_function('link_keywords', array(&$this, 'linkers'),
1);
+ }
+
+ function get_single($key)
+ {
+ return $this->db->single_query('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
+ }
+
+ function linkers($str)
+ {
+ $str = str_replace('foo', 'bar', $str);
+ return $str;
+ }
+
+ function free()
+ {
+ unset($this->db);
+ }
+
+ function __destruct()
+ {
+ echo "DESTRUCTED\n";
+ }
+}
+
+$obj = new sqlite_help($db);
+echo $obj->get_single('foo')."\n";
+$obj->free();
+unset($obj);
+
+?>
+===DONE===
+--EXPECT--
+bar
+===DONE===
+DESTRUCTED
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.dsp
wez Thu Jan 8 11:23:47 2004 EDT Modified files: /php-src/ext/sqlite sqlite.dsp Log: add new files to .dsp Index: php-src/ext/sqlite/sqlite.dsp diff -u php-src/ext/sqlite/sqlite.dsp:1.5 php-src/ext/sqlite/sqlite.dsp:1.6 --- php-src/ext/sqlite/sqlite.dsp:1.5 Wed Jun 25 19:20:30 2003 +++ php-src/ext/sqlite/sqlite.dsp Thu Jan 8 11:23:47 2004 @@ -128,6 +128,10 @@ # End Source File # Begin Source File +SOURCE=.\libsqlite\src\date.c +# End Source File +# Begin Source File + SOURCE=.\libsqlite\src\delete.c # End Source File # Begin Source File @@ -306,6 +310,10 @@ # End Source File # Begin Source File +SOURCE=.\libsqlite\src\vdbeaux.c +# End Source File +# Begin Source File + SOURCE=.\libsqlite\src\where.c # End Source File # End Group -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite config.w32 /ext/sqlite/libsqlite/src sqlite.w32.h
wez Thu Jan 8 11:18:39 2004 EDT
Modified files:
/php-src/ext/sqlite config.w32
/php-src/ext/sqlite/libsqlite/src sqlite.w32.h
Log:
Update win32 build for new version of libsqlite
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.3 php-src/ext/sqlite/config.w32:1.4
--- php-src/ext/sqlite/config.w32:1.3 Thu Jan 8 09:24:59 2004
+++ php-src/ext/sqlite/config.w32 Thu Jan 8 11:18:37 2004
@@ -1,19 +1,23 @@
-// $Id: config.w32,v 1.3 2004/01/08 14:24:59 iliaa Exp $
+// $Id: config.w32,v 1.4 2004/01/08 16:18:37 wez Exp $
// vim:ft=javascript
ARG_WITH("sqlite", "SQLite support", "yes");
if (PHP_SQLITE == "yes") {
- FSO.CopyFile("ext\\sqlite\\libsqlite\\src\\sqlite.w32.h",
- "ext\\sqlite\\libsqlite\\src\\sqlite.h");
+ copy_and_subst(configure_module_dirname + "\\libsqlite\\src\\sqlite.h.in",
+ configure_module_dirname + "\\libsqlite\\src\\sqlite.h", new Array(
+ "--VERS--", file_get_contents(configure_module_dirname +
"\\libsqlite\\VERSION").replace(new RegExp("[\r\n]+", "g"), ""),
+ "--ENCODING--", "ISO8859"
+ ));
- FSO.CopyFile("ext\\sqlite\\libsqlite\\src\\sqlite_config.w32.h",
- "ext\\sqlite\\libsqlite\\src\\config.h");
+ FSO.CopyFile(configure_module_dirname +
"\\libsqlite\\src\\sqlite_config.w32.h",
+ configure_module_dirname + "\\libsqlite\\src\\config.h");
EXTENSION("sqlite", "sqlite.c sess_sqlite.c", null,
- "/D PHP_SQLITE_EXPORTS /Iext/sqlite/libsqlite/src");
+ "/D PHP_SQLITE_EXPORTS /I " + configure_module_dirname +
"/libsqlite/src");
+
- ADD_SOURCES("ext/sqlite/libsqlite/src", "opcodes.c parse.c encode.c \
+ ADD_SOURCES(configure_module_dirname + "/libsqlite/src", "opcodes.c parse.c
encode.c \
auth.c btree.c build.c delete.c expr.c func.c hash.c insert.c \
main.c os.c pager.c printf.c random.c select.c table.c tokenize.c \
update.c util.c vdbe.c attach.c btree_rb.c pragma.c vacuum.c \
@@ -21,7 +25,7 @@
AC_DEFINE("HAVE_SQLITE", 1, "SQLite support");
if (!PHP_SQLITE_SHARED) {
- ADD_DEF_FILE("ext\\sqlite\\php_sqlite.def");
+ ADD_DEF_FILE(configure_module_dirname + "\\php_sqlite.def");
}
}
Index: php-src/ext/sqlite/libsqlite/src/sqlite.w32.h
diff -u php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.3
php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.4
--- php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.3 Fri Jun 6 18:44:57 2003
+++ php-src/ext/sqlite/libsqlite/src/sqlite.w32.h Thu Jan 8 11:18:38 2004
@@ -12,7 +12,7 @@
** This header file defines the interface that the SQLite library
** presents to client programs.
**
-** @(#) $Id: sqlite.w32.h,v 1.3 2003/06/06 22:44:57 wez Exp $
+** @(#) $Id: sqlite.w32.h,v 1.4 2004/01/08 16:18:38 wez Exp $
*/
#ifndef _SQLITE_H_
#define _SQLITE_H_
@@ -28,7 +28,7 @@
/*
** The version of the SQLite library.
*/
-#define SQLITE_VERSION "2.8.3"
+#define SQLITE_VERSION "2.8.9"
/*
** The version string is also compiled into the library so that a program
@@ -166,6 +166,7 @@
#define SQLITE_NOLFS 22 /* Uses OS features not supported on host */
#define SQLITE_AUTH23 /* Authorization denied */
#define SQLITE_FORMAT 24 /* Auxiliary database format error */
+#define SQLITE_RANGE 25 /* 2nd parameter to sqlite_bind out of range */
#define SQLITE_ROW 100 /* sqlite_step() has another row ready */
#define SQLITE_DONE101 /* sqlite_step() has finished executing */
@@ -684,6 +685,77 @@
*/
int sqlite_finalize(sqlite_vm*, char **pzErrMsg);
+/*
+** This routine deletes the virtual machine, writes any error message to
+** *pzErrMsg and returns an SQLite return code in the same way as the
+** sqlite_finalize() function.
+**
+** Additionally, if ppVm is not NULL, *ppVm is left pointing to a new virtual
+** machine loaded with the compiled version of the original query ready for
+** execution.
+**
+** If sqlite_reset() returns SQLITE_SCHEMA, then *ppVm is set to NULL.
+**
+*** THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE **
+*/
+int sqlite_reset(sqlite_vm*, char **pzErrMsg);
+
+/*
+** If the SQL that was handed to sqlite_compile contains variables that
+** are represeted in the SQL text by a question mark ('?'). This routine
+** is used to assign values to those variables.
+**
+** The first parameter is a virtual machine obtained from sqlite_compile().
+** The 2nd "idx" parameter determines which variable in the SQL statement
+** to bind the value to. The left most '?' is 1. The 3rd parameter is
+** the value to assign to that variable. The 4th parameter is the number
+** of bytes in the value, including the terminating \000 for strings.
+** Finally, the 5th "copy" pa
[PHP-CVS] cvs: php-src /win32/build template.rc
wez Thu Jan 8 05:58:27 2004 EDT Modified files: /php-src/win32/buildtemplate.rc Log: update copyright year in win32 resource template Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.4 php-src/win32/build/template.rc:1.5 --- php-src/win32/build/template.rc:1.4 Fri Dec 5 18:13:57 2003 +++ php-src/win32/build/template.rc Thu Jan 8 05:58:27 2004 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.4 2003/12/05 23:13:57 wez Exp $ + * $Id: template.rc,v 1.5 2004/01/08 10:58:27 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 © 2003 The PHP Group\0" +VALUE "LegalCopyright", "Copyright © 1997-2004 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 /sapi/cgi config.w32
wez Thu Jan 8 05:56:40 2004 EDT
Modified files:
/php-src/sapi/cgi config.w32
Log:
fix fastcgi build
Index: php-src/sapi/cgi/config.w32
diff -u php-src/sapi/cgi/config.w32:1.1 php-src/sapi/cgi/config.w32:1.2
--- php-src/sapi/cgi/config.w32:1.1 Tue Dec 2 18:17:02 2003
+++ php-src/sapi/cgi/config.w32 Thu Jan 8 05:56:39 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:17:02 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/08 10:56:39 wez Exp $
ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
ARG_ENABLE('fastcgi', 'Build FastCGI support into CGI binary', 'yes');
@@ -16,7 +16,7 @@
if (PHP_CGI == "yes") {
AC_DEFINE('PHP_FASTCGI', PHP_FASTCGI == "yes" ? 1 : 0);
if (PHP_FASTCGI == "yes") {
- SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe',
'-Isapi/cgi/libfcgi/include /D FCGI_STATIC');
+ SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe', '/I
sapi/cgi/libfcgi/include /D FCGI_STATIC');
ADD_SOURCES('sapi/cgi/libfcgi', 'fcgi_stdio.c fcgiapp.c os_win32.c',
'cgi');
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32 php4dllts.dsp
Thanks :) - Original Message - From: "Frank M. Kromann" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Thursday, January 08, 2004 12:22 AM Subject: [PHP-CVS] cvs: php-src /win32 php4dllts.dsp > fmk Wed Jan 7 19:22:21 2004 EDT > > Modified files: > /php-src/win32 php4dllts.dsp > Log: > Adding new com_dotnet source files to project > > Index: php-src/win32/php4dllts.dsp > diff -u php-src/win32/php4dllts.dsp:1.141 php-src/win32/php4dllts.dsp:1.142 > --- php-src/win32/php4dllts.dsp:1.141 Mon Dec 8 07:56:47 2003 > +++ php-src/win32/php4dllts.dsp Wed Jan 7 19:22:20 2004 > @@ -2319,6 +2319,14 @@ > # PROP Default_Filter "" > # Begin Source File > > +SOURCE=..\ext\com_dotnet\com_saproxy.c > +# End Source File > +# Begin Source File > + > +SOURCE=..\ext\com_dotnet\com_wrapper.c > +# End Source File > +# Begin Source File > + > SOURCE=..\ext\com_dotnet\php_com_dotnet.h > # End Source File > # Begin Source File > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Wed Jan 7 19:25:49 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Change ordering of CFLAGS for built sources, so that extension specific include dirs
occur before more global include dirs.
This avoids problems when building a bundled lib and you have headers from an
external version of that lib in your global include dir.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.31 php-src/win32/build/confutils.js:1.32
--- php-src/win32/build/confutils.js:1.31 Wed Jan 7 15:06:32 2004
+++ php-src/win32/build/confutils.jsWed Jan 7 19:25:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.31 2004/01/07 20:06:32 wez Exp $
+// $Id: confutils.js,v 1.32 2004/01/08 00:25:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -952,13 +952,13 @@
}
} else {
MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + src);
- MFO.WriteLine("\t$(CC) $(CFLAGS) $(" + flags + ") $(" +
bd_flags_name + ") -c " + dir + "\\" + src + " -o " + sub_build + obj);
+ MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" +
bd_flags_name + ") -c " + dir + "\\" + src + " -o " + sub_build + obj);
}
}
if (PHP_ONE_SHOT == "yes") {
MFO.WriteLine(objs_line + ": " + srcs_line);
- MFO.WriteLine("\t$(CC) $(CFLAGS) $(" + flags + ") $(" + bd_flags_name
+ ") -c " + srcs_line);
+ MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name
+ ") -c " + srcs_line);
}
DEFINE(sym, tv);
--
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 Makefile
wez Wed Jan 7 18:36:37 2004 EDT
Modified files:
/php-src/ext/gd config.w32
/php-src/win32/buildMakefile
Log:
win32 build:
gd should build shared by default
don't use php.ini when running mkdist.php
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.4 php-src/ext/gd/config.w32:1.5
--- php-src/ext/gd/config.w32:1.4 Wed Dec 31 14:28:31 2003
+++ php-src/ext/gd/config.w32 Wed Jan 7 18:36:34 2004
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.4 2003/12/31 19:28:31 fmk Exp $
+// $Id: config.w32,v 1.5 2004/01/07 23:36:34 wez Exp $
// vim:ft=javascript
-ARG_WITH("gd", "Bundled GD support", "yes");
+ARG_WITH("gd", "Bundled GD support", "yes,shared");
if (PHP_GD != "no") {
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.13 php-src/win32/build/Makefile:1.14
--- php-src/win32/build/Makefile:1.13 Wed Jan 7 18:11:54 2004
+++ php-src/win32/build/MakefileWed Jan 7 18:36:36 2004
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $
+# $Id: Makefile,v 1.14 2004/01/07 23:36:36 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -88,7 +88,7 @@
build-dist: $(BUILD_DIR)\deplister.exe
-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)"
+ $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)"
"$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(SNAPSHOT_TEMPLATE)"
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING).zip .
cd ..\..
--
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 mkdist.php
wez Wed Jan 7 18:12:04 2004 EDT Modified files: /php-src/win32/buildMakefile mkdist.php Log: tweak snap build Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.12 php-src/win32/build/Makefile:1.13 --- php-src/win32/build/Makefile:1.12 Tue Dec 23 10:33:13 2003 +++ php-src/win32/build/MakefileWed Jan 7 18:11:54 2004 @@ -14,7 +14,7 @@ # | Author: Wez Furlong <[EMAIL PROTECTED]> | # +--+ # -# $Id: Makefile,v 1.12 2003/12/23 15:33:13 wez Exp $ +# $Id: Makefile,v 1.13 2004/01/07 23:11:54 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" @@ -82,8 +82,8 @@ build-snap: @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)" - for %T in ($(SAPI_TARGETS)) do $(MAKE) /nologo "%T" - for %T in ($(EXT_TARGETS)) do $(MAKE) /nologo "%T" + for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T" + for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T" build-dist: $(BUILD_DIR)\deplister.exe -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.5 php-src/win32/build/mkdist.php:1.6 --- php-src/win32/build/mkdist.php:1.5 Tue Dec 23 10:33:13 2003 +++ php-src/win32/build/mkdist.php Wed Jan 7 18:11:54 2004 @@ -1,4 +1,4 @@ -http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/activescript config.w32 php4activescript.def scriptengine.cpp
wez Wed Jan 7 16:01:13 2004 EDT
Added files:
/php-src/sapi/activescript config.w32
Modified files:
/php-src/sapi/activescript php4activescript.def scriptengine.cpp
Log:
Make activescript SAPI build under php5.
Untested...!
Index: php-src/sapi/activescript/php4activescript.def
diff -u php-src/sapi/activescript/php4activescript.def:1.1
php-src/sapi/activescript/php4activescript.def:1.2
--- php-src/sapi/activescript/php4activescript.def:1.1 Sun May 19 21:35:29 2002
+++ php-src/sapi/activescript/php4activescript.def Wed Jan 7 16:01:13 2004
@@ -1,5 +1,5 @@
EXPORTS
-DllCanUnloadNow @1 PRIVATE
-DllGetClassObject @2 PRIVATE
-DllRegisterServer @3 PRIVATE
-DllUnregisterServer @4 PRIVATE
+DllCanUnloadNow PRIVATE
+DllGetClassObject PRIVATE
+DllRegisterServer PRIVATE
+DllUnregisterServer PRIVATE
Index: php-src/sapi/activescript/scriptengine.cpp
diff -u php-src/sapi/activescript/scriptengine.cpp:1.8
php-src/sapi/activescript/scriptengine.cpp:1.9
--- php-src/sapi/activescript/scriptengine.cpp:1.8 Tue Jun 10 16:03:44 2003
+++ php-src/sapi/activescript/scriptengine.cpp Wed Jan 7 16:01:13 2004
@@ -1,8 +1,8 @@
/*
+--+
- | PHP Version 4|
+ | PHP Version 5|
+--+
- | Copyright (c) 1997-2002 The PHP Group|
+ | Copyright (c) 1997-2003 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -15,7 +15,7 @@
| Authors: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: scriptengine.cpp,v 1.8 2003/06/10 20:03:44 imajes Exp $ */
+/* $Id: scriptengine.cpp,v 1.9 2004/01/07 21:01:13 wez Exp $ */
/* Implementation Notes:
*
@@ -43,13 +43,8 @@
#include "php_variables.h"
#include "php_ini.h"
#include "php4activescript.h"
-#define PHP_COM_DONT_DECLARE_RPC_HANDLER 1
-#include "ext/rpc/php_rpc.h"
-#include "ext/rpc/rpc_proxy.h"
-#include "ext/rpc/com/com.h"
-#include "ext/rpc/com/com_wrapper.h"
-#include "ext/rpc/com/php_COM.h"
-#include "ext/rpc/com/conversion.h"
+#include "ext/com_dotnet/php_com_dotnet.h"
+#include "ext/com_dotnet/php_com_dotnet_internal.h"
}
#include "php_ticks.h"
#include "php4as_scriptengine.h"
@@ -210,7 +205,7 @@
VARIANT *varResult,
EXCEPINFO *excepinfo
TSRMLS_DC);
-static void free_code_fragment(code_frag *frag);
+static void free_code_fragment(code_frag *frag TSRMLS_DC);
static code_frag *clone_code_fragment(code_frag *frag, TPHPScriptingEngine *engine
TSRMLS_DC);
/* }}} */
@@ -470,7 +465,7 @@
frag->opcodes = compile_string(&pv, "fragment" TSRMLS_CC);
if (frag->opcodes == NULL) {
- free_code_fragment(frag);
+ free_code_fragment(frag TSRMLS_CC);
if (excepinfo) {
memset(excepinfo, 0, sizeof(EXCEPINFO));
@@ -485,7 +480,7 @@
return frag;
}
-static void free_code_fragment(code_frag *frag)
+static void free_code_fragment(code_frag *frag TSRMLS_DC)
{
switch(frag->fragtype) {
case FRAG_PROCEDURE:
@@ -499,7 +494,7 @@
}
if (frag->opcodes)
- destroy_op_array(frag->opcodes);
+ destroy_op_array(frag->opcodes TSRMLS_CC);
if (frag->functionname)
CoTaskMemFree(frag->functionname);
CoTaskMemFree(frag->code);
@@ -538,7 +533,7 @@
newfrag->opcodes = compile_string(&pv, "fragment" TSRMLS_CC);
if (newfrag->opcodes == NULL) {
- free_code_fragment(newfrag);
+ free_code_fragment(newfrag TSRMLS_CC);
/*
if (excepinfo) {
memset(excepinfo, 0, sizeof(EXCEPINFO));
@@ -616,7 +611,7 @@
if (retval_ptr) {
if (varResult)
- php_zval_to_variant(retval_ptr, varResult, CP_ACP);
+ php_com_variant_from_zval(varResult, retval_ptr, CP_ACP
TSRMLS_CC);
zval_ptr_dtor(&retval_ptr);
}
@@ -625,8 +620,9 @@
static void frag_dtor(void *pDest)
{
+ TSRMLS_FETCH();
code_frag *frag = *(code_frag**)pDest;
- free_code_fragment(frag);
+ free_code_fragment(frag TSRMLS_CC);
}
/* }}} */
@@
[PHP-CVS] cvs: php-src /ext/oci8 config.w32 /ext/oracle config.w32 /ext/pspell config.w32 /ext/zlib config.w32 /sapi/nsapi config.w32 /win32/build confutils.js
wez Wed Jan 7 15:06:34 2004 EDT
Modified files:
/php-src/ext/oci8 config.w32
/php-src/ext/oracle config.w32
/php-src/ext/pspell config.w32
/php-src/ext/zlib config.w32
/php-src/sapi/nsapi config.w32
/php-src/win32/buildconfutils.js
Log:
glob-ify lib checks; this simplifies writing of config.w32 files a little.
Index: php-src/ext/oci8/config.w32
diff -u php-src/ext/oci8/config.w32:1.1 php-src/ext/oci8/config.w32:1.2
--- php-src/ext/oci8/config.w32:1.1 Fri Dec 19 10:04:25 2003
+++ php-src/ext/oci8/config.w32 Wed Jan 7 15:06:29 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 15:04:25 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/07 20:06:29 wez Exp $
// vim:ft=javascript
ARG_WITH("oci8", "OCI8 support", "no");
@@ -6,7 +6,9 @@
if (PHP_OCI8 != "no") {
if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", PHP_PHP_BUILD +
"\\oci805\\include;" + PHP_OCI8) &&
- CHECK_LIB("oci.lib", "oci8", PHP_PHP_BUILD + "\\oci805\\lib;"
+ PHP_OCI8)) {
+ CHECK_LIB("oci.lib", "oci8", PHP_OCI8)
+
+ ) {
EXTENSION('oci8', 'oci8.c');
AC_DEFINE('HAVE_OCI8_TEMP_LOB', 1);
Index: php-src/ext/oracle/config.w32
diff -u php-src/ext/oracle/config.w32:1.1 php-src/ext/oracle/config.w32:1.2
--- php-src/ext/oracle/config.w32:1.1 Fri Dec 19 10:04:26 2003
+++ php-src/ext/oracle/config.w32 Wed Jan 7 15:06:29 2004
@@ -1,12 +1,12 @@
-// $Id: config.w32,v 1.1 2003/12/19 15:04:26 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/07 20:06:29 wez Exp $
// vim:ft=javascript
ARG_WITH("oracle", "ORACLE support", "no");
if (PHP_ORACLE != "no") {
- if (CHECK_HEADER_ADD_INCLUDE("winoci.h", "CFLAGS_ORACLE", PHP_PHP_BUILD +
"\\oci73\\include;" + PHP_ORACLE) &&
- CHECK_LIB("ociw32.lib", "oracle", PHP_PHP_BUILD +
"\\oci73\\lib;" + PHP_ORACLE)) {
+ if (CHECK_HEADER_ADD_INCLUDE("winoci.h", "CFLAGS_ORACLE", PHP_PHP_BUILD +
"\\oci7*\\include;" + PHP_ORACLE) &&
+ CHECK_LIB("ociw32.lib", "oracle", PHP_ORACLE, "oci7")) {
EXTENSION('oracle', 'oracle.c');
AC_DEFINE('HAVE_ORACLE', 1);
Index: php-src/ext/pspell/config.w32
diff -u php-src/ext/pspell/config.w32:1.1 php-src/ext/pspell/config.w32:1.2
--- php-src/ext/pspell/config.w32:1.1 Fri Dec 19 12:00:11 2003
+++ php-src/ext/pspell/config.w32 Wed Jan 7 15:06:30 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 17:00:11 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/07 20:06:30 wez Exp $
// vim:ft=javascript
ARG_WITH("pspell", "pspell/aspell (whatever it's called this month) support", "no");
@@ -6,11 +6,9 @@
if (PHP_PSPELL != "no") {
if (CHECK_HEADER_ADD_INCLUDE("pspell.h", "CFLAGS_PSPELL", PHP_PHP_BUILD +
"\\include\\pspell;" + PHP_PSPELL) &&
- CHECK_LIB("aspell-15.lib", "pspell", PHP_PSPELL)) {
+ CHECK_LIB("aspell*.lib", "pspell", PHP_PSPELL)) {
EXTENSION('pspell', 'pspell.c');
-
AC_DEFINE('HAVE_PSPELL', 1);
-
} else {
WARNING("pspell not enabled; libraries and headers not found");
}
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/config.w32:1.5 php-src/ext/zlib/config.w32:1.6
--- php-src/ext/zlib/config.w32:1.5 Mon Dec 22 01:19:01 2003
+++ php-src/ext/zlib/config.w32 Wed Jan 7 15:06:31 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2003/12/22 06:19:01 jon Exp $
+// $Id: config.w32,v 1.6 2004/01/07 20:06:31 wez Exp $
// vim:ft=javascript
ARG_ENABLE("zlib", "ZLIB support", "yes");
@@ -6,7 +6,7 @@
if (PHP_ZLIB == "yes") {
EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c", null, "/D ZLIB_EXPORTS");
AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
- CHECK_LIB("zlib.lib", "zlib", "..\\zlib;" + php_usual_lib_suspects);
+ CHECK_LIB("zlib.lib", "zlib", PHP_ZLIB);
CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" +
php_usual_include_suspects);
}
Index: php-src/sapi/nsapi/config.w32
diff -u php-src/sapi/nsapi/config.w32:1.3 php-src/sapi/nsapi/config.w32:1.4
--- php-src/sapi/nsapi/config.w32:1.3 Fri Dec 19 15:39:01 2003
+++ php-src/sapi/nsapi/config.w32 Wed Jan 7 15:06:31 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2003/12/19 20:39:01 wez Exp $
+// $Id: config.w32,v 1.4 2004/01/07 20:06:31 wez Exp $
ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');
@@ -11,8 +11,7 @@
WARNING("NSAPI module requires an --enable-zts build of PHP");
} else if (CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES) &&
-
CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
- "nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) {
+
[PHP-CVS] cvs: CVSROOT / avail
wez Wed Dec 24 09:05:23 2003 EDT Modified files: /CVSROOTavail Log: phpdoc karma for Marcin (mg) Index: CVSROOT/avail diff -u CVSROOT/avail:1.804 CVSROOT/avail:1.805 --- CVSROOT/avail:1.804 Wed Dec 24 09:03:41 2003 +++ CVSROOT/avail Wed Dec 24 09:05:22 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,tony2001,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-id,phpdoc-pt +avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eri
[PHP-CVS] cvs: CVSROOT / avail
wez Wed Dec 24 09:03:42 2003 EDT Modified files: /CVSROOTavail Log: xdiff karma for Marcin Index: CVSROOT/avail diff -u CVSROOT/avail:1.803 CVSROOT/avail:1.804 --- CVSROOT/avail:1.803 Sat Dec 20 18:54:25 2003 +++ CVSROOT/avail Wed Dec 24 09:03:41 2003 @@ -192,6 +192,7 @@ avail|djg|pear/File_Ogg avail|mg|pecl/lzf avail|mg|pecl/tcpwrap +avail|mg|pecl/xdiff avail|xnoguer|pecl/valkyrie avail|hfuecks|pear/XML_HTMLSax,pear/XML_SaxFilters,pear/Calendar avail|ths|pear/HTML_QuickForm/Renderer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
wez Tue Dec 23 15:12:56 2003 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
Fix segfault in ZTS mode
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.26 php-src/ext/tidy/tidy.c:1.27
--- php-src/ext/tidy/tidy.c:1.26Fri Dec 19 09:24:59 2003
+++ php-src/ext/tidy/tidy.c Tue Dec 23 15:12:55 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.26 2003/12/19 14:24:59 iliaa Exp $ */
+/* $Id: tidy.c,v 1.27 2003/12/23 20:12:55 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -690,6 +690,8 @@
PHP_MINIT_FUNCTION(tidy)
{
+ ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor);
+
REGISTER_INI_ENTRIES();
REGISTER_TIDY_CLASS(doc,NULL);
REGISTER_TIDY_CLASS(node, NULL);
@@ -703,8 +705,6 @@
tidy_object_handlers_doc.cast_object = tidy_doc_cast_handler;
tidy_object_handlers_node.cast_object = tidy_node_cast_handler;
- ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor);
-
_php_tidy_register_tags(INIT_FUNC_ARGS_PASSTHRU);
_php_tidy_register_attributes(INIT_FUNC_ARGS_PASSTHRU);
_php_tidy_register_nodetypes(INIT_FUNC_ARGS_PASSTHRU);
@@ -739,7 +739,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Library Version", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.26 2003/12/19 14:24:59 iliaa Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.27 2003/12/23 20:12:55 wez Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js
wez Tue Dec 23 12:20:51 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js
Log:
A more general check for dirs under Release or Debug.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.21 php-src/win32/build/config.w32:1.22
--- php-src/win32/build/config.w32:1.21 Tue Dec 23 11:01:41 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 12:20:50 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
+// $Id: config.w32,v 1.22 2003/12/23 17:20:50 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -116,12 +116,6 @@
var php_usual_include_suspects =
"..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32";
var php_usual_lib_suspects = "..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32";
-if (PHP_DEBUG == "yes") {
- php_usual_lib_suspects += ";..\\bindlib_w32\\Debug";
-} else {
- php_usual_lib_suspects += ";..\\bindlib_w32\\Release";
-}
-
// Poke around for some headers
function probe_basic_headers()
{
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.29 php-src/win32/build/confutils.js:1.30
--- php-src/win32/build/confutils.js:1.29 Tue Dec 23 08:10:54 2003
+++ php-src/win32/build/confutils.jsTue Dec 23 12:20:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
+// $Id: confutils.js,v 1.30 2003/12/23 17:20:50 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -463,7 +463,6 @@
} else {
target = "_" + target.toUpperCase();
}
-
if (path_to_check == null) {
path_to_check = php_usual_lib_suspects;
@@ -475,11 +474,20 @@
var i;
var libname;
+ var subdir = PHP_DEBUG == "yes" ? "Debug" : "Release";
+
libnames = libnames.split(';');
for (i = 0; i < libnames.length; i++) {
libname = libnames[i];
p = search_paths(libname, path_to_check, "LIB");
+ if (!p) {
+ p = search_paths(subdir + "\\" + libname, path_to_check,
"LIB");
+ if (p) {
+ p += "\\" + subdir;
+ }
+ }
+
if (typeof(p) == "string") {
ADD_FLAG("LDFLAGS" + target, '/libpath:"' + p + '" ');
ADD_FLAG("LIBS" + target, libname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 23 11:01:41 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Proper check for resolv.lib
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.20 php-src/win32/build/config.w32:1.21
--- php-src/win32/build/config.w32:1.20 Tue Dec 23 07:40:41 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 11:01:41 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.20 2003/12/23 12:40:41 wez Exp $
+// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -53,7 +53,7 @@
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
-DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib
resolv.lib");
+DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib");
// Set some debug/release specific options
if (PHP_DEBUG == "yes") {
@@ -116,6 +116,12 @@
var php_usual_include_suspects =
"..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32";
var php_usual_lib_suspects = "..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32";
+if (PHP_DEBUG == "yes") {
+ php_usual_lib_suspects += ";..\\bindlib_w32\\Debug";
+} else {
+ php_usual_lib_suspects += ";..\\bindlib_w32\\Release";
+}
+
// Poke around for some headers
function probe_basic_headers()
{
@@ -165,6 +171,7 @@
probe_basic_headers();
add_extra_dirs();
+CHECK_LIB("resolv.lib");
//DEFINE("PHP_BUILD", PHP_PHP_BUILD);
--
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 deplister.c mkdist.php
wez Tue Dec 23 10:33:14 2003 EDT
Added files:
/php-src/win32/builddeplister.c
Modified files:
/php-src/win32/buildMakefile mkdist.php
Log:
implement our own tiny little dependcy tracker and use
it to build distros.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.11 php-src/win32/build/Makefile:1.12
--- php-src/win32/build/Makefile:1.11 Tue Dec 23 00:43:19 2003
+++ php-src/win32/build/MakefileTue Dec 23 10:33:13 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.11 2003/12/23 05:43:19 fmk Exp $
+# $Id: Makefile,v 1.12 2003/12/23 15:33:13 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -85,7 +85,7 @@
for %T in ($(SAPI_TARGETS)) do $(MAKE) /nologo "%T"
for %T in ($(EXT_TARGETS)) do $(MAKE) /nologo "%T"
-build-dist:
+build-dist: $(BUILD_DIR)\deplister.exe
-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)"
@@ -96,10 +96,13 @@
dist: all build-dist
snap: build-snap build-dist
+$(BUILD_DIR)\deplister.exe:win32\build\deplister.c
+ $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR)
-o$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
+
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)"
install: all
- @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >null
- @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >null
-
\ No newline at end of file
+ @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
+ @copy $(BUILD_DIR)\*.dll $(PHP_PREFIX) /y >nul
+
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.4 php-src/win32/build/mkdist.php:1.5
--- php-src/win32/build/mkdist.php:1.4 Mon Dec 22 17:48:29 2003
+++ php-src/win32/build/mkdist.php Tue Dec 23 10:33:13 2003
@@ -1,4 +1,4 @@
- array("pipe", "w")),
+ $pipes);
+
$n = 0;
- while (($line = fgetcsv($fp))) {
+ while (($line = fgetcsv($pipes[1]))) {
$n++;
- if ($line[0] == 'D')
- continue;
- $dep = strtolower($line[1]);
+ $dep = strtolower($line[0]);
$depbase = basename($dep);
/* ignore stuff in our build dir, but only if it is
-* on of our targets */
- if (0 == strncmp($dep, $bd, strlen($bd)) &&
- (in_array($depbase, $sapi_targets) ||
+* one of our targets */
+ if (((in_array($depbase, $sapi_targets) ||
in_array($depbase, $ext_targets)) ||
- $depbase == $phpdll) {
+ $depbase == $phpdll) &&
file_exists($GLOBALS['build_dir'] . "/$depbase")) {
continue;
}
/* ignore some well-known system dlls */
@@ -91,8 +90,8 @@
$per_module_deps[basename($module)][] = $dep;
}
- fclose($fp);
- unlink($csvname);
+ fclose($pipes[1]);
+ proc_close($proc);
//echo "Module $module [$n lines]\n";
}
Index: php-src/win32/build/deplister.c
+++ php-src/win32/build/deplister.c
/*
+--+
| PHP Version 5|
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+-
[PHP-CVS] cvs: php-src /ext/dba config.w32
wez Tue Dec 23 09:05:33 2003 EDT
Modified files:
/php-src/ext/dbaconfig.w32
Log:
enable inifile handler under new win32 build too
Index: php-src/ext/dba/config.w32
diff -u php-src/ext/dba/config.w32:1.1 php-src/ext/dba/config.w32:1.2
--- php-src/ext/dba/config.w32:1.1 Sat Dec 6 18:39:07 2003
+++ php-src/ext/dba/config.w32 Tue Dec 23 09:05:33 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/06 23:39:07 edink Exp $
+// $Id: config.w32,v 1.2 2003/12/23 14:05:33 wez Exp $
// vim:ft=javascript
ARG_WITH("dba", "DBA support", "no");
@@ -6,11 +6,12 @@
if (PHP_DBA != "no") {
if (CHECK_LIB("libdb31s.lib", "dba", PHP_DBA) &&
CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) {
- EXTENSION("dba", "dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c
dba_flatfile.c dba_gdbm.c dba_ndbm.c");
+ EXTENSION("dba", "dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c
dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba");
ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba");
+ ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba");
AC_DEFINE('HAVE_DBA', 1, 'DBA support');
- ADD_FLAG("CFLAGS_DBA", "/D DBA_DB3=1 /D
DB3_INCLUDE_FILE=\"\\\"db.h\\\"\" /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D
DBA_CDB_BUILTIN=1");
+ ADD_FLAG("CFLAGS_DBA", "/D DBA_DB3=1 /D
DB3_INCLUDE_FILE=\"\\\"db.h\\\"\" /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D
DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1");
} else {
WARNING("dba not enabled; libraries and headers not found");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Tue Dec 23 08:11:05 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Attempt to work around apparent problems with WshShell.CurrentDirectory.
# Andi, please try this now
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.28 php-src/win32/build/confutils.js:1.29
--- php-src/win32/build/confutils.js:1.28 Mon Dec 22 20:55:33 2003
+++ php-src/win32/build/confutils.jsTue Dec 23 08:10:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.28 2003/12/23 01:55:33 wez Exp $
+// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -35,6 +35,12 @@
STDERR.WriteLine("Must be run from the root of the php source");
WScript.Quit(10);
}
+
+var CWD = WshShell.CurrentDirectory;
+
+if (typeof(CWD) == "undefined") {
+ CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.CVS-RULES"));
+}
/* defaults; we pick up the precise versions from configure.in */
var PHP_VERSION = 5;
@@ -80,17 +86,15 @@
function condense_path(path)
{
- var cd = WshShell.CurrentDirectory;
-
path = FSO.GetAbsolutePathName(path);
- if (path.substr(0, cd.length).toLowerCase()
- == cd.toLowerCase() &&
- (path.charCodeAt(cd.length) == 92 ||
path.charCodeAt(cd.length) == 47)) {
- return path.substr(cd.length + 1);
+ if (path.substr(0, CWD.length).toLowerCase()
+ == CWD.toLowerCase() &&
+ (path.charCodeAt(CWD.length) == 92 ||
path.charCodeAt(CWD.length) == 47)) {
+ return path.substr(CWD.length + 1);
}
- var a = cd.split("\\");
+ var a = CWD.split("\\");
var b = path.split("\\");
var i, j;
@@ -836,7 +840,7 @@
STDOUT.WriteLine("Generating main/internal_functions.c");
- infile = FSO.OpenTextFile(WshShell.CurrentDirectory +
"/main/internal_functions.c.in", 1);
+ infile = FSO.OpenTextFile("main/internal_functions.c.in", 1);
indata = infile.ReadAll();
infile.Close();
@@ -852,7 +856,7 @@
}
}
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
"/main/internal_functions.c", true);
+ outfile = FSO.CreateTextFile("main/internal_functions.c", true);
outfile.Write(indata);
outfile.Close();
}
@@ -908,11 +912,11 @@
STDOUT.WriteLine("Generating main/config.w32.h");
- infile = FSO.OpenTextFile(WshShell.CurrentDirectory +
"/win32/build/config.w32.h.in", 1);
+ infile = FSO.OpenTextFile("win32/build/config.w32.h.in", 1);
indata = infile.ReadAll();
infile.Close();
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory + "/main/config.w32.h",
true);
+ outfile = FSO.CreateTextFile("main/config.w32.h", true);
indata = indata.replace(new RegExp("@PREFIX@", "g"), prefix);
outfile.Write(indata);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Tue Dec 23 07:40:41 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Better implementation of the prefix thing
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.19 php-src/win32/build/config.w32:1.20
--- php-src/win32/build/config.w32:1.19 Tue Dec 23 00:43:19 2003
+++ php-src/win32/build/config.w32 Tue Dec 23 07:40:41 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.19 2003/12/23 05:43:19 fmk Exp $
+// $Id: config.w32,v 1.20 2003/12/23 12:40:41 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -21,10 +21,11 @@
ARG_ENABLE('zts', 'Thread safety', 'yes');
// Configures the hard-coded installation dir
-if (PHP_DEBUG == "yes") {
- ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5\\debug');
-} else {
- ARG_ENABLE('prefix', 'where PHP will be installed', 'C:\\php5');
+ARG_ENABLE('prefix', 'where PHP will be installed', '');
+if (PHP_PREFIX == '') {
+ PHP_PREFIX = "C:\\php" + PHP_VERSION;
+ if (PHP_DEBUG == "yes")
+ PHP_PREFIX += "\\debug";
}
DEFINE('PHP_PREFIX', PHP_PREFIX);
--
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 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 /win32/build confutils.js
wez Mon Dec 22 20:55:33 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Implement a glob() function for use by win32 configure.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.27 php-src/win32/build/confutils.js:1.28
--- php-src/win32/build/confutils.js:1.27 Mon Dec 22 19:36:32 2003
+++ php-src/win32/build/confutils.jsMon Dec 22 20:55:33 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.27 2003/12/23 00:36:32 fmk Exp $
+// $Id: confutils.js,v 1.28 2003/12/23 01:55:33 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -28,7 +28,7 @@
var PROGRAM_FILES = WshShell.Environment("Process").Item("ProgramFiles");
if (PROGRAM_FILES == null) {
- PROGRAM_FILES = "C:\\Program Files\\";
+ PROGRAM_FILES = "C:\\Program Files";
}
if (!FSO.FileExists("README.CVS-RULES")) {
@@ -624,7 +624,7 @@
MFO.WriteLine(makefiletarget + ": $(BUILD_DIR)\\" + makefiletarget);
MFO.WriteLine("[EMAIL PROTECTED] SAPI " + configure_module_dirname + " build
complete");
- MFO.WriteLine("$(BUILD_DIR)\\" + makefiletarget + ": $(" + SAPI +
"_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("$(BUILD_DIR)\\" + makefiletarget + ": $(DEPS_" + SAPI + ") $("
+ SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
if (makefiletarget.match(new RegExp("\\.dll$"))) {
ldflags = "/dll $(LDFLAGS)";
@@ -1059,6 +1059,98 @@
f.Close();
}
+// glob using simple filename wildcards
+// returns an array of matches that are found
+// in the filesystem
+function glob(path_pattern)
+{
+ var path_parts = path_pattern.replace(new RegExp("/", "g"), "\\").split("\\");
+ var p;
+ var base = "";
+ var is_pat_re = /\*/;
+
+ // first, build as much as possible that doesn't have a pattern
+ for (p = 0; p < path_parts.length; p++) {
+ if (path_parts[p].match(is_pat_re))
+ break;
+ if (p)
+ base += "\\";
+ base += path_parts[p];
+ }
+
+ return _inner_glob(base, p, path_parts);
+}
+
+function _inner_glob(base, p, parts)
+{
+ var pat = parts[p];
+ var full_name = base + "\\" + pat;
+ var re = null;
+ var items = null;
+
+//STDOUT.WriteLine("inner: base=" + base + " p=" + p + " pat=" + pat);
+
+ if (FSO.FileExists(full_name)) {
+ if (p < parts.length - 1) {
+ // we didn't reach the full extent of the pattern
+ return false;
+ }
+ return new Array(full_name);
+ }
+
+ if (FSO.FolderExists(full_name) && p == parts.length - 1) {
+ // we have reached the end of the pattern; no need to recurse
+ return new Array(full_name);
+ }
+
+ // Convert the pattern into a regexp
+ re = new RegExp("^" + pat.replace(/\./g, '\\.').replace(/\*/g, '.*') + "$");
+
+ items = new Array();
+
+ var folder = FSO.GetFolder(base);
+ var fc = null;
+ var subitems = null;
+ var item_name = null;
+ var j;
+
+ fc = new Enumerator(folder.SubFolders);
+ for (; !fc.atEnd(); fc.moveNext()) {
+ item_name = FSO.GetFileName(fc.item());
+
+ if (item_name.match(re)) {
+ // got a match; if we are at the end of the pattern, just add
these
+ // things to the items array
+ if (p == parts.length - 1) {
+ items[items.length] = fc.item();
+ } else {
+ // we should recurse and do more matches
+ subitems = _inner_glob(base + "\\" + item_name, p + 1,
parts);
+ if (subitems) {
+ for (j = 0; j < subitems.length; j++) {
+ items[items.length] = subitems[j];
+ }
+ }
+ }
+ }
+ }
+
+ // if we are at the end of the pattern, we should match
+ // files too
+ if (p == parts.length - 1) {
+ fc = new Enumerator(folder.Files);
+ for (; !fc.atEnd(); fc.moveNext()) {
+ item_name = FSO.GetFileName(fc.item());
+ if (item_name.match(re)) {
+ items[items.length] = fc.item();
+ }
+ }
+ }
+
+ return items;
+}
+
+
// for snapshot builders, this option will attempt to enable everything
// and you can then build everything, ignoring fatal errors within a mo
[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 fo
[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 @@ -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
[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/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
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
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
Re: [PHP-CVS] cvs: php-src /win32/build buildconf.js config.w32 TSRM config.w32 tsrm_win32.c tsrm_win32.h
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] 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 /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
#include
@@ -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
+#if HAVE_NEWAPIS_H
+# define WANT_GETLONGPATHNAME_WRAPPER
+# include
+#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 /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 L
[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) <http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[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 /main/streams transports.c
wez Sat Dec 20 15:25:55 2003 EDT Modified files: /php-src/main/streams transports.c Log: MFB fix for #25597 Index: php-src/main/streams/transports.c diff -u php-src/main/streams/transports.c:1.8 php-src/main/streams/transports.c:1.9 --- php-src/main/streams/transports.c:1.8 Sat Nov 29 16:46:50 2003 +++ php-src/main/streams/transports.c Sat Dec 20 15:25:55 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: transports.c,v 1.8 2003/11/29 21:46:50 wez Exp $ */ +/* $Id: transports.c,v 1.9 2003/12/20 20:25:55 wez Exp $ */ #include "php.h" #include "php_streams_int.h" @@ -78,7 +78,7 @@ return stream; } /* dead - kill it */ - php_stream_close(stream); + php_stream_pclose(stream); stream = NULL; /* fall through */ -- 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 fsock.c
wez Sat Dec 20 15:24:37 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard fsock.c
Log:
Fix Bug #25597 pfsockopen crashes when recycling a persistent list entry.
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.106.2.11 php-src/ext/standard/fsock.c:1.106.2.12
--- php-src/ext/standard/fsock.c:1.106.2.11 Sat Nov 29 07:02:40 2003
+++ php-src/ext/standard/fsock.cSat Dec 20 15:24:36 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: fsock.c,v 1.106.2.11 2003/11/29 12:02:40 wez Exp $ */
+/* $Id: fsock.c,v 1.106.2.12 2003/12/20 20:24:36 wez Exp $ */
/* converted to PHP Streams and moved much code to main/network.c [wez] */
@@ -164,7 +164,7 @@
php_stream_to_zval(stream, return_value);
} else {
/* it died; we need to replace it */
- php_stream_close(stream);
+ php_stream_pclose(stream);
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/embed config.w32 /win32/build confutils.js
wez Fri Dec 19 18:19:20 2003 EDT
Added files:
/php-src/sapi/embed config.w32
Modified files:
/php-src/win32/buildconfutils.js
Log:
Forgot to add embed config.w32, and tweak version resource when CREDITS file is
missing.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.22 php-src/win32/build/confutils.js:1.23
--- php-src/win32/build/confutils.js:1.22 Fri Dec 19 15:39:02 2003
+++ php-src/win32/build/confutils.jsFri Dec 19 18:19:18 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.22 2003/12/19 20:39:02 wez Exp $
+// $Id: confutils.js,v 1.23 2003/12/19 23:19:18 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -541,7 +541,7 @@
var res_desc = "PHP " + makefiletarget;
var res_prod_name = res_desc;
var credits;
- var thanks = null;
+ var thanks = "";
var logo = "";
if (FSO.FileExists(creditspath + '/CREDITS')) {
Index: php-src/sapi/embed/config.w32
+++ php-src/sapi/embed/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/19 23:19:19 wez Exp $
ARG_ENABLE('embed', 'Embedded SAPI library', 'no');
if (PHP_EMBED != "no") {
SAPI('embed', 'php_embed.c', 'php' + PHP_VERSION + 'embed.lib');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 flock.c flock.h
wez Fri Dec 19 18:18:15 2003 EDT
Modified files:
/php-src/win32 flock.c flock.h
Log:
Export flock for win32
Index: php-src/win32/flock.c
diff -u php-src/win32/flock.c:1.1.1.1 php-src/win32/flock.c:1.2
--- php-src/win32/flock.c:1.1.1.1 Wed Apr 7 17:05:12 1999
+++ php-src/win32/flock.c Fri Dec 19 18:18:14 2003
@@ -46,12 +46,13 @@
* Lift a leg, Yunie. Luv ya forever
*/
+#include "php.h"
#include
#include
#include
#include "flock.h"
-int flock(int fd, int op)
+PHPAPI int flock(int fd, int op)
{
HANDLE hdl = (HANDLE) _get_osfhandle(fd);
DWORD low = 1, high = 0;
Index: php-src/win32/flock.h
diff -u php-src/win32/flock.h:1.1.1.1 php-src/win32/flock.h:1.2
--- php-src/win32/flock.h:1.1.1.1 Wed Apr 7 17:05:12 1999
+++ php-src/win32/flock.h Fri Dec 19 18:18:14 2003
@@ -8,4 +8,4 @@
#define LOCK_NB 4
#define LOCK_UN 8
-extern int flock(int fd, int op);
+PHPAPI int flock(int fd, int op);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/aolserver config.w32 /sapi/apache config.w32 /sapi/apache_hooks config.w32 /sapi/nsapi config.w32 /sapi/pi3web config.w32 /win32/build config.w32 confutils.js mkdist.php
wez Fri Dec 19 15:39:04 2003 EDT
Added files:
/php-src/sapi/aolserver config.w32
/php-src/sapi/apache_hooks config.w32
/php-src/sapi/pi3webconfig.w32
Modified files:
/php-src/sapi/apacheconfig.w32
/php-src/sapi/nsapi config.w32
/php-src/win32/buildconfig.w32 confutils.js mkdist.php
Log:
More things for the new build system.
Pi3Web and aolserver build untested (no headers and libs for those here)
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.5 php-src/sapi/apache/config.w32:1.6
--- php-src/sapi/apache/config.w32:1.5 Thu Dec 4 08:38:45 2003
+++ php-src/sapi/apache/config.w32 Fri Dec 19 15:39:01 2003
@@ -1,27 +1,24 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.5 2003/12/04 13:38:45 wez Exp $
+// $Id: config.w32,v 1.6 2003/12/19 20:39:01 wez Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
ARG_WITH('apache-includes', 'Where to find Apache 1.3 headers', null);
ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
-if (PHP_APACHE == "yes") {
-
- if (!CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
- ";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include")) {
- ERROR("Could not find apache headers");
- }
-
- if (!CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
- ';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
- ERROR("Could not find apache libraries");
+if (PHP_APACHE != "no") {
+ if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
+ ";" + PROGRAM_FILES + "\\Apache
Group\\Apache\\include" +
+ ";..\\php_build\\apache\\src\\include") &&
+ CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
+ ';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
+ ';..\\php_build\\apache\\src\\corer')) {
+ // We need to play tricks to get our readdir.h used by apache
+ // headers
+ SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
+ 'php' + PHP_VERSION + 'apache.dll',
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+ } else {
+ WARNING("Could not find apache libraries/headers");
}
- // We need to play tricks to get our readdir.h used by apache
- // headers
- SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
- 'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
}
Index: php-src/sapi/nsapi/config.w32
diff -u php-src/sapi/nsapi/config.w32:1.2 php-src/sapi/nsapi/config.w32:1.3
--- php-src/sapi/nsapi/config.w32:1.2 Thu Dec 4 21:40:59 2003
+++ php-src/sapi/nsapi/config.w32 Fri Dec 19 15:39:01 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2003/12/05 02:40:59 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/19 20:39:01 wez Exp $
ARG_ENABLE('nsapi', 'Build NSAPI for Netscape/iPlanet/SunONE webservers', 'no');
@@ -7,20 +7,14 @@
ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null);
if (PHP_NSAPI != "no") {
-
if (PHP_ZTS == "no") {
- ERROR("NSAPI module requires an --enable-zts build of PHP");
- }
-
- if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
- PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES)) {
- ERROR("Could not find NSAPI headers");
- }
-
- if (!CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
+ WARNING("NSAPI module requires an --enable-zts build of PHP");
+ } else if (CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
+ PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES) &&
+
CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
"nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) {
- ERROR("Could not find NSAPI libraries");
+ SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D
XP_WIN32 ');
+ } else {
+ WARNING("Could not find NSAPI headers/libraries");
}
-
- SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 ');
}
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.15 php-src/win32/build/config.w32:1.16
--- php-src/win32/build/config.w32:1.15 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/config.w32 Fri Dec 19 15:39:02 2003
@@ -1,5 +1,5 @@
//
[PHP-CVS] cvs: php-src /sapi/apache2handler config.w32 php4apache2.dsp sapi_apache2.c
wez Fri Dec 19 13:28:57 2003 EDT
Added files:
/php-src/sapi/apache2handlerconfig.w32
Modified files:
/php-src/sapi/apache2handlerphp4apache2.dsp sapi_apache2.c
Log:
Make apache2handler build with new build system.
Perhaps also make it build with .dsp system too...
Index: php-src/sapi/apache2handler/php4apache2.dsp
diff -u php-src/sapi/apache2handler/php4apache2.dsp:1.3
php-src/sapi/apache2handler/php4apache2.dsp:1.4
--- php-src/sapi/apache2handler/php4apache2.dsp:1.3 Tue Oct 21 07:48:31 2003
+++ php-src/sapi/apache2handler/php4apache2.dsp Fri Dec 19 13:28:56 2003
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D
"_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D
"_USRDLL" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D
"PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D
"_MSWSOCK_" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D
"PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -95,7 +95,7 @@
# PROP Intermediate_Dir "Debug_TS"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "PHP_APACHE2_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
"_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D
"_USRDLL" /D "WIN32" /D "_MBCS" /D "_WINSOCK2API_" /D "_MSWSOCK_" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\TSRM" /D
"_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D
"_USRDLL" /D "WIN32" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.30
php-src/sapi/apache2handler/sapi_apache2.c:1.31
--- php-src/sapi/apache2handler/sapi_apache2.c:1.30 Fri Dec 12 12:19:10 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Dec 19 13:28:56 2003
@@ -18,9 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.30 2003/12/12 17:19:10 iliaa Exp $ */
-
-#include
+/* $Id: sapi_apache2.c,v 1.31 2003/12/19 18:28:56 wez Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -30,6 +28,8 @@
#include "php_variables.h"
#include "SAPI.h"
+#include
+
#include "ext/standard/php_smart_str.h"
#ifndef NETWARE
#include "ext/standard/php_standard.h"
Index: php-src/sapi/apache2handler/config.w32
+++ php-src/sapi/apache2handler/config.w32
// vim:ft=javascript
// $Id: config.w32,v 1.1 2003/12/19 18:28:56 wez Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
if (PHP_APACHE2HANDLER != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD
+ "\\apache2\\include") &&
CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD +
"\\apache2\\lib") &&
CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD +
"\
[PHP-CVS] cvs: php-src / NEWS /ext/notes .cvsignore notes.dsp notes.dsw php_notes.c php_notes.h
wez Fri Dec 19 12:13:21 2003 EDT Removed files: /php-src/ext/notes .cvsignore notes.dsp notes.dsw php_notes.c php_notes.h Modified files: /php-srcNEWS Log: Moved ext/notes to PECL. (win32 only, and doesn't build on snaps.php.net) Index: php-src/NEWS diff -u php-src/NEWS:1.1548 php-src/NEWS:1.1549 --- php-src/NEWS:1.1548 Fri Dec 19 08:37:39 2003 +++ php-src/NEWSFri Dec 19 12:13:20 2003 @@ -9,6 +9,7 @@ . ext/db (Jani, Derick) . ext/mcal (Jani, Derick) . ext/qtdom (Jani, Derick) + . ext/notes (Wez) - Added 'c' modifier to date() which returns the date in the ISO 8601 format. (Derick, Manuzhai) - Added an optional parameter to microtime() to get the time as float. (Andrey) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdf config.w32 /ext/pspell config.w32 /ext/snmp config.w32 snmp.c /ext/sockets config.w32 /ext/sybase_ct config.w32 /ext/tidy config.w32
wez Fri Dec 19 12:00:14 2003 EDT
Added files:
/php-src/ext/snmp config.w32
/php-src/ext/pdfconfig.w32
/php-src/ext/pspell config.w32
/php-src/ext/socketsconfig.w32
/php-src/ext/sybase_ct config.w32
/php-src/ext/tidy config.w32
Modified files:
/php-src/ext/snmp snmp.c
Log:
Make these build with new win32 build system.
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.88 php-src/ext/snmp/snmp.c:1.89
--- php-src/ext/snmp/snmp.c:1.88Thu Oct 16 22:21:27 2003
+++ php-src/ext/snmp/snmp.c Fri Dec 19 12:00:10 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.88 2003/10/17 02:21:27 iliaa Exp $ */
+/* $Id: snmp.c,v 1.89 2003/12/19 17:00:10 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -91,7 +91,11 @@
#include "keytools.h"
#include "parse.h"
#include "mib.h"
-#include "version.h"
+#ifndef PHP_WIN32
+/* this doesn't appear to be needed under win32 (perhaps at all)
+ * and the header file is not present in my UCD-SNMP headers */
+# include "version.h"
+#endif
#include "transform_oids.h"
#endif
/* Ugly macro, since the length of OIDs in UCD-SNMP and NET-SNMP
Index: php-src/ext/snmp/config.w32
+++ php-src/ext/snmp/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:10 wez Exp $
// vim:ft=javascript
ARG_WITH("snmp", "SNMP support", "no");
if (PHP_SNMP != "no") {
if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD +
"\\include\\ucd-snmp;" + PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
CHECK_LIB("libsnmp.lib", "snmp", PHP_SNMP)) {
EXTENSION('snmp', 'snmp.c');
AC_DEFINE('HAVE_SNMP', 1);
} else {
WARNING("snmp not enabled; libraries and headers not found");
}
}
Index: php-src/ext/pdf/config.w32
+++ php-src/ext/pdf/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:11 wez Exp $
// vim:ft=javascript
ARG_WITH("pdf", "PDF support", "no");
if (PHP_PDF != "no") {
if (CHECK_HEADER_ADD_INCLUDE("pdflib.h", "CFLAGS_PDF", PHP_PDF) &&
CHECK_LIB("libtiff.lib", "pdf", PHP_PDF) &&
CHECK_LIB("libpng.lib", "pdf", PHP_PDF) &&
CHECK_LIB("zlib.lib", "pdf", PHP_PDF) &&
CHECK_LIB("gdi32.lib", "pdf", PHP_PDF) &&
CHECK_LIB("pdflib.lib", "pdf", PHP_PDF)) {
EXTENSION('pdf', 'pdf.c');
AC_DEFINE('HAVE_PDFLIB', 1);
} else {
WARNING("pdf not enabled; libraries and headers not found");
}
}
Index: php-src/ext/pspell/config.w32
+++ php-src/ext/pspell/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:11 wez Exp $
// vim:ft=javascript
ARG_WITH("pspell", "pspell/aspell (whatever it's called this month) support", "no");
if (PHP_PSPELL != "no") {
if (CHECK_HEADER_ADD_INCLUDE("pspell.h", "CFLAGS_PSPELL", PHP_PHP_BUILD +
"\\include\\pspell;" + PHP_PSPELL) &&
CHECK_LIB("aspell-15.lib", "pspell", PHP_PSPELL)) {
EXTENSION('pspell', 'pspell.c');
AC_DEFINE('HAVE_PSPELL', 1);
} else {
WARNING("pspell not enabled; libraries and headers not found");
}
}
Index: php-src/ext/sockets/config.w32
+++ php-src/ext/sockets/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:12 wez Exp $
// vim:ft=javascript
ARG_ENABLE("sockets", "SOCKETS support", "no");
if (PHP_SOCKETS != "no") {
if (CHECK_LIB("ws2_32.lib", "sockets", PHP_SOCKETS)) {
EXTENSION('sockets', 'sockets.c php_sockets_win.c');
AC_DEFINE('HAVE_SOCKETS', 1);
} else {
WARNING("sockets not enabled; libraries and headers not found");
}
}
Index: php-src/ext/sybase_ct/config.w32
+++ php-src/ext/sybase_ct/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:13 wez Exp $
// vim:ft=javascript
ARG_WITH("sybase-ct", "SYBASE_CT support", "no");
if (PHP_SYBASE_CT != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ctpublic.h", "CFLAGS_SYBASE_CT", PHP_PHP_BUILD +
"\\sybase\\include;" + PHP_SYBASE_CT) &&
CHECK_LIB("libcs.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT) &&
CHECK_LIB("libct.lib", "sybase_ct", PHP_PHP_BUILD +
"\\sybase\\lib;" + PHP_SYBASE_CT)) {
EXTENSION('sybase_ct', 'php_sybase_ct.c');
AC_DEFINE('HAVE_SYBASE_CT', 1);
} else {
WARNING("sybase_ct not enabled; libraries and headers not found");
}
}
Index: php-src/ext/tidy/config.w32
+++ php-src/ext/tidy/config.w32
// $Id: config.w32,v 1.1 2003/12/19 17:00:13 wez Exp $
// vim:ft=javascript
ARG_WITH("tidy", "TIDY support", "no");
if (PHP_TIDY != "no") {
if (CHECK_LIB("libtidy.lib", "tidy", P
[PHP-CVS] cvs: php-src /ext/xmlrpc config.w32
wez Fri Dec 19 11:59:37 2003 EDT
Added files:
/php-src/ext/xmlrpc config.w32
Log:
Make xmlrpc build using our expat compat functions.
Would be good if someone could verify that it actually
works in this configuration.
Index: php-src/ext/xmlrpc/config.w32
+++ php-src/ext/xmlrpc/config.w32
// $Id: config.w32,v 1.1 2003/12/19 16:59:37 wez Exp $
// vim:ft=javascript
ARG_WITH("xmlrpc", "XMLRPC-EPI support", "no");
if (PHP_XMLRPC != "no") {
CHECK_HEADER_ADD_INCLUDE("xmlrpc.h", "CFLAGS_XMLRPC", configure_module_dirname
+ "/libxmlrpc");
EXTENSION('xmlrpc', 'xmlrpc-epi-php.c', PHP_XMLRPC_SHARED,
"-DVERSION=\"0.50\"");
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");
}
--
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 Fri Dec 19 11:59:07 2003 EDT
Added files:
/php-src/ext/yazconfig.w32
Log:
add config.w32 for ext/yaz
Edin: we need to update the yaz stuff in php-win32-dev
so that this extension will build.
Index: php-src/ext/yaz/config.w32
+++ php-src/ext/yaz/config.w32
// $Id: config.w32,v 1.1 2003/12/19 16:59:06 wez Exp $
// vim:ft=javascript
ARG_WITH("yaz", "YAZ support (ANSI/NISO Z39.50)", "no");
// 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;
}
}
}
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");
}
} 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/xml compat.c expat_compat.h
wez Fri Dec 19 11:57:37 2003 EDT
Modified files:
/php-src/ext/xmlcompat.c expat_compat.h
Log:
Export expat compat functions.
"Implement" XML_GetCurrentByteCount(); probably not 100%
correct, but the only usage of it is by xmlrpc extension when
reporting an error; it should be safe.
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.23 php-src/ext/xml/compat.c:1.24
--- php-src/ext/xml/compat.c:1.23 Fri Dec 5 05:53:59 2003
+++ php-src/ext/xml/compat.cFri Dec 19 11:57:36 2003
@@ -377,13 +377,13 @@
1
};
-XML_Parser
+PHPAPI XML_Parser
XML_ParserCreate(const XML_Char *encoding)
{
return XML_ParserCreate_MM(encoding, NULL, NULL);
}
-XML_Parser
+PHPAPI XML_Parser
XML_ParserCreateNS(const XML_Char *encoding, const XML_Char sep)
{
XML_Char tmp[2];
@@ -392,7 +392,7 @@
return XML_ParserCreate_MM(encoding, NULL, tmp);
}
-XML_Parser
+PHPAPI XML_Parser
XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite
*memsuite, const XML_Char *sep)
{
XML_Parser parser;
@@ -422,86 +422,86 @@
return parser;
}
-void
+PHPAPI void
XML_SetUserData(XML_Parser parser, void *user)
{
parser->user = user;
}
-void *
+PHPAPI void *
XML_GetUserData(XML_Parser parser)
{
return parser->user;
}
-void
+PHPAPI void
XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start,
XML_EndElementHandler end)
{
parser->h_start_element = start;
parser->h_end_element = end;
}
-void
+PHPAPI void
XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler cdata)
{
parser->h_cdata = cdata;
}
-void
+PHPAPI void
XML_SetProcessingInstructionHandler(XML_Parser parser,
XML_ProcessingInstructionHandler pi)
{
parser->h_pi = pi;
}
-void
+PHPAPI void
XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler comment)
{
parser->h_comment = comment;
}
-void
+PHPAPI void
XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler d)
{
parser->h_default = d;
}
-void
+PHPAPI void
XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler
unparsed_decl)
{
parser->h_unparsed_entity_decl = unparsed_decl;
}
-void
+PHPAPI void
XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler notation_decl)
{
parser->h_notation_decl = notation_decl;
}
-void
+PHPAPI void
XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler
ext_entity)
{
parser->h_external_entity_ref = ext_entity;
}
-void
+PHPAPI void
XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler
start_ns)
{
parser->h_start_ns = start_ns;
}
-void
+PHPAPI void
XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end_ns)
{
parser->h_end_ns = end_ns;
}
-int
+PHPAPI int
XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
{
return !xmlParseChunk(parser->parser, data, data_len, is_final);
}
-int
+PHPAPI int
XML_GetErrorCode(XML_Parser parser)
{
return parser->parser->errNo;
@@ -606,7 +606,7 @@
"XML_ERR_NO_DTD"
};
-const XML_Char *
+PHPAPI const XML_Char *
XML_ErrorString(int code)
{
if (code < 0 || code >= (int)sizeof(error_mapping)) {
@@ -615,26 +615,35 @@
return error_mapping[code];
}
-int
+PHPAPI int
XML_GetCurrentLineNumber(XML_Parser parser)
{
return parser->parser->input->line;
}
-int
+PHPAPI int
XML_GetCurrentColumnNumber(XML_Parser parser)
{
return parser->parser->input->col;
}
-int
+PHPAPI int
XML_GetCurrentByteIndex(XML_Parser parser)
{
return parser->parser->input->consumed +
(parser->parser->input->cur - parser->parser->input->base);
}
-const XML_Char *XML_ExpatVersion(void)
+PHPAPI int
+XML_GetCurrentByteCount(XML_Parser parser)
+{
+ /* WARNING: this is identical to ByteIndex; it should probably
+* be different */
+ return parser->parser->input->consumed +
+ (parser->parser->input->cur - parser->parser->input->base);
+}
+
+PHPAPI const XML_Char *XML_ExpatVersion(void)
{
return "1.0";
}
@@ -662,7 +671,7 @@
efree(ptr);
}
-void
+PHPAPI void
XML_ParserFree(XML_Parser parser)
{
if (parser->use_namespace) {
Index: php-src/ext/xml/expat_compat.h
diff -u php-src/ext/xml/expat_compat.h:1.13 php-src/ext/xml/expat_compat.h:1.14
--- php-src/ext/xml/expat_compat.h:1.13 Mon Sep 29 07:35:39 2003
+++ php-src/ext/xml/expat_compat.h Fri Dec 19 11:57:36 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: expat_compat.h,v 1.13 2003/09/29 11:35:39 rrichards Exp $ */
+/* $Id: expat_compat.h,v 1.14 2003/12/19 16:57:36 wez Exp $ */
#ifndef PHP_EXPAT_COMPAT_H
#define PHP_EXPAT_COMPAT_H
@@ -113,28 +11
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Fri Dec 19 11:56:00 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
don't overwrite internal_functions.c if the content did not change;
this saves re-linking php*.dll when you add shared extensions to
your config.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.20 php-src/win32/build/confutils.js:1.21
--- php-src/win32/build/confutils.js:1.20 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/confutils.jsFri Dec 19 11:55:59 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.20 2003/12/19 12:50:11 wez Exp $
+// $Id: confutils.js,v 1.21 2003/12/19 16:55:59 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -779,11 +779,19 @@
indata = infile.ReadAll();
infile.Close();
- outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
"/main/internal_functions.c", true);
-
indata = indata.replace("@EXT_INCLUDE_CODE@", extension_include_code);
indata = indata.replace("@EXT_MODULE_PTRS@", extension_module_ptrs);
+ if (FSO.FileExists("main/internal_functions.c")) {
+ var origdata = file_get_contents("main/internal_functions.c");
+
+ if (origdata == indata) {
+ STDOUT.WriteLine("\t[content unchanged; skipping]");
+ return;
+ }
+ }
+
+ outfile = FSO.CreateTextFile(WshShell.CurrentDirectory +
"/main/internal_functions.c", true);
outfile.Write(indata);
outfile.Close();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext config.w32 /ext/interbase config.w32 /ext/ldap config.w32 /ext/mcrypt config.w32 /ext/mcve config.w32 /ext/mime_magic config.w32 /ext/ming config.w32 /ext/msql config.w32 /ext/oci8 config.w32 /ext/oracle config.w32
wez Fri Dec 19 10:04:27 2003 EDT
Added files:
/php-src/ext/gettextconfig.w32
/php-src/ext/interbase config.w32
/php-src/ext/ldap config.w32
/php-src/ext/mcrypt config.w32
/php-src/ext/mcve config.w32
/php-src/ext/mime_magic config.w32
/php-src/ext/ming config.w32
/php-src/ext/msql config.w32
/php-src/ext/oci8 config.w32
/php-src/ext/oracle config.w32
Log:
make these build with new win32 build system.
mcve untested (I don't have those libs/headers)
Index: php-src/ext/gettext/config.w32
+++ php-src/ext/gettext/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:20 wez Exp $
// vim:ft=javascript
ARG_WITH("gettext", "gettext support", "no");
if (PHP_GETTEXT != "no") {
if (CHECK_LIB("libintl.lib", "gettext", PHP_GETTEXT) &&
CHECK_HEADER_ADD_INCLUDE("libintl.h", "CFLAGS_GETTEXT")) {
EXTENSION("gettext", "gettext.c", PHP_GETTEXT_SHARED,
"-DHAVE_BIND_TEXTDOMAIN_CODESET=1 -DHAVE_DNGETTEXT=1 -DHAVE_NGETTEXT=1");
} else {
WARNING("gettext not enabled; libraries and headers not found");
}
}
Index: php-src/ext/interbase/config.w32
+++ php-src/ext/interbase/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:20 wez Exp $
// vim:ft=javascript
ARG_WITH("interbase", "InterBase support", "no");
if (PHP_INTERBASE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_PHP_BUILD +
"\\interbase\\include;" + PHP_INTERBASE) &&
CHECK_LIB("ib_util_ms.lib", "interbase", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_INTERBASE) &&
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_INTERBASE)) {
EXTENSION("interbase", "interbase.c");
AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
} else {
WARNING("interbase not enabled; libraries and headers not found");
}
}
Index: php-src/ext/ldap/config.w32
+++ php-src/ext/ldap/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:21 wez Exp $
// vim:ft=javascript
ARG_WITH("ldap", "LDAP support", "no");
if (PHP_LDAP != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD +
"\\openldap\\include;" + PHP_LDAP) &&
CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) &&
CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) &&
CHECK_LIB("oldap32.lib", "ldap", PHP_LDAP) &&
CHECK_LIB("olber32.lib", "ldap", PHP_LDAP)) {
EXTENSION('ldap', 'ldap.c');
AC_DEFINE('HAVE_LDAP_START_TLS_S', 1);
AC_DEFINE('HAVE_LDAP', 1);
} else {
WARNING("ldap not enabled; libraries and headers not found");
}
}
Index: php-src/ext/mcrypt/config.w32
+++ php-src/ext/mcrypt/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:22 wez Exp $
// vim:ft=javascript
ARG_WITH("mcrypt", "mcrypt support", "no");
if (PHP_MCRYPT != "no") {
if (CHECK_HEADER_ADD_INCLUDE('mcrypt.h', 'CFLAGS_MCRYPT') &&
CHECK_LIB('libmcrypt.lib', 'mcrypt')) {
EXTENSION('mcrypt', 'mcrypt.c');
AC_DEFINE('HAVE_LIBMCRYPT', 1);
AC_DEFINE('HAVE_LIBMCRYPT24', 1);
AC_DEFINE('HAVE_MCRYPT_GENERIC_DEINIT', 1);
} else {
WARNING("mcrypt not enabled; libraries and headers not found");
}
}
Index: php-src/ext/mcve/config.w32
+++ php-src/ext/mcve/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:22 wez Exp $
// vim:ft=javascript
ARG_WITH("mcve", "MCVE support", "no");
if (PHP_MCVE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("mcve.h", "CFLAGS_MCVE", PHP_MCVE) &&
CHECK_LIB("ssleay32.lib", "mcve", PHP_MCVE) &&
CHECK_LIB("libeay32.lib", "mcve", PHP_MCVE) &&
CHECK_LIB("libmcve.lib", "mcve", PHP_MCVE)) {
EXTENSION('mcve', 'mcve.c');
AC_DEFINE('HAVE_MCVE', 1);
} else {
WARNING("mcve not enabled; libraries and headers not found");
}
}
Index: php-src/ext/mime_magic/config.w32
+++ php-src/ext/mime_magic/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:23 wez Exp $
// vim:ft=javascript
ARG_WITH("mime-magic", "Mime Magic support", "no");
if (PHP_MIME_MAGIC != "no") {
EXTENSION('mime_magic', 'mime_magic.c');
}
Index: php-src/ext/ming/config.w32
+++ php-src/ext/ming/config.w32
// $Id: config.w32,v 1.1 2003/12/19 15:04:23 wez Exp $
// vim:ft=javascript
ARG_WITH("ming", "MING support", "no");
if (PHP_MING != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ming.h", "CFLAGS_MING", PHP_MING) &&
CHECK_LIB("libming.lib", "ming", PHP_MING)) {
EXTENSION('ming', 'ming.c');
AC_DEFINE('HAVE_MING', 1);
}
[PHP-CVS] cvs: php-src /ext/zlib config.w32
wez Fri Dec 19 07:54:49 2003 EDT
Modified files:
/php-src/ext/zlib config.w32
Log:
we only use zlib.lib
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/config.w32:1.3 php-src/ext/zlib/config.w32:1.4
--- php-src/ext/zlib/config.w32:1.3 Fri Dec 5 15:17:47 2003
+++ php-src/ext/zlib/config.w32 Fri Dec 19 07:54:49 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2003/12/05 20:17:47 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/19 12:54:49 wez Exp $
// vim:ft=javascript
ARG_ENABLE("zlib", "ZLIB support", "yes");
@@ -6,7 +6,7 @@
if (PHP_ZLIB == "yes") {
EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c", null, "/D ZLIB_EXPORTS");
AC_DEFINE("HAVE_ZLIB", 1, "Tokenizer support");
- CHECK_LIB("zlib_a;zlib.lib", "zlib", "..\\zlib;" + php_usual_lib_suspects);
+ CHECK_LIB("zlib.lib", "zlib", "..\\zlib;" + php_usual_lib_suspects);
CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" +
php_usual_include_suspects);
}
--
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
wez Fri Dec 19 07:53:42 2003 EDT
Modified files:
/php-src/ext/imap config.w32
Log:
detect c-client headers correctly using Edin's php-win32-dev layout
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.1 php-src/ext/imap/config.w32:1.2
--- php-src/ext/imap/config.w32:1.1 Mon Dec 8 17:15:20 2003
+++ php-src/ext/imap/config.w32 Fri Dec 19 07:53:41 2003
@@ -1,11 +1,12 @@
-// $Id: config.w32,v 1.1 2003/12/08 22:15:20 fmk Exp $
+// $Id: config.w32,v 1.2 2003/12/19 12:53:41 wez Exp $
// vim:ft=javascript
ARG_WITH("imap", "IMAP Support", "no");
if (PHP_IMAP == "yes") {
if (CHECK_LIB("cclient.lib", "imap") &&
- CHECK_HEADER_ADD_INCLUDE("rfc822.h", "CFLAGS_IMAP")) {
+ (CHECK_HEADER_ADD_INCLUDE("c-client.h", "CFLAGS_IMAP")||
+ CHECK_HEADER_ADD_INCLUDE("c-client/c-client.h", "CFLAGS_IMAP",
null, null, true))) {
CHECK_LIB("winmm.lib", "imap");
CHECK_LIB("ws2_32.lib", "imap");
CHECK_LIB("Secur32.lib", "imap");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.w32
wez Fri Dec 19 07:52:40 2003 EDT
Modified files:
/php-src/ext/curl config.w32
Log:
copy-n-paste error
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.1 php-src/ext/curl/config.w32:1.2
--- php-src/ext/curl/config.w32:1.1 Wed Dec 3 22:46:12 2003
+++ php-src/ext/curl/config.w32 Fri Dec 19 07:52:39 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/04 03:46:12 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/19 12:52:39 wez Exp $
// vim:ft=javascript
ARG_WITH("curl", "CURL support", "no");
@@ -15,6 +15,6 @@
// TODO: check for curl_version_info
AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL wrappers
[experimental]');
} else {
- WARNING("cpdf not enabled; libraries and headers not found");
+ WARNING("curl 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/com_dotnet config.w32
wez Fri Dec 19 07:52:09 2003 EDT
Modified files:
/php-src/ext/com_dotnet config.w32
Log:
Explicitly depend on oleaut32.lib
Index: php-src/ext/com_dotnet/config.w32
diff -u php-src/ext/com_dotnet/config.w32:1.3 php-src/ext/com_dotnet/config.w32:1.4
--- php-src/ext/com_dotnet/config.w32:1.3 Thu Dec 4 21:58:31 2003
+++ php-src/ext/com_dotnet/config.w32 Fri Dec 19 07:52:08 2003
@@ -1,13 +1,13 @@
-// $Id: config.w32,v 1.3 2003/12/05 02:58:31 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/19 12:52:08 wez Exp $
// vim:ft=javascript
ARG_ENABLE("com-dotnet", "COM and .Net support", "yes");
if (PHP_COM_DOTNET == "yes") {
+ CHECK_LIB('oleaut32.lib', 'com_dotnet');
EXTENSION("com_dotnet", "com_com.c com_dotnet.c com_extension.c \
com_handlers.c com_iterator.c com_misc.c com_olechar.c \
com_typeinfo.c com_variant.c");
AC_DEFINE('HAVE_COM_DOTNET', 1, 'Have COM_DOTNET support');
- // TODO: do a header check for this
CHECK_HEADER_ADD_INCLUDE('mscoree.h', 'CFLAGS_COM_DOTNET');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / cvsclean.bat /win32/build cvsclean.js
wez Fri Dec 19 07:51:20 2003 EDT
Added files:
/php-src/win32/buildcvsclean.js
Modified files:
/php-srccvsclean.bat
Log:
"Real" cvsclean, works as the unix version does
Index: php-src/cvsclean.bat
diff -u php-src/cvsclean.bat:1.1 php-src/cvsclean.bat:1.2
--- php-src/cvsclean.bat:1.1Sat Dec 13 13:50:38 2003
+++ php-src/cvsclean.batFri Dec 19 07:51:19 2003
@@ -1,2 +1,2 @@
@echo off
-nmake /I clean
+cscript /nologo win32\build\cvsclean.js
Index: php-src/win32/build/cvsclean.js
+++ php-src/win32/build/cvsclean.js
/*
+--+
| PHP Version 5|
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
/* $Id: cvsclean.js,v 1.1 2003/12/19 12:51:19 wez Exp $ */
// Cleans up files that do not belong in CVS
var FSO = WScript.CreateObject("Scripting.FileSystemObject");
function find_cvsignore(dirname)
{
if (!FSO.FolderExists(dirname))
return;
var f = FSO.GetFolder(dirname);
var fc = new Enumerator(f.SubFolders);
for (; !fc.atEnd(); fc.moveNext()) {
find_cvsignore(fc.item());
}
if (FSO.FileExists(dirname + "\\.cvsignore")) {
kill_from_cvsignore(dirname + "\\.cvsignore");
}
}
/* recursive remove using cvsignore style wildcard matching;
* note that FSO.DeleteFolder and FSO.DeleteFile methods both
* accept wildcards, but that they are dangerous to use eg:
* "*.php" will match "*.phpt" */
function rm_r(filename)
{
if (FSO.FolderExists(filename)) {
var fc = new Enumerator(FSO.GetFolder(filename).SubFolders);
for (; !fc.atEnd(); fc.moveNext()) {
rm_r(fc.item());
}
fc = new Enumerator(FSO.GetFolder(filename).Files);
for (; !fc.atEnd(); fc.moveNext()) {
FSO.DeleteFile(fc.item(), true);
}
FSO.DeleteFolder(filename, true);
} else if (FSO.FileExists(filename)) {
FSO.DeleteFile(filename, true);
} else {
/* we need to handle wildcards here */
var foldername = FSO.GetParentFolderName(filename);
if (foldername == "")
foldername = ".";
var filename = FSO.GetFileName(filename);
var retext = filename.replace(/\./g, '\\.');
retext = '^' + retext.replace(/\*/g, '.*') + "$";
var re = new RegExp(retext);
var folder = FSO.GetFolder(foldername);
var fc = new Enumerator(folder.SubFolders);
for (; !fc.atEnd(); fc.moveNext()) {
var item = FSO.GetFileName(fc.item());
if (item.match(re)) {
rm_r(fc.item());
}
}
var fc = new Enumerator(folder.Files);
for (; !fc.atEnd(); fc.moveNext()) {
item = FSO.GetFileName(fc.item());
if (item.match(re)) {
FSO.DeleteFile(fc.item(), true);
}
}
}
}
function kill_from_cvsignore(igfile)
{
var dir = FSO.GetParentFolderName(igfile) + "\\";
var t = FSO.OpenTextFile(igfile, 1);
var l;
if (dir == ".\\") {
dir = "";
}
while (!t.atEndOfStream) {
l = t.ReadLine();
// don't kill their config.nice file(s)
if (l.match("config\.nice.*"))
continue;
rm_r(dir + l);
}
}
find_cvsignore(".");
--
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 buildconf.js config.w32 confutils.js mkdist.php
wez Fri Dec 19 07:50:12 2003 EDT
Modified files:
/php-src/win32/buildMakefile buildconf.js config.w32 confutils.js
mkdist.php
Log:
Refinements for new build system:
- Add major + minor version to .dll and .exe headers during linking
- Handle pecl build dir correctly when pecl is a sibling of php-src
- try and guess where your cygwin utils are installed (if you have them)
so that we can detect bison, flex etc.
- other little refinements
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.8 php-src/win32/build/Makefile:1.9
--- php-src/win32/build/Makefile:1.8Sat Dec 6 11:14:03 2003
+++ php-src/win32/build/MakefileFri Dec 19 07:50:11 2003
@@ -14,36 +14,37 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +--+
#
-# $Id: Makefile,v 1.8 2003/12/06 16:14:03 wez Exp $
+# $Id: Makefile,v 1.9 2003/12/19 12:50:11 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
LD="$(LINK)"
-all: $(BUILD_DIR) generated_files $(EXT_TARGETS) $(SAPI_TARGETS)
+all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(SAPI_TARGETS)
generated_files: Zend\zend_ini_parser.c \
Zend\zend_language_parser.c Zend\zend_ini_scanner.c \
Zend\zend_language_scanner.c \
+ ext\standard\parsedate.c \
$(PHPDEF)
-win32\phpts.def: $(PHP_DLL_DEF_SOURCES)
- type $(PHP_DLL_DEF_SOURCES) > win32\phpts.def
+$(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES)
+ type $(PHP_DLL_DEF_SOURCES) > $(BUILD_DIR)\$(PHPDLL).def
Zend\zend_ini_parser.c Zend\zend_ini_parser.h: Zend\zend_ini_parser.y
- bison --output=Zend/zend_ini_parser.c -v -d -p ini_ Zend/zend_ini_parser.y
+ $(BISON) --output=Zend/zend_ini_parser.c -v -d -p ini_ Zend/zend_ini_parser.y
Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_parser.y
- bison --output=Zend/zend_language_parser.c -v -d -p zend
Zend/zend_language_parser.y
+ $(BISON) --output=Zend/zend_language_parser.c -v -d -p zend
Zend/zend_language_parser.y
Zend\zend_ini_scanner.c: Zend\flex.skl Zend\zend_ini_scanner.l
- flex -B -i -SZend/flex.skl -Pini_ -oZend/zend_ini_scanner.c
Zend/zend_ini_scanner.l
+ $(FLEX) -B -i -SZend/flex.skl -Pini_ -oZend/zend_ini_scanner.c
Zend/zend_ini_scanner.l
Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l
- flex -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
+ $(FLEX) -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y
- bison --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y
+ $(BISON) --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y
PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
@@ -57,17 +58,21 @@
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
-$(BUILD_DIR):
- mkdir $(BUILD_DIR)
- for %D in ($(BUILD_DIRS_SUB)) do mkdir %D
+$(BUILD_DIR) $(BUILD_DIRS_SUB):
+ @echo Recreating build dirs
+ @if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
+ @for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
clean-sapi:
- for %D in ($(EXT_TARGETS) $(SAPI_TARGETS)) do del /F /Q $(BUILD_DIR)\%D
- del /F /Q $(BUILD_DIR)\$(PHPDLL)
+ @echo Cleaning SAPI
+ @for %D in ($(EXT_TARGETS) $(SAPI_TARGETS)) do @del /F /Q $(BUILD_DIR)\%D > NUL
+ @del /F /Q $(BUILD_DIR)\$(PHPDLL)
clean: clean-sapi
- for %D in ($(BUILD_DIRS_SUB)) do del /F /Q %D\*.*
- del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp
+ @echo Cleaning
+ @for %D in ($(BUILD_DIRS_SUB)) do @del /F /Q %D\*.* > NUL
+ @del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING).zip > NUL
+ -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
test:
< 0) {
+ /* first difference found */
+ path = "";
+ for (j = 0; j < a.length - i; j++) {
+ path += "..\\";
+ }
+ for (j = i; j < b.length; j++) {
+ path += b[j];
+ if (j < b.length - 1)
+ path += "\\";
+ }
+ return path;
+ }
+ /* on a different drive */
+ break;
+ }
+
return path;
}
@@ -343,17 +398,26 @@
retur
[PHP-CVS] cvs: php-src /win32 select.c
wez Fri Dec 19 07:44:23 2003 EDT
Modified files:
/php-src/win32 select.c
Log:
this should be an int
Index: php-src/win32/select.c
diff -u php-src/win32/select.c:1.7 php-src/win32/select.c:1.8
--- php-src/win32/select.c:1.7 Sun Dec 14 22:15:50 2003
+++ php-src/win32/select.c Fri Dec 19 07:44:22 2003
@@ -21,7 +21,7 @@
#ifdef PHP_WIN32
-/* $Id: select.c,v 1.7 2003/12/15 03:15:50 iliaa Exp $ */
+/* $Id: select.c,v 1.8 2003/12/19 12:44:22 wez Exp $ */
/* Win32 select() will only work with sockets, so we roll our own implementation here.
* - If you supply only sockets, this simply passes through to winsock select().
@@ -34,7 +34,7 @@
* - Calling this with NULL sets as a portable way to sleep with sub-second
* accuracy is not supported.
* */
-PHPAPI int php_select(php_socket_t max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds,
struct timeval *tv)
+PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct
timeval *tv)
{
DWORD ms_total, limit;
HANDLE handles[MAXIMUM_WAIT_OBJECTS];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard parsedate.y
wez Fri Dec 19 07:43:39 2003 EDT Modified files: /php-src/ext/standard parsedate.y Log: add prototype Index: php-src/ext/standard/parsedate.y diff -u php-src/ext/standard/parsedate.y:1.50 php-src/ext/standard/parsedate.y:1.51 --- php-src/ext/standard/parsedate.y:1.50 Wed Dec 10 09:08:06 2003 +++ php-src/ext/standard/parsedate.yFri Dec 19 07:43:39 2003 @@ -8,7 +8,7 @@ ** This code is in the public domain and has no copyright. */ -/* $Id: parsedate.y,v 1.50 2003/12/10 14:08:06 sniper Exp $ */ +/* $Id: parsedate.y,v 1.51 2003/12/19 12:43:39 wez Exp $ */ #include "php.h" @@ -148,6 +148,7 @@ #define YYSTYPE date_ll #define YYLTYPE void +static int yylex (YYSTYPE *lvalp, void *parm); %} /* This grammar has 22 shift/reduce conflicts. */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests .cvsignore
wez Fri Dec 19 07:42:59 2003 EDT Modified files: /php-src/ext/sqlite/tests .cvsignore Log: ignore .tmp files created by tests Index: php-src/ext/sqlite/tests/.cvsignore diff -u php-src/ext/sqlite/tests/.cvsignore:1.1 php-src/ext/sqlite/tests/.cvsignore:1.2 --- php-src/ext/sqlite/tests/.cvsignore:1.1 Fri Apr 18 16:53:18 2003 +++ php-src/ext/sqlite/tests/.cvsignore Fri Dec 19 07:42:59 2003 @@ -5,3 +5,4 @@ *.out *.php *.db +*.tmp -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gdft.c
wez Fri Dec 19 07:41:25 2003 EDT Modified files: /php-src/ext/gd/libgd gdft.c Log: be slightly nicer when defining R_OK Index: php-src/ext/gd/libgd/gdft.c diff -u php-src/ext/gd/libgd/gdft.c:1.28 php-src/ext/gd/libgd/gdft.c:1.29 --- php-src/ext/gd/libgd/gdft.c:1.28Wed Dec 17 17:47:02 2003 +++ php-src/ext/gd/libgd/gdft.c Fri Dec 19 07:41:24 2003 @@ -16,7 +16,9 @@ #include #else #include -#define R_OK 04/* Needed in Windows */ +#ifndef R_OK +# define R_OK 04 /* Needed in Windows */ +#endif #endif #ifdef WIN32 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32 winutil.c
In addition, the memory allocated by FormatMessage() should be free'd using LocalFree(), not free(). --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 winutil.c
This function is not used exclusively by dl_error; it is used in many places (network, com and other win32 extensions) to get a readable version of a win32 error code. --Wez. - Original Message - From: "Marcus Boerger" <[EMAIL PROTECTED]> To: "Wez Furlong" <[EMAIL PROTECTED]> Cc: "Marcus Boerger" <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]> Sent: Thursday, December 18, 2003 11:47 AM Subject: Re: [PHP-CVS] cvs: php-src /win32 winutil.c > Hello Wez, > > Thursday, December 18, 2003, 12:23:27 PM, you wrote: > > > There is a deeper problem; this function is actually called > > from many win32 extensions where the result is correctly free'd, > > so we cannot use a static buffer here at all. > > That is wrong behavior. The behavior of dl_error() has to reflect that of > the *nix implementation where it came from and there the buffer is allocated > and freed on the next call. Since also dl_error is only called in non > threaded environments my patch seemd the correct solution. If you now tell > that windows extensions free that pointer that is an error - not the > dl_error() patch. > > marcus > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 winutil.c
wez Thu Dec 18 06:32:20 2003 EDT
Modified files:
/php-src/win32 winutil.c
Log:
make it totally safe again
Index: php-src/win32/winutil.c
diff -u php-src/win32/winutil.c:1.13 php-src/win32/winutil.c:1.14
--- php-src/win32/winutil.c:1.13Thu Dec 18 06:16:16 2003
+++ php-src/win32/winutil.c Thu Dec 18 06:32:19 2003
@@ -1,6 +1,6 @@
/*
+--+
- | PHP Version 4|
+ | PHP Version 5|
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
@@ -16,20 +16,13 @@
+--+
*/
+/* $Id: winutil.c,v 1.14 2003/12/18 11:32:19 wez Exp $ */
+
#include "php.h"
PHPAPI char *php_win_err(int error)
{
- static char *buf = NULL;
-
-#if MBO_0
- /* leak for now */
- if (buf) {
- free(buf);
- }
-#endif
-
- buf = NULL;
+ char *buf = NULL;
FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_network.h
wez Thu Dec 18 06:26:01 2003 EDT Modified files: /php-src/main php_network.h Log: Counteract brain-death in Apache headers (they #define strtoul to something that will break compilation, and it successfully breaks the win32 IPv6 headers) Index: php-src/main/php_network.h diff -u php-src/main/php_network.h:1.49 php-src/main/php_network.h:1.50 --- php-src/main/php_network.h:1.49 Sat Dec 6 05:32:35 2003 +++ php-src/main/php_network.h Thu Dec 18 06:26:00 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_network.h,v 1.49 2003/12/06 10:32:35 wez Exp $ */ +/* $Id: php_network.h,v 1.50 2003/12/18 11:26:00 wez Exp $ */ #ifndef _PHP_NETWORK_H #define _PHP_NETWORK_H @@ -27,6 +27,9 @@ # endif # undef FD_SETSIZE # include "arpa/inet.h" + /* Apache folks decided that strtoul was evil and redefined + * it to something that breaks the windows headers */ +# undef strtoul /* defines socklen_t and some IPV6 stuff */ # include # if HAVE_WSPIAPI_H -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32 winutil.c
There is a deeper problem; this function is actually called from many win32 extensions where the result is correctly free'd, so we cannot use a static buffer here at all. --Wez. - Original Message - From: "Marcus Boerger" <[EMAIL PROTECTED]> To: "Marcus Boerger" <[EMAIL PROTECTED]> Cc: <[EMAIL PROTECTED]> Sent: Thursday, December 18, 2003 11:16 AM Subject: Re: [PHP-CVS] cvs: php-src /win32 winutil.c > Hello, > > Thursday, December 18, 2003, 12:05:22 PM, you wrote: > > > helly Thu Dec 18 06:05:22 2003 EDT > > > Modified files: > > /php-src/win32 winutil.c > > Log: > > Leak for b3 and find a better solution until RC1 > > The win guru's liked this behavior more for b3. > But we found out that this should be a 'non issue' since dl_error is > cannot be used in threaded environments. Hence i'd say simply remove the > ifdeffing after b3 and be done with it. > > marcus > > -- > 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
