[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Dec 3 20:31:59 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.348 ZendEngine2/ChangeLog:1.349 --- ZendEngine2/ChangeLog:1.348 Tue Dec 2 20:32:23 2003 +++ ZendEngine2/ChangeLog Wed Dec 3 20:31:59 2003 @@ -1,3 +1,21 @@ +2003-12-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* tests/bug24773.phpt: + Test case for bug #24773. + +2003-12-03 Moriyoshi Koizumi [EMAIL PROTECTED] + +* zend_execute.c: + This kind of error should be caught. (suggested by Andi, thanks) + +* zend_execute.c: + Fix bug #24773 (unset()ing string offsets crashes PHP) + +2003-12-03 Derick Rethans [EMAIL PROTECTED] + +* zend_execute.c: + - Remove newline from error message + 2003-12-02 Marcus Boerger [EMAIL PROTECTED] * zend_object_handlers.c: @@ -2264,7 +2282,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.348 2003/12/03 01:32:23 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.349 2003/12/04 01:31:59 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -3988,7 +4006,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.348 2003/12/03 01:32:23 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.349 2003/12/04 01:31:59 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src / CODING_STANDARDS
derick Wed Dec 3 04:12:39 2003 EDT Modified files: /php-srcCODING_STANDARDS Log: - I am sure I reverted this before Index: php-src/CODING_STANDARDS diff -u php-src/CODING_STANDARDS:1.26 php-src/CODING_STANDARDS:1.27 --- php-src/CODING_STANDARDS:1.26 Fri May 23 06:38:43 2003 +++ php-src/CODING_STANDARDSWed Dec 3 04:12:38 2003 @@ -133,22 +133,7 @@ [5] Variable names should be in lowercase. Use underscores to separate between words. -[6] Method names follow the 'studlyCaps' (also referred to as 'bumpy case' -or 'camel caps') naming convention, with care taken to minimize the -letter count. The initial letter of the name is lowercase, and each -letter that starts a new 'word' is capitalized. - -Good: -'connect()' -'getData()' -'buildSomeWidget()' - -Bad: -'get_Data()' -'buildsomewidget' -'getI()' - -[7] Classes should be given descriptive names. Avoid using abbreviations +[6] Classes should be given descriptive names. Avoid using abbreviations where possible. Each word in the class name should start with a capital letter, with words underscore delimited. The class name should be prefixed with the name of the 'parent set'. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c
rrichards Wed Dec 3 07:30:05 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/domxml php_domxml.c Log: require libxml 2.5.11 for threaded error handling certain cases crash unlocking libxml mutex with earlier versions Index: php-src/ext/domxml/php_domxml.c diff -u php-src/ext/domxml/php_domxml.c:1.218.2.41 php-src/ext/domxml/php_domxml.c:1.218.2.42 --- php-src/ext/domxml/php_domxml.c:1.218.2.41 Tue Dec 2 10:09:31 2003 +++ php-src/ext/domxml/php_domxml.c Wed Dec 3 07:30:02 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_domxml.c,v 1.218.2.41 2003/12/02 15:09:31 rrichards Exp $ */ +/* $Id: php_domxml.c,v 1.218.2.42 2003/12/03 12:30:02 rrichards Exp $ */ /* TODO * - Support Notation Nodes @@ -1670,7 +1670,7 @@ REGISTER_LONG_CONSTANT(DOMXML_LOAD_COMPLETE_ATTRS,DOMXML_LOAD_COMPLETE_ATTRS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(DOMXML_LOAD_DONT_KEEP_BLANKS,DOMXML_LOAD_DONT_KEEP_BLANKS, CONST_CS | CONST_PERSISTENT); xmlSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error); -#if (defined(LIBXML_THREAD_ENABLED) LIBXML_VERSION = 20510) +#if (defined(LIBXML_THREAD_ENABLED) LIBXML_VERSION = 20511) xmlThrDefSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error); #endif #if HAVE_DOMXSLT -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Wed Dec 3 07:37:48 2003 EDT Modified files: /CVSROOTavail Log: pearweb[] = jan Index: CVSROOT/avail diff -u CVSROOT/avail:1.775 CVSROOT/avail:1.776 --- CVSROOT/avail:1.775 Tue Dec 2 12:50:48 2003 +++ CVSROOT/avail Wed Dec 3 07:37:47 2003 @@ -51,7 +51,7 @@ avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz,cellog|php-src/pear # PEAR website and weekly news -avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz|pearweb +avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan|pearweb avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews # Some people get access to the peardoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml config.w32 /ext/mssql config.w32 /ext/sqlite config.w32 /sapi/apache config.w32 /win32/build config.w32 confutils.js
wez Wed Dec 3 09:29:46 2003 EDT
Modified files:
/php-src/ext/libxml config.w32
/php-src/ext/mssql config.w32
/php-src/ext/sqlite config.w32
/php-src/sapi/apacheconfig.w32
/php-src/win32/buildconfig.w32 confutils.js
Log:
Build adjustments.
Index: php-src/ext/libxml/config.w32
diff -u php-src/ext/libxml/config.w32:1.2 php-src/ext/libxml/config.w32:1.3
--- php-src/ext/libxml/config.w32:1.2 Tue Dec 2 21:47:43 2003
+++ php-src/ext/libxml/config.w32 Wed Dec 3 09:29:42 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/03 02:47:43 wez Exp $
+// $Id: config.w32,v 1.3 2003/12/03 14:29:42 wez Exp $
// vim:ft=javascript
ARG_WITH(libxml, LibXML support, yes);
@@ -7,9 +7,10 @@
EXTENSION(libxml, libxml.c, false /* never shared */);
AC_DEFINE(HAVE_LIBXML, 1, LibXML support);
- CHECK_LIB(iconv.lib, libxml, php_usual_lib_suspects);
- CHECK_LIB(libxml2.lib, libxml, php_usual_lib_suspects);
- CHECK_HEADER_ADD_INCLUDE(libxml/parser.h, CFLAGS,
php_usual_include_suspects);
+ CHECK_LIB(iconv.lib, libxml);
+ CHECK_LIB(libxml2.lib, libxml);
+ CHECK_HEADER_ADD_INCLUDE(libxml/parser.h, CFLAGS);
+ ADD_FLAG(CFLAGS, /D LIBXML_THREAD_ENABLED);
}
Index: php-src/ext/mssql/config.w32
diff -u php-src/ext/mssql/config.w32:1.3 php-src/ext/mssql/config.w32:1.4
--- php-src/ext/mssql/config.w32:1.3Wed Dec 3 01:50:19 2003
+++ php-src/ext/mssql/config.w32Wed Dec 3 09:29:43 2003
@@ -1,13 +1,15 @@
-// $Id: config.w32,v 1.3 2003/12/03 06:50:19 fmk Exp $
+// $Id: config.w32,v 1.4 2003/12/03 14:29:43 wez Exp $
// vim:ft=javascript
ARG_WITH(mssql, mssql support, no);
if (PHP_MSSQL == yes) {
- EXTENSION(mssql, php_mssql.c);
- CHECK_LIB(ntwdblib.lib, mssql, \\MSSQL7\\DevTools\\Lib);
- CHECK_HEADER_ADD_INCLUDE(sqlfront.h, CFLAGS);
- AC_DEFINE('DBNTWIN32', 1, '');
- AC_DEFINE('MSSQL70', 1, '');
- AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+ if (CHECK_LIB(ntwdblib.lib, mssql, \\MSSQL7\\DevTools\\Lib)
+ CHECK_HEADER_ADD_INCLUDE(sqlfront.h, CFLAGS_MSSQL)) {
+ EXTENSION(mssql, php_mssql.c);
+ ADD_FLAG(CFLAGS_MSSQL, /D DBNTWIN32=1 /D MSSQL70=1);
+ AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+ } else {
+ WARNING(mssql not enabled; libraries and headers not found);
+ }
}
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.1 php-src/ext/sqlite/config.w32:1.2
--- php-src/ext/sqlite/config.w32:1.1 Tue Dec 2 18:16:57 2003
+++ php-src/ext/sqlite/config.w32 Wed Dec 3 09:29:44 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/02 23:16:57 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/03 14:29:44 wez Exp $
// vim:ft=javascript
ARG_WITH(sqlite, SQLite support, yes);
@@ -20,7 +20,9 @@
copy.c where.c trigger.c, sqlite);
AC_DEFINE(HAVE_SQLITE, 1, SQLite support);
- ADD_DEF_FILE(ext\\sqlite\\php_sqlite.def);
+ if (!PHP_SQLITE_SHARED) {
+ ADD_DEF_FILE(ext\\sqlite\\php_sqlite.def);
+ }
}
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.3 php-src/sapi/apache/config.w32:1.4
--- php-src/sapi/apache/config.w32:1.3 Tue Dec 2 21:47:45 2003
+++ php-src/sapi/apache/config.w32 Wed Dec 3 09:29:44 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2003/12/03 02:47:45 wez Exp $
+// $Id: config.w32,v 1.4 2003/12/03 14:29:44 wez Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'yes');
@@ -9,18 +9,19 @@
if (PHP_APACHE == yes) {
if (!CHECK_HEADER_ADD_INCLUDE(httpd.h, CFLAGS_APACHE,
php_usual_include_suspects +
- ;C:\\Program Files\\Apache Group\\Apache\\include +
+ ; + 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 +
- ';C:\\Program Files\\Apache Group\\Apache\\libexec' +
+ ';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
';..\\php_build\\apache\\src\\corer')) {
ERROR(Could not find apache libraries);
}
-
+ // 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');
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
}
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.5 php-src/win32/build/config.w32:1.6
--- php-src/win32/build/config.w32:1.5 Tue Dec 2 21:47:45
[PHP-CVS] cvs: php-src /win32/build Makefile buildconf.js confutils.js
wez Wed Dec 3 09:55:03 2003 EDT
Modified files:
/php-src/win32/buildMakefile buildconf.js confutils.js
Log:
Propogate LDFLAGS from extensions to PHPDLL when building them statically.
Move ZendEngine2 to Zend while running buildconf
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.1 php-src/win32/build/Makefile:1.2
--- php-src/win32/build/Makefile:1.1Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/MakefileWed Dec 3 09:55:03 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.1 2003/12/02 23:17:04 wez Exp $
+# $Id: Makefile,v 1.2 2003/12/03 14:55:03 wez Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -43,7 +43,7 @@
flex -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
$(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS)
- $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
+ $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.1 php-src/win32/build/buildconf.js:1.2
--- php-src/win32/build/buildconf.js:1.1Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/buildconf.jsWed Dec 3 09:55:03 2003
@@ -1,4 +1,4 @@
-// $Id: buildconf.js,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $
/*
+--+
| PHP Version 5|
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.1 2003/12/02 23:17:04 wez Exp $ */
+/* $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -49,6 +49,13 @@
}
}
+if (FSO.FileExists(ZendEngine2\\OBJECTS2_HOWTO)) {
+ if (FSO.FolderExists(Zend)) {
+ FSO.MoveFolder(Zend, ZendEngine1);
+ }
+ FSO.MoveFolder(ZendEngine2, Zend);
+}
+
// Write the head of the configure script
C.WriteLine(/* This file automatically generated from win32/build/confutils.js */);
C.Write(file_get_contents(win32/build/confutils.js));
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.5 php-src/win32/build/confutils.js:1.6
--- php-src/win32/build/confutils.js:1.5Wed Dec 3 09:29:45 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 09:55:03 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.5 2003/12/03 14:29:45 wez Exp $
+// $Id: confutils.js,v 1.6 2003/12/03 14:55:03 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -473,7 +473,7 @@
if (shared) {
dllname = php_ + extname + .dll;
MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $( + EXT +
_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB));
- MFO.WriteLine(\t$(LD) /out:$(BUILD_DIR)\\ + dllname +
$(DLL_LDFLAGS) $(LDFLAGS) $( + EXT + _LDFLAGS) $( + EXT + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS));
+ MFO.WriteLine(\t$(LD) /out:$(BUILD_DIR)\\ + dllname +
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_ + EXT + ) $( + EXT + _GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_ + EXT + ) $(LIBS));
MFO.WriteBlankLines(1);
ADD_FLAG(EXT_TARGETS, dllname);
@@ -483,6 +483,7 @@
} else {
ADD_FLAG(STATIC_EXT_OBJS, $( + EXT + _GLOBAL_OBJS));
ADD_FLAG(STATIC_EXT_LIBS, $(LIBS_ + EXT + ));
+ ADD_FLAG(STATIC_EXT_LDFLAGS, $(LDFLAGS_ + EXT + ));
ADD_FLAG(CFLAGS_ + EXT, $(CFLAGS_PHP));
/* find the header that declars the module pointer,
--
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 Wed Dec 3 09:58:05 2003 EDT Modified files: /php-src/win32/buildMakefile Log: fix typo Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.2 php-src/win32/build/Makefile:1.3 --- php-src/win32/build/Makefile:1.2Wed Dec 3 09:55:03 2003 +++ php-src/win32/build/MakefileWed Dec 3 09:58:05 2003 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.2 2003/12/03 14:55:03 wez Exp $ +# $Id: Makefile,v 1.3 2003/12/03 14:58:05 wez Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -31,7 +31,7 @@ type $(PHP_DLL_DEF_SOURCES) win32\phpts.def Zend\zend_ini_parser.c Zend\zend_ini_parser.h: Zend\zend_ini_parser.y - bison --output=Zend/zend_ini_parser.\ -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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl xp_ssl.c
iliaa Wed Dec 3 10:50:28 2003 EDT
Modified files:
/php-src/ext/opensslxp_ssl.c
Log:
Fixed compiler warning due to unused variables.
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.12 php-src/ext/openssl/xp_ssl.c:1.13
--- php-src/ext/openssl/xp_ssl.c:1.12 Fri Nov 28 18:20:22 2003
+++ php-src/ext/openssl/xp_ssl.cWed Dec 3 10:50:26 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.12 2003/11/28 23:20:22 wez Exp $ */
+/* $Id: xp_ssl.c,v 1.13 2003/12/03 15:50:26 iliaa Exp $ */
#include php.h
#include ext/standard/file.h
@@ -196,10 +196,11 @@
static int php_openssl_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
{
php_openssl_netstream_data_t *sslsock =
(php_openssl_netstream_data_t*)stream-abstract;
+#ifdef PHP_WIN32
fd_set wrfds, efds;
int n;
struct timeval timeout;
-
+#endif
if (close_handle) {
if (sslsock-ssl_active) {
SSL_shutdown(sslsock-ssl_handle);
--
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 Wed Dec 3 11:51:23 2003 EDT Modified files: /php-src/win32/buildMakefile Log: add rule for parsedate Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.3 php-src/win32/build/Makefile:1.4 --- php-src/win32/build/Makefile:1.3Wed Dec 3 09:58:05 2003 +++ php-src/win32/build/MakefileWed Dec 3 11:51:23 2003 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.3 2003/12/03 14:58:05 wez Exp $ +# $Id: Makefile,v 1.4 2003/12/03 16:51:23 wez Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -42,6 +42,10 @@ 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 +ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y + bison --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y + + $(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) -- 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 Dec 3 12:04:31 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
avoid breaking paths with spaces when we generate the makefile, and ensure that libs
found in the default path are added to the link line
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.6 php-src/win32/build/confutils.js:1.7
--- php-src/win32/build/confutils.js:1.6Wed Dec 3 09:55:03 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 12:04:30 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.6 2003/12/03 14:55:03 wez Exp $
+// $Id: confutils.js,v 1.7 2003/12/03 17:04:30 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -359,6 +359,9 @@
ADD_FLAG(LDFLAGS_ + target.toUpperCase(), '/libpath:' + p + ' ');
ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
have = 1;
+ } else if (p == true) {
+ ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
+ have = 1;
}
// AC_DEFINE(HAVE_ + header_name.toUpperCase().replace(new RegExp(/-\.,
g), _), have);
@@ -676,8 +679,10 @@
// The trailing space is needed to prevent the trailing backslash
// that is part of the build dir flags (CFLAGS_BD_XXX) from being
// seen as a line continuation character
- MF.WriteLine(keys[i] + = + word_wrap_and_indent(1,
- configure_subst.Item(keys[i]), ' \\', '\t') + );
+ MF.WriteLine(keys[i] + = +
+ //word_wrap_and_indent(1, configure_subst.Item(keys[i]), '
\\', '\t') +
+ configure_subst.Item(keys[i]) +
+ );
MF.WriteBlankLines(1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Wed Dec 3 12:31:55 2003 EDT Modified files: /CVSROOTavail Log: pecl,peclweb[] = jan Index: CVSROOT/avail diff -u CVSROOT/avail:1.776 CVSROOT/avail:1.777 --- CVSROOT/avail:1.776 Wed Dec 3 07:37:47 2003 +++ CVSROOT/avail Wed Dec 3 12:31:51 2003 @@ -60,7 +60,7 @@ avail|elf|phpdoc/ja # access to the newly cut pecl website etc -avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink|peclweb,pecl +avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan|peclweb,pecl # General pecl avail|csilles,t2k269|pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile config.w32 confutils.js
wez Wed Dec 3 13:31:05 2003 EDT
Modified files:
/php-src/win32/buildMakefile config.w32 confutils.js
Log:
VC stores lib path in LIB not LIBS.
Add --with-extra-includes and --with-extra-libs to be able to specify
general additions to those paths from the environment.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.4 php-src/win32/build/Makefile:1.5
--- php-src/win32/build/Makefile:1.4Wed Dec 3 11:51:23 2003
+++ php-src/win32/build/MakefileWed Dec 3 13:31:04 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.4 2003/12/03 16:51:23 wez Exp $
+# $Id: Makefile,v 1.5 2003/12/03 18:31:04 wez Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -60,7 +60,7 @@
del /F /Q $(BUILD_DIR)\*.*
test:
- %COMSPEC% /c test_suite_uses_lame_env_vars.bat
+ test_suite_uses_lame_env_vars.bat
set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\\php.exe
$(BUILD_DIR)\\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0
run-tests.php $(TESTS)
NOKEEP
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.6 php-src/win32/build/config.w32:1.7
--- php-src/win32/build/config.w32:1.6 Wed Dec 3 09:29:45 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 13:31:04 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.6 2003/12/03 14:29:45 wez Exp $
+// $Id: config.w32,v 1.7 2003/12/03 18:31:04 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -88,6 +88,9 @@
// that we need
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source
dir (..\\php_build) if not specified', 'no');
+ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');
+ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');
+
var php_usual_include_suspects =
..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32;
var php_usual_lib_suspects = ..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32;
@@ -111,7 +114,29 @@
}
}
+function add_extra_dirs()
+{
+ var path, i, f;
+
+ path = PHP_EXTRA_INCLUDES.split(';');
+ for (i = 0; i path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ ADD_FLAG(CFLAGS, '/I ' + f + ' ');
+ }
+ }
+ path = PHP_EXTRA_LIBS.split(';');
+ for (i = 0; i path.length; i++) {
+ f = FSO.GetAbsolutePathName(path[i]);
+ if (FSO.FolderExists(f)) {
+ ADD_FLAG(LDFLAGS, '/libpath:' + f + ' ');
+ }
+ }
+
+}
+
probe_basic_headers();
+add_extra_dirs();
//DEFINE(PHP_BUILD, PHP_PHP_BUILD);
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.7 php-src/win32/build/confutils.js:1.8
--- php-src/win32/build/confutils.js:1.7Wed Dec 3 12:04:30 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 13:31:04 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.7 2003/12/03 17:04:30 wez Exp $
+// $Id: confutils.js,v 1.8 2003/12/03 18:31:04 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -352,7 +352,7 @@
path_to_check += ; + php_usual_lib_suspects;
}
- var p = search_paths(libname, path_to_check, LIBS);
+ var p = search_paths(libname, path_to_check, LIB);
var have = 0;
if (typeof(p) == string) {
@@ -605,6 +605,11 @@
dir = get_define(BUILD_DIR);
build_dirs.sort();
last = null;
+
+ if (!FSO.FolderExists(dir)) {
+ FSO.CreateFolder(dir);
+ }
+
for (i = 0; i build_dirs.length; i++) {
bd = FSO.BuildPath(dir, build_dirs[i]);
if (bd == last) {
--
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
moriyoshi Wed Dec 3 14:33:26 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.489 php-src/NEWS:1.1247.2.490 --- php-src/NEWS:1.1247.2.489 Mon Dec 1 11:38:20 2003 +++ php-src/NEWSWed Dec 3 14:33:25 2003 @@ -59,6 +59,7 @@ - Fixed bug #25664 (calling ITypeInfo::Invoke with bogus params). (Wez) - Fixed bug #25581 (getimagesize () return incorrect values on bitmap (os2) files). (Marcus) +- Fixed bug #24773 (Unsetting string offsets crashes PHP). (Moriyoshi, Sara) 3 Nov 2003, Version 4.3.4 - Made MCVE extension available on win32. (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.w32
moriyoshi Wed Dec 3 14:46:27 2003 EDT
Added files:
/php-src/ext/iconv config.w32
Log:
Add a win32 build script. Not tested, but should work :)
Index: php-src/ext/iconv/config.w32
+++ php-src/ext/iconv/config.w32
// $Id: config.w32,v 1.1 2003/12/03 19:46:27 moriyoshi Exp $
// vim: ft=javascript
ARG_WITH(iconv, iconv support, no);
if (PHP_ICONV == yes) {
EXTENSION(iconv, iconv.c);
AC_DEFINE(HAVE_ICONV, 1, Define if iconv extension is enabled);
AC_DEFINE(HAVE_LIBICONV, 1, Define if libiconv is available);
AC_DEFINE(PHP_ICONV_IMPL, \libiconv\, Which iconv implementation to
use);
AC_DEFINE(ICONV_SUPPORTS_ERRNO, 1, Whether iconv supports errno or not);
AC_DEFINE(PHP_ICONV_H_PATH, iconv.h, Path to iconv.h);
CHECK_LIB(iconv.lib, iconv);
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url.c
moriyoshi Wed Dec 3 15:58:13 2003 EDT
Modified files:
/php-src/ext/standard url.c
Log:
Possible fix for bug #26391 (parse_url() destroys strings that contain
a character in range of \x80-\xff))
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.70 php-src/ext/standard/url.c:1.71
--- php-src/ext/standard/url.c:1.70 Sun Oct 19 16:00:51 2003
+++ php-src/ext/standard/url.c Wed Dec 3 15:58:12 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.70 2003/10/19 20:00:51 shane Exp $ */
+/* $Id: url.c,v 1.71 2003/12/03 20:58:12 moriyoshi Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit(*p)) {
+ while (isdigit((int)*(unsigned char *)p)) {
p++;
}
@@ -151,7 +151,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit(*pp)) {
+ while (pp-p 6 isdigit((int)*(unsigned char *)pp)) {
pp++;
}
@@ -336,12 +336,12 @@
int value;
int c;
- c = s[0];
+ c = ((unsigned char *)s)[0];
if (isupper(c))
c = tolower(c);
value = (c = '0' c = '9' ? c - '0' : c - 'a' + 10) * 16;
- c = s[1];
+ c = ((unsigned char *)s)[1];
if (isupper(c))
c = tolower(c);
value += c = '0' c = '9' ? c - '0' : c - 'a' + 10;
@@ -457,7 +457,7 @@
while (len--) {
if (*data == '+')
*dest = ' ';
- else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2))) {
+ else if (*data == '%' len = 2 isxdigit((int) *(unsigned char
*)(data + 1)) isxdigit((int) *(unsigned char *)(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
@@ -605,7 +605,7 @@
c = *p;
*p = '\0';
s = p + 1;
- while (isspace(*s)) {
+ while (isspace((int)*(unsigned char *)s)) {
s++;
}
--
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 url.c
moriyoshi Wed Dec 3 15:59:12 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard url.c
Log:
MFH(r-1.71): Possible fix for bug #26391 (parse_url() destroys strings
that contain a character in range of 0x80-0xff)
# I couldn't reproduce it with Panther though.
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.9 php-src/ext/standard/url.c:1.58.2.10
--- php-src/ext/standard/url.c:1.58.2.9 Mon Oct 13 00:28:33 2003
+++ php-src/ext/standard/url.c Wed Dec 3 15:59:12 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.58.2.9 2003/10/13 04:28:33 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.10 2003/12/03 20:59:12 moriyoshi Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit(*p)) {
+ while (isdigit((int)*(unsigned char *)p)) {
p++;
}
@@ -145,7 +145,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit(*pp)) {
+ while (pp-p 6 isdigit((int)*(unsigned char *)pp)) {
pp++;
}
@@ -330,12 +330,12 @@
int value;
int c;
- c = s[0];
+ c = ((unsigned char *)s)[0];
if (isupper(c))
c = tolower(c);
value = (c = '0' c = '9' ? c - '0' : c - 'a' + 10) * 16;
- c = s[1];
+ c = ((unsigned char *)s)[1];
if (isupper(c))
c = tolower(c);
value += c = '0' c = '9' ? c - '0' : c - 'a' + 10;
@@ -443,7 +443,7 @@
while (len--) {
if (*data == '+')
*dest = ' ';
- else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2))) {
+ else if (*data == '%' len = 2 isxdigit((int) *(unsigned char
*)(data + 1)) isxdigit((int) *(unsigned char *)(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
--
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 url.c
Given that digits can only be in the \x48-\x57 range is (int)*(unsigned char *) cast really necessary? Ilia -- 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 url.c
On 2003/12/04, at 6:12, Ilia Alshanetsky wrote: Given that digits can only be in the \x48-\x57 range is (int)*(unsigned char *) cast really necessary? Nope, it's just for the sake of safety :-) Actually I didn't realize it. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom documenttype.c
rrichards Wed Dec 3 16:27:02 2003 EDT Modified files: /php-src/ext/domdocumenttype.c Log: fix notations - forgot to create iterator Index: php-src/ext/dom/documenttype.c diff -u php-src/ext/dom/documenttype.c:1.7 php-src/ext/dom/documenttype.c:1.8 --- php-src/ext/dom/documenttype.c:1.7 Sat Nov 29 15:40:17 2003 +++ php-src/ext/dom/documenttype.c Wed Dec 3 16:27:01 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: documenttype.c,v 1.7 2003/11/29 20:40:17 rrichards Exp $ */ +/* $Id: documenttype.c,v 1.8 2003/12/03 21:27:01 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -100,6 +100,10 @@ dom_object *intern; doctypep = (xmlDtdPtr) dom_object_get_node(obj); + + MAKE_STD_ZVAL(*retval); + php_dom_create_interator(*retval, DOM_NAMEDNODEMAP TSRMLS_CC); + notationht = (xmlHashTable *) doctypep-notations; intern = (dom_object *)zend_objects_get_address(*retval TSRMLS_CC); -- 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 url.c
Shouldn't we nuke it then? It's ugly enough with the unsigned char cast :) Andi At 04:12 PM 12/3/2003 -0500, Ilia Alshanetsky wrote: Given that digits can only be in the \x48-\x57 range is (int)*(unsigned char *) cast really necessary? Ilia -- 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 / NEWS
andiWed Dec 3 17:13:12 2003 EDT Modified files: /php-srcNEWS Log: - Add news about include_once fix for Windows Index: php-src/NEWS diff -u php-src/NEWS:1.1517 php-src/NEWS:1.1518 --- php-src/NEWS:1.1517 Wed Dec 3 00:30:16 2003 +++ php-src/NEWSWed Dec 3 17:13:11 2003 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? Oct 2003, PHP 5 Beta 3 +- Stopped supporting Windows 95! +- Fixed include_once()/require_once() on Windows to honor case-insensitivity of + files (Andi) - Moved extensions to PECL: . ext/db (Jani, Derick) . ext/qtdom (Jani, Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests xslt011.phpt
chregu Wed Dec 3 17:18:49 2003 EDT
Modified files:
/php-src/ext/xsl/tests xslt011.phpt
Log:
fix test to the changes made regarding __toString()
Index: php-src/ext/xsl/tests/xslt011.phpt
diff -u php-src/ext/xsl/tests/xslt011.phpt:1.2 php-src/ext/xsl/tests/xslt011.phpt:1.3
--- php-src/ext/xsl/tests/xslt011.phpt:1.2 Sat Nov 29 08:01:19 2003
+++ php-src/ext/xsl/tests/xslt011.phpt Wed Dec 3 17:18:49 2003
@@ -31,17 +31,19 @@
} else {
$dom = new domdocument;
$dom-loadXML(rootthis is from an external DomDocument/root);
- return $dom-documentElement ;
+ return $dom-documentElement;
}
}
function nonDomNode() {
return new foo();
}
---EXPECT--
+--EXPECTF--
Test 11: php:function Support
+
+Notice: Object of class foo could not be converted to string in %s on line 15
?xml version=1.0?
foobar
foobar
this is from an external DomDocument
from the Input Document
-not a DomNode object
+Object
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url.c
iliaa Wed Dec 3 17:51:52 2003 EDT
Modified files:
/php-src/ext/standard url.c
Log:
Remove unnecessary casts.
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.71 php-src/ext/standard/url.c:1.72
--- php-src/ext/standard/url.c:1.71 Wed Dec 3 15:58:12 2003
+++ php-src/ext/standard/url.c Wed Dec 3 17:51:51 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.71 2003/12/03 20:58:12 moriyoshi Exp $ */
+/* $Id: url.c,v 1.72 2003/12/03 22:51:51 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit((int)*(unsigned char *)p)) {
+ while (isdigit(p)) {
p++;
}
@@ -151,7 +151,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit((int)*(unsigned char *)pp)) {
+ while (pp-p 6 isdigit(pp)) {
pp++;
}
@@ -457,7 +457,7 @@
while (len--) {
if (*data == '+')
*dest = ' ';
- else if (*data == '%' len = 2 isxdigit((int) *(unsigned char
*)(data + 1)) isxdigit((int) *(unsigned char *)(data + 2))) {
+ else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/iconv config.w32 /win32/build config.w32 confutils.js
wez Wed Dec 3 17:59:48 2003 EDT
Modified files:
/php-src/ext/iconv config.w32
/php-src/win32/buildconfig.w32 confutils.js
Log:
This should solve a few problems with static vs. shared builds for extensions (such
as mssql) that require certain CFLAGS to be defined, but not pull in other flags that
would affect DLL linkage.
Also fix the iconv file; MSVC doesn't seem to like the #include SYMBOL syntax.
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.1 php-src/ext/iconv/config.w32:1.2
--- php-src/ext/iconv/config.w32:1.1Wed Dec 3 14:46:27 2003
+++ php-src/ext/iconv/config.w32Wed Dec 3 17:59:47 2003
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/03 19:46:27 moriyoshi Exp $
+// $Id: config.w32,v 1.2 2003/12/03 22:59:47 wez Exp $
// vim: ft=javascript
ARG_WITH(iconv, iconv support, no);
@@ -9,7 +9,6 @@
AC_DEFINE(HAVE_LIBICONV, 1, Define if libiconv is available);
AC_DEFINE(PHP_ICONV_IMPL, \libiconv\, Which iconv implementation to
use);
AC_DEFINE(ICONV_SUPPORTS_ERRNO, 1, Whether iconv supports errno or not);
- AC_DEFINE(PHP_ICONV_H_PATH, iconv.h, Path to iconv.h);
CHECK_LIB(iconv.lib, iconv);
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS);
}
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.7 php-src/win32/build/config.w32:1.8
--- php-src/win32/build/config.w32:1.7 Wed Dec 3 13:31:04 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 17:59:48 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.7 2003/12/03 18:31:04 wez Exp $
+// $Id: config.w32,v 1.8 2003/12/03 22:59:48 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -25,6 +25,8 @@
DEFINE(CFLAGS_PHP, /D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS \
/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400);
+DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
+
// General CFLAGS for building objects
DEFINE(CFLAGS, /nologo /YX /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.8 php-src/win32/build/confutils.js:1.9
--- php-src/win32/build/confutils.js:1.8Wed Dec 3 13:31:04 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 17:59:48 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.8 2003/12/03 18:31:04 wez Exp $
+// $Id: confutils.js,v 1.9 2003/12/03 22:59:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -362,6 +362,16 @@
} else if (p == true) {
ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
have = 1;
+ } else {
+ /* not found in the defaults or the explicit paths,
+* so check the general extra libs; if we find
+* it here, no need to add another /libpath: for it as we
+* already have it covered, but we need to add the lib
+* to LIBS_XXX */
+ if (false != search_paths(header_name, PHP_EXTRA_LIBS, null)) {
+ ADD_FLAG(LIBS_ + target.toUpperCase(), libname);
+ have = 1;
+ }
}
// AC_DEFINE(HAVE_ + header_name.toUpperCase().replace(new RegExp(/-\.,
g), _), have);
@@ -389,6 +399,12 @@
if (typeof(p) == string) {
ADD_FLAG(flag_name, '/I ' + p + ' ');
have = 1;
+ } else if (p == false) {
+ /* not found in the defaults or the explicit paths,
+* so check the general extra includes; if we find
+* it here, no need to add another /I for it as we
+* already have it covered */
+ p = search_paths(header_name, PHP_EXTRA_INCLUDES, null);
}
sym = header_name.toUpperCase();
@@ -430,6 +446,7 @@
MFO.WriteLine(\t$(LD) /nologo /out:$(BUILD_DIR)\\ + makefiletarget + +
ldflags + $( + SAPI + _GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LDFLAGS_ + SAPI +
) $(LIBS_ + SAPI + ));
+ DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI + ')');
ADD_FLAG(SAPI_TARGETS, makefiletarget);
MFO.WriteBlankLines(1);
}
@@ -483,11 +500,13 @@
MFO.WriteLine(dllname + : $(BUILD_DIR)\\ + dllname);
MFO.WriteLine([EMAIL PROTECTED] EXT + extname + build complete);
MFO.WriteBlankLines(1);
+
+ DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_' + EXT + ')');
} else {
ADD_FLAG(STATIC_EXT_OBJS, $( + EXT + _GLOBAL_OBJS));
ADD_FLAG(STATIC_EXT_LIBS, $(LIBS_ + EXT + ));
ADD_FLAG(STATIC_EXT_LDFLAGS, $(LDFLAGS_ + EXT + ));
- ADD_FLAG(CFLAGS_ + EXT, $(CFLAGS_PHP));
+
[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug24773.phpt
iliaa Wed Dec 3 18:00:37 2003 EDT Added files: (Branch: PHP_4_3) /php-src/tests/lang bug24773.phpt Log: MFH: Test case for bug #24773. Index: php-src/tests/lang/bug24773.phpt +++ php-src/tests/lang/bug24773.phpt -- 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 url.c
Any reason to remove them? Passing a char-typed value to is*() or to*()
is basically wrong.
Moriyoshi
On 2003/12/04, at 7:51, Ilia Alshanetsky wrote:
iliaa Wed Dec 3 17:51:52 2003 EDT
Modified files:
/php-src/ext/standard url.c
Log:
Remove unnecessary casts.
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.71 php-src/ext/standard/url.c:1.72
--- php-src/ext/standard/url.c:1.71 Wed Dec 3 15:58:12 2003
+++ php-src/ext/standard/url.c Wed Dec 3 17:51:51 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]
|
+--
+
*/
-/* $Id: url.c,v 1.71 2003/12/03 20:58:12 moriyoshi Exp $ */
+/* $Id: url.c,v 1.72 2003/12/03 22:51:51 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit((int)*(unsigned char *)p)) {
+ while (isdigit(p)) {
p++;
}
@@ -151,7 +151,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit((int)*(unsigned char *)pp)) {
+ while (pp-p 6 isdigit(pp)) {
pp++;
}
@@ -457,7 +457,7 @@
while (len--) {
if (*data == '+')
*dest = ' ';
- else if (*data == '%' len = 2 isxdigit((int) *(unsigned char
*)(data + 1)) isxdigit((int) *(unsigned char *)(data + 2))) {
+ else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard url.c
On December 3, 2003 06:21 pm, Moriyoshi Koizumi wrote: Any reason to remove them? Passing a char-typed value to is*() or to*() is basically wrong. Compiler does not have a problem with that and we've already established it won't change anything since 'digits' are always lower then then 128-255 range the cast protects. Ilia -- 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 url.c
On 2003/12/04, at 8:35, Ilia Alshanetsky wrote: On December 3, 2003 06:21 pm, Moriyoshi Koizumi wrote: Any reason to remove them? Passing a char-typed value to is*() or to*() is basically wrong. Compiler does not have a problem with that and we've already established it won't change anything since 'digits' are always lower then then 128-255 range the cast protects. Although it's not a compiler issue and the casts look ugly, I want to ask those who'll use functions like them to use unsigned char variables in the first place. I've ever spotted numerous mistakes all over the code. That's why I hope they will leave there as my warnings. Moriyoshi p.s. (int)((char)-1) yields -1, rather than 255 of cource. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url.c
iliaa Wed Dec 3 19:14:40 2003 EDT
Modified files:
/php-src/ext/standard url.c
Log:
Fixed typo (thanks Frank)
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.72 php-src/ext/standard/url.c:1.73
--- php-src/ext/standard/url.c:1.72 Wed Dec 3 17:51:51 2003
+++ php-src/ext/standard/url.c Wed Dec 3 19:14:39 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.72 2003/12/03 22:51:51 iliaa Exp $ */
+/* $Id: url.c,v 1.73 2003/12/04 00:14:39 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit(p)) {
+ while (isdigit(*p)) {
p++;
}
@@ -151,7 +151,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit(pp)) {
+ while (pp-p 6 isdigit(*pp)) {
pp++;
}
--
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 url.c
iliaa Wed Dec 3 19:14:51 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard url.c
Log:
MFH: Typo fix.
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.11 php-src/ext/standard/url.c:1.58.2.12
--- php-src/ext/standard/url.c:1.58.2.11Wed Dec 3 17:51:54 2003
+++ php-src/ext/standard/url.c Wed Dec 3 19:14:50 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.58.2.11 2003/12/03 22:51:54 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.12 2003/12/04 00:14:50 iliaa Exp $ */
#include stdlib.h
#include string.h
@@ -104,7 +104,7 @@
* correctly parse things like a.com:80
*/
p = e + 1;
- while (isdigit(p)) {
+ while (isdigit(*p)) {
p++;
}
@@ -145,7 +145,7 @@
p = e + 1;
pp = p;
- while (pp-p 6 isdigit(pp)) {
+ while (pp-p 6 isdigit(*pp)) {
pp++;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fbsql config.w32
fmk Wed Dec 3 20:04:36 2003 EDT
Modified files:
/php-src/ext/fbsql config.w32
Log:
add error message when libs and headers are missing
Index: php-src/ext/fbsql/config.w32
diff -u php-src/ext/fbsql/config.w32:1.2 php-src/ext/fbsql/config.w32:1.3
--- php-src/ext/fbsql/config.w32:1.2Wed Dec 3 01:42:16 2003
+++ php-src/ext/fbsql/config.w32Wed Dec 3 20:04:36 2003
@@ -1,12 +1,15 @@
-// $Id: config.w32,v 1.2 2003/12/03 06:42:16 fmk Exp $
+// $Id: config.w32,v 1.3 2003/12/04 01:04:36 fmk Exp $
// vim:ft=javascript
ARG_WITH(fbsql, FrontBase support, no);
if (PHP_FBSQL == yes) {
- EXTENSION(fbsql, php_fbsql.c);
- CHECK_LIB(FBCAccess.lib, fbsql, \\usr\\FrontBase\\lib);
- CHECK_HEADER_ADD_INCLUDE(FBCAccess\\FBCAccess.h, CFLAGS,
\\usr\\FrontBase\\include);
- AC_DEFINE('WinNT', 1, '');
- AC_DEFINE('HAVE_FBSQL', 1, 'Have FrontBase support');
+ if (CHECK_LIB(FBCAccess.lib, fbsql, \\usr\\FrontBase\\lib)
+ CHECK_HEADER_ADD_INCLUDE(FBCAccess\\FBCAccess.h, CFLAGS,
\\usr\\FrontBase\\include)) {
+ EXTENSION(fbsql, php_fbsql.c);
+ AC_DEFINE('WinNT', 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 /win32/build Makefile buildconf.js confutils.js php.ico template.rc
wez Wed Dec 3 20:37:52 2003 EDT
Added files:
/php-src/win32/buildphp.ico template.rc
Modified files:
/php-src/win32/buildMakefile buildconf.js confutils.js
Log:
Search for pecl extensions under php-src/pecl as a convenience for
pecl developers.
Add automatic version info resource generation for SAPI and extension
modules, based on PHP version numbers and info found in the CREDITS file.
As a nice side effect, this lets us add a logo icon to .exe files.
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.5 php-src/win32/build/Makefile:1.6
--- php-src/win32/build/Makefile:1.5Wed Dec 3 13:31:04 2003
+++ php-src/win32/build/MakefileWed Dec 3 20:37:52 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong [EMAIL PROTECTED] |
# +--+
#
-# $Id: Makefile,v 1.5 2003/12/03 18:31:04 wez Exp $
+# $Id: Makefile,v 1.6 2003/12/04 01:37:52 wez Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -45,9 +45,15 @@
ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y
bison --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y
+PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
-$(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS)
- $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
+$(PHPDLL_RES): win32\build\template.rc
+ $(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION=\PHP Script Interpreter\ \
+ /d FILE_NAME=\$(PHPDLL)\ /d PRODUCT_NAME=\PHP Script
Interpreter\ \
+ win32\build\template.rc
+
+$(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES)
+ $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(PHPDLL_RES)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.2 php-src/win32/build/buildconf.js:1.3
--- php-src/win32/build/buildconf.js:1.2Wed Dec 3 09:55:03 2003
+++ php-src/win32/build/buildconf.jsWed Dec 3 20:37:52 2003
@@ -1,4 +1,4 @@
-// $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $
+// $Id: buildconf.js,v 1.3 2003/12/04 01:37:52 wez Exp $
/*
+--+
| PHP Version 5|
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $ */
+/* $Id: buildconf.js,v 1.3 2003/12/04 01:37:52 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -64,6 +64,7 @@
modules = file_get_contents(win32/build/config.w32);
find_config_w32(sapi);
find_config_w32(ext);
+find_config_w32(pecl);
// Look for ARG_ENABLE or ARG_WITH calls
re = new RegExp((ARG_(ENABLE|WITH)\([^;]+\);), gm);
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.10 php-src/win32/build/confutils.js:1.11
--- php-src/win32/build/confutils.js:1.10 Wed Dec 3 18:48:02 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 20:37:52 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.10 2003/12/03 23:48:02 fmk Exp $
+// $Id: confutils.js,v 1.11 2003/12/04 01:37:52 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -415,10 +415,44 @@
return p;
}
+/* emits rule to generate version info for a SAPI
+ * or extension. Returns the name of the .res file
+ * that will be generated */
+function generate_version_info_resource(makefiletarget, creditspath)
+{
+ var resname = makefiletarget + .res;
+ var res_desc = PHP + makefiletarget;
+ var res_prod_name = res_desc;
+ var credits;
+ var thanks = ;
+
+ if (FSO.FileExists(creditspath + '/CREDITS')) {
+ credits = FSO.OpenTextFile(creditspath + '/CREDITS', 1);
+ res_desc = credits.ReadLine();
+ thanks = credits.ReadLine();
+ if (thanks == null) {
+ thanks = ;
+ } else {
+ thanks = Thanks to + thanks;
+ }
+ credits.Close();
+ }
+
+ MFO.WriteLine($(BUILD_DIR)\\ + resname + : win32\\build\\template.rc);
+ MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname +
+ ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d FILE_NAME=\\' +
makefiletarget +
+ '\\ /d PRODUCT_NAME=\\' + res_prod_name + '\\ /d
THANKS_GUYS=\\' +
[PHP-CVS] cvs: php-src /win32/build buildconf.js
wez Wed Dec 3 20:59:46 2003 EDT
Modified files:
/php-src/win32/buildbuildconf.js
Log:
be safe...
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.3 php-src/win32/build/buildconf.js:1.4
--- php-src/win32/build/buildconf.js:1.3Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/buildconf.jsWed Dec 3 20:59:46 2003
@@ -1,4 +1,4 @@
-// $Id: buildconf.js,v 1.3 2003/12/04 01:37:52 wez Exp $
+// $Id: buildconf.js,v 1.4 2003/12/04 01:59:46 wez Exp $
/*
+--+
| PHP Version 5|
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.3 2003/12/04 01:37:52 wez Exp $ */
+/* $Id: buildconf.js,v 1.4 2003/12/04 01:59:46 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -36,6 +36,10 @@
function find_config_w32(dirname)
{
+ if (!FSO.FolderExists(dirname)) {
+ return;
+ }
+
var f = FSO.GetFolder(dirname);
var fc = new Enumerator(f.SubFolders);
var c;
--
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 template.rc
wez Wed Dec 3 21:12:36 2003 EDT
Modified files:
/php-src/win32/buildconfig.w32 confutils.js template.rc
Log:
fix a couple of buglets and set version number on DLLs to whatever the PHP major
version is.
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.8 php-src/win32/build/config.w32:1.9
--- php-src/win32/build/config.w32:1.8 Wed Dec 3 17:59:48 2003
+++ php-src/win32/build/config.w32 Wed Dec 3 21:12:36 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.8 2003/12/03 22:59:48 wez Exp $
+// $Id: config.w32,v 1.9 2003/12/04 02:12:36 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -35,7 +35,7 @@
DEFINE(LDFLAGS, /nologo /libpath:$(PHP_BUILD)\\lib);
// General DLL link flags
-DEFINE(DLL_LDFLAGS, /dll);
+DEFINE(DLL_LDFLAGS, /dll /version: + PHP_VERSION);
// PHP DLL link flags
DEFINE(PHP_LDFLAGS, $(DLL_LDFLAGS));
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.11 php-src/win32/build/confutils.js:1.12
--- php-src/win32/build/confutils.js:1.11 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 21:12:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.11 2003/12/04 01:37:52 wez Exp $
+// $Id: confutils.js,v 1.12 2003/12/04 02:12:36 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -530,7 +530,7 @@
if (shared) {
dllname = php_ + extname + .dll;
- var resname = generate_version_info_resource(makefiletarget, ext/ +
extname);
+ var resname = generate_version_info_resource(dllname, ext/ +
extname);
MFO.WriteLine($(BUILD_DIR)\\ + dllname + : $( + 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);
Index: php-src/win32/build/template.rc
diff -u php-src/win32/build/template.rc:1.1 php-src/win32/build/template.rc:1.2
--- php-src/win32/build/template.rc:1.1 Wed Dec 3 20:37:52 2003
+++ php-src/win32/build/template.rc Wed Dec 3 21:12:36 2003
@@ -1,11 +1,10 @@
/* This is a template RC file.
- * $Id: template.rc,v 1.1 2003/12/04 01:37:52 wez Exp $
+ * $Id: template.rc,v 1.2 2003/12/04 02:12:36 wez Exp $
* Do not edit with MSVC */
#ifdef APSTUDIO_INVOKED
# error dont edit with MSVC
#endif
-#include resource.h
#include winres.h
#include main/php_version.h
--
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 Dec 3 21:24:24 2003 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
put PHPDLL objects into BUILD_DIR/php so that it is a little
easier to see the main outputs (sapi and extensions)
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.12 php-src/win32/build/confutils.js:1.13
--- php-src/win32/build/confutils.js:1.12 Wed Dec 3 21:12:36 2003
+++ php-src/win32/build/confutils.jsWed Dec 3 21:24:23 2003
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.12 2003/12/04 02:12:36 wez Exp $
+// $Id: confutils.js,v 1.13 2003/12/04 02:24:23 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -602,10 +602,10 @@
var sub_build = $(BUILD_DIR)\\;
- if (target != php) {
+// if (target != php) {
build_dirs[build_dirs.length] = target;
sub_build += target + \\;
- }
+// }
DEFINE(CFLAGS_BD_ + target.toUpperCase(), /Fo + sub_build + /Fd +
sub_build + /Fp + sub_build + /FR + sub_build + );
for (i in file_list) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 config.w32 php_bz2.h
wez Wed Dec 3 21:58:34 2003 EDT
Added files:
/php-src/ext/bz2config.w32
Modified files:
/php-src/ext/bz2php_bz2.h
Log:
Fixup bz2 extension so it builds as shared and static under win32
Index: php-src/ext/bz2/php_bz2.h
diff -u php-src/ext/bz2/php_bz2.h:1.1 php-src/ext/bz2/php_bz2.h:1.2
--- php-src/ext/bz2/php_bz2.h:1.1 Sat May 17 10:27:07 2003
+++ php-src/ext/bz2/php_bz2.h Wed Dec 3 21:58:33 2003
@@ -44,16 +44,18 @@
#ifdef PHP_WIN32
# ifdef PHP_BZ2_EXPORTS
-# define PHP_BZ2_API __declspec(dllexport)
+# define PHP_BZ2_API __declspec(dllexport)
+# elif defined(COMPILE_DL_BZ2)
+# define PHP_BZ2_API __declspec(dllimport)
# else
-# define PHP_BZ2_API __declspec(dllimport)
+# define PHP_BZ2_API /* nothing special */
# endif
#else
# define PHP_BZ2_API
#endif
-PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char
*path, char *mode, int options, char **opened_path, php_stream_context *context
STREAMS_DC TSRMLS_DC);
-PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char
*mode, php_stream *innerstream STREAMS_DC TSRMLS_DC);
+PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path,
char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC
TSRMLS_DC);
+PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode,
php_stream *innerstream STREAMS_DC TSRMLS_DC);
#define php_stream_bz2open_from_BZFILE(bz, mode, innerstream)
_php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC)
#define php_stream_bz2open(wrapper, path, mode, options, opened_path)
_php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL
STREAMS_CC TSRMLS_CC)
Index: php-src/ext/bz2/config.w32
+++ php-src/ext/bz2/config.w32
// $Id: config.w32,v 1.1 2003/12/04 02:58:33 wez Exp $
// vim:ft=javascript
ARG_WITH(bz2, BZip2, no);
if (PHP_BZ2 != no) {
if (CHECK_LIB(libbz2.lib, bz2, PHP_BZ2)
CHECK_HEADER_ADD_INCLUDE(bzlib.h, CFLAGS_BZ2)) {
EXTENSION(bz2, bz2.c);
AC_DEFINE('HAVE_BZ2', 1, 'Have BZ2 library');
// BZ2 extension does this slightly differently from others
if (PHP_BZ2_SHARED) {
ADD_FLAG(CFLAGS_BZ2, /D PHP_BZ2_EXPORTS );
}
} else {
WARNING(bz2 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/cpdf config.w32 /ext/crack config.w32 /ext/curl config.w32
wez Wed Dec 3 22:46:12 2003 EDT
Added files:
/php-src/ext/cpdf config.w32
/php-src/ext/crack config.w32
/php-src/ext/curl config.w32
Log:
allow these extensions to build with new system
Index: php-src/ext/cpdf/config.w32
+++ php-src/ext/cpdf/config.w32
// $Id: config.w32,v 1.1 2003/12/04 03:46:10 wez Exp $
// vim:ft=javascript
ARG_WITH(cpdflib, cpdflib = 2, no);
if (PHP_CPDFLIB != no) {
if (CHECK_LIB(cpdf.lib, cpdf, PHP_CPDFLIB)
CHECK_HEADER_ADD_INCLUDE(cpdflib.h, CFLAGS_CPDF)) {
EXTENSION(cpdf, cpdf.c, PHP_CPDFLIB_SHARED);
AC_DEFINE('HAVE_CPDFLIB', 1, 'Have CPDF library');
} else {
WARNING(cpdf not enabled; libraries and headers not found);
}
}
Index: php-src/ext/crack/config.w32
+++ php-src/ext/crack/config.w32
// $Id: config.w32,v 1.1 2003/12/04 03:46:11 wez Exp $
// vim:ft=javascript
ARG_WITH(crack, CRACKlib support, no);
if (PHP_CRACK != no) {
// NB: I Don't recommend static build unless you build your own
// cracklib.
if (CHECK_LIB(cracklib_win32.lib, crack, PHP_CRACK)
CHECK_HEADER_ADD_INCLUDE(packer.h, CFLAGS_CRACK)) {
EXTENSION(crack, crack.c);
AC_DEFINE('HAVE_CRACK', 1, 'Have CRACKlib library');
} else {
WARNING(cpdf not enabled; libraries and headers not found);
}
}
Index: php-src/ext/curl/config.w32
+++ php-src/ext/curl/config.w32
// $Id: config.w32,v 1.1 2003/12/04 03:46:12 wez Exp $
// vim:ft=javascript
ARG_WITH(curl, CURL support, no);
if (PHP_CURL != no) {
if (CHECK_LIB(libcurl.lib, curl, PHP_CURL)
CHECK_HEADER_ADD_INCLUDE(curl/easy.h, CFLAGS_CURL)
CHECK_LIB(ssleay32.lib, curl, PHP_CURL)
CHECK_LIB(libeay32.lib, curl, PHP_CURL)
CHECK_LIB(zlib.lib, curl, PHP_CURL)
CHECK_LIB(winmm.lib, curl, PHP_CURL)) {
EXTENSION(curl, interface.c multi.c streams.c);
AC_DEFINE('HAVE_CURL', 1, 'Have CURL library');
// 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);
}
}
--
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
sniper Thu Dec 4 01:37:15 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.490 php-src/NEWS:1.1247.2.491 --- php-src/NEWS:1.1247.2.490 Wed Dec 3 14:33:25 2003 +++ php-src/NEWSThu Dec 4 01:37:14 2003 @@ -16,6 +16,8 @@ - Fixed bug #26446 (domxml_open_file() returns an empty error-Array). (Rob) - Fixed bug #26440 (MFH missing context options). (Ilia) - Fixed bug #26438 (error in thttpd SAPI installation). (Jani) +- Fixed bug #26391 (parse_url() destroys strings that contain a character + in range of \x80-\xff)). (Moriyoshi) - Fixed bug #25963 (PostgreSQL error message include \n characters). (Marcus, Ilia) - Fixed bug #26384 (crash in domxslt-process()). (Christian) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Thu Dec 4 01:40:09 2003 EDT Modified files: /php-srcNEWS Log: stylepolizei Index: php-src/NEWS diff -u php-src/NEWS:1.1518 php-src/NEWS:1.1519 --- php-src/NEWS:1.1518 Wed Dec 3 17:13:11 2003 +++ php-src/NEWSThu Dec 4 01:40:08 2003 @@ -1,9 +1,7 @@ PHPNEWS ||| ?? Oct 2003, PHP 5 Beta 3 -- Stopped supporting Windows 95! -- Fixed include_once()/require_once() on Windows to honor case-insensitivity of - files (Andi) +- Dropped Windows 95 support. (Andi) - Moved extensions to PECL: . ext/db (Jani, Derick) . ext/qtdom (Jani, Derick) @@ -21,7 +19,9 @@ . image_type_to_extension(). return extension based on image type. (Ilia) . stream_socket_sendto() and stream_socket_recvfrom(). (Wez) . iconv_mime_decode_headers(). (Moriyoshi) -- Route stat() and family via streams API. (Sara) +- Changed stat() and family to be routed via streams API. (Sara) +- Fixed include_once() / require_once() on Windows to honor case-insensitivity + of files. (Andi) - Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed bug #26072 (--disable-libxml does not work). (Jani) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
