[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Jul 7 01:31:51 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3099r2=1.3100diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3099 php-src/ChangeLog:1.3100 --- php-src/ChangeLog:1.3099Sun Jul 6 01:32:11 2008 +++ php-src/ChangeLog Mon Jul 7 01:31:50 2008 @@ -1,3 +1,224 @@ +2008-07-06 Etienne Kneuss [EMAIL PROTECTED] + +* ext/spl/tests/fixedarray_016.phpt + ext/spl/tests/fixedarray_016.phpt: + + Add missing test + +* (PHP_5_3) + ext/spl/spl_array.c + ext/spl/spl_dllist.c + ext/spl/spl_fixedarray.c + ext/spl/spl_heap.c + ext/spl/tests/array_024.phpt + ext/spl/tests/dllist_008.phpt + ext/spl/tests/fixedarray_018.phpt + ext/spl/tests/heap_010.phpt + ext/spl/tests/sxe_004.phpt + ext/spl/tests/sxe_005.phpt: + MFH: First part of count/handlers related fixes + +* ext/spl/spl_array.c + ext/spl/spl_dllist.c + ext/spl/spl_fixedarray.c + ext/spl/spl_heap.c + ext/spl/tests/array_024.phpt + ext/spl/tests/array_024.phpt + ext/spl/tests/dllist_008.phpt + ext/spl/tests/dllist_008.phpt + ext/spl/tests/fixedarray_018.phpt + ext/spl/tests/fixedarray_018.phpt + ext/spl/tests/heap_010.phpt + ext/spl/tests/heap_010.phpt + ext/spl/tests/sxe_004.phpt + ext/spl/tests/sxe_005.phpt: + First part of count/handlers related fixes + +2008-07-06 Pierre-Alain Joye [EMAIL PROTECTED] + +* EXTENSIONS: + - some updates (will be used to send mails when an extension is broken, + snaps or from RM/QA) + +* (PHP_5_3) + EXTENSIONS: + - some updates (will be used to send mails when an extension is broken, + snaps or from RM/QA) + +* (PHP_5_3) + ext/gd/config.w32 + ext/gd/gd.c: + - MFH: +- update lib/headers detection +- nuke unused variables + +* ext/gd/config.w32 + ext/gd/gd.c: + - update lib/headers detection + - nuke unused variables + +2008-07-06 Nuno Lopes [EMAIL PROTECTED] + +* sapi/cli/tests/021.phpt + tests/lang/comments.phpt: + add + +* sapi/cli/tests/021.phpt + sapi/cli/tests/021.phpt: + + file 021.phpt was initially added on branch PHP_5_3. + +2008-07-06 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_3) + ext/iconv/config.w32: + - MFH: update lib detection and does not enable it when lib/headers are + missing + +* ext/iconv/config.w32: + - update lib detection and does not enable it when lib/headers are missing + +* ext/xmlrpc/config.w32: + - MFB: don't enable xmlrpc when libxml is missing + +* (PHP_5_3) + ext/xmlrpc/config.w32: + - don't enable xmlrpc when libxml is missing + +2008-07-06 Nuno Lopes [EMAIL PROTECTED] + +* tests/lang/bug44654.phpt: + uhm, forgot to commit this one + +* ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner.c + ZendEngine2/zend_language_scanner_defs.h + ZendEngine2/zend_language_scanner_defs.h + ZendEngine2/zend_language_scanner_defs.h: + regenerate + +* ZendEngine2/zend_language_scanner.l + sapi/cli/tests/016.phpt: + MFB + +* (PHP_5_3) + sapi/cli/tests/016.phpt: + fix test for good consoles (tm) + +* (PHP_5_3) + ZendEngine2/zend_language_scanner.l + tests/lang/bug44654.phpt + tests/lang/bug44654.phpt: + fix last part of bug #44654 + +* (PHP_5_3) + ZendEngine2/zend_language_scanner.l: + fix first part of bug #44654: scan for opening tag ? after a # char + +* tests/lang/comments.phpt + tests/lang/comments.phpt: + + file comments.phpt was initially added on branch PHP_5_3. + +2008-07-06 Rui Hirokawa [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/tests/multibyte/multibyte_encoding_004.phpt + ZendEngine2/tests/multibyte/multibyte_encoding_005.phpt: + improved zend-multibyte detection. + +2008-07-06 Nuno Lopes [EMAIL PROTECTED] + +* ext/pcre/pcrelib/pcre_compile.c: + MFB: fix CVE-2008-2371 + +* (PHP_5_3) + ext/pcre/pcrelib/pcre_compile.c: + fix CVE-2008-2371. patch by Tavis Ormandy + +* ext/pcre/pcrelib/ChangeLog + ext/pcre/pcrelib/HACKING + ext/pcre/pcrelib/NEWS + ext/pcre/pcrelib/README + ext/pcre/pcrelib/config.h + ext/pcre/pcrelib/pcre.h + ext/pcre/pcrelib/pcre_compile.c + ext/pcre/pcrelib/pcre_exec.c + ext/pcre/pcrelib/pcre_internal.h + ext/pcre/pcrelib/pcre_study.c + ext/pcre/pcrelib/pcreposix.c + ext/pcre/pcrelib/pcreposix.h + ext/pcre/pcrelib/ucpinternal.h + ext/pcre/pcrelib/doc/pcre.txt + ext/pcre/pcrelib/testdata/testinput2 + ext/pcre/pcrelib/testdata/testinput5 + ext/pcre/pcrelib/testdata/testinput7 +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Jul 7 01:31:55 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1330r2=1.1331diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1330 ZendEngine2/ChangeLog:1.1331 --- ZendEngine2/ChangeLog:1.1330Sun Jul 6 01:32:15 2008 +++ ZendEngine2/ChangeLog Mon Jul 7 01:31:55 2008 @@ -1,3 +1,53 @@ +2008-07-06 Nuno Lopes [EMAIL PROTECTED] + +* zend_language_scanner.c + zend_language_scanner.c + zend_language_scanner.c + zend_language_scanner_defs.h + zend_language_scanner_defs.h + zend_language_scanner_defs.h: + regenerate + +* zend_language_scanner.l: + MFB + +* (PHP_5_3) + zend_language_scanner.l: + fix last part of bug #44654 + +* (PHP_5_3) + zend_language_scanner.l: + fix first part of bug #44654: scan for opening tag ? after a # char + +2008-07-06 Rui Hirokawa [EMAIL PROTECTED] + +* (PHP_5_3) + tests/multibyte/multibyte_encoding_004.phpt + tests/multibyte/multibyte_encoding_005.phpt: + improved zend-multibyte detection. + +2008-07-06 Felipe Pena [EMAIL PROTECTED] + +* zend_builtin_functions.c: + MFB: + - Added arginfo + - Removed #include zend_arg_defs.c + +2008-07-06 Rui Hirokawa [EMAIL PROTECTED] + +* tests/multibyte/multibyte_encoding_004.phpt + tests/multibyte/multibyte_encoding_004.phpt + tests/multibyte/multibyte_encoding_005.phpt + tests/multibyte/multibyte_encoding_005.phpt: + + file multibyte_encoding_004.phpt was initially added on branch PHP_5_3. + +2008-07-06 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + zend_builtin_functions.c: + - Fixed arginfo + 2008-07-05 Felipe Pena [EMAIL PROTECTED] * (PHP_5_3) @@ -24400,7 +24450,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1330 2008/07/06 01:32:15 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1331 2008/07/07 01:31:55 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26124,7 +26174,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1330 2008/07/06 01:32:15 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1331 2008/07/07 01:31:55 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Sun Jul 6 09:56:01 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- MFB: correctly test the VCVERS (four digits now)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.73r2=1.74diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.73 php-src/win32/build/config.w32:1.74
--- php-src/win32/build/config.w32:1.73 Sat Jul 5 19:52:44 2008
+++ php-src/win32/build/config.w32 Sun Jul 6 09:56:01 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.73 2008/07/05 19:52:44 pajoye Exp $
+// $Id: config.w32,v 1.74 2008/07/06 09:56:01 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -144,7 +144,7 @@
DEFINE(CFLAGS, /nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS);
-if (VCVERS 14) {
+if (VCVERS 1400) {
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
@@ -154,7 +154,7 @@
}
}
-if (VCVERS = 14) {
+if (VCVERS = 1400) {
// fun stuff: MS deprecated ANSI stdio and similar functions
// disable annoying warnings. In addition, time_t defaults
// to 64-bit. Ask for 32-bit.
@@ -301,7 +301,7 @@
for (i = 0; i path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- if (VCVERS = 12 f.indexOf( ) = 0) {
+ if (VCVERS = 1200 f.indexOf( ) = 0) {
ADD_FLAG(LDFLAGS, '/libpath:\\' + f
+ '\\ ');
} else {
ADD_FLAG(LDFLAGS, '/libpath:' + f +
' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/lang comments.phpt
nlopess Sun Jul 6 15:40:11 2008 UTC Added files: (Branch: PHP_5_3) /php-src/tests/lang comments.phpt Log: add test for #-style comments. passes fine on both 5.2 and 5.3 http://cvs.php.net/viewvc.cgi/php-src/tests/lang/comments.phpt?view=markuprev=1.1 Index: php-src/tests/lang/comments.phpt +++ php-src/tests/lang/comments.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang comments.phpt
nlopess Sun Jul 6 15:40:39 2008 UTC Modified files: /php-src/tests/lang comments.phpt Log: add http://cvs.php.net/viewvc.cgi/php-src/tests/lang/comments.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/tests/lang/comments.phpt diff -u /dev/null php-src/tests/lang/comments.phpt:1.2 --- /dev/null Sun Jul 6 15:40:39 2008 +++ php-src/tests/lang/comments.phptSun Jul 6 15:40:39 2008 @@ -0,0 +1,23 @@ +--TEST-- +#-style comments +--FILE-- +#teste +#teste2 +?php + +#ahahah +#ahhfhf + +echo '#ola'; //? +echo \n; +echo 'uhm # ah'; #ah? +echo \n; +echo e este, # hein?; +echo \n; + +? +--EXPECTF-- +#teste2 +#ola +uhm # ah +e este, # hein? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre/pcrelib pcre_compile.c
nlopess Sun Jul 6 15:23:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre/pcrelib pcre_compile.c
Log:
fix CVE-2008-2371. patch by Tavis Ormandy
# currently there's no release of PCRE with this fix. PCRE's author
recommended applying this patch in the meantime
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_compile.c?r1=1.1.2.1.2.6.2.4r2=1.1.2.1.2.6.2.5diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_compile.c
diff -u php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.6.2.4
php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.6.2.5
--- php-src/ext/pcre/pcrelib/pcre_compile.c:1.1.2.1.2.6.2.4 Sun Jul 6
15:17:24 2008
+++ php-src/ext/pcre/pcrelib/pcre_compile.c Sun Jul 6 15:23:31 2008
@@ -4929,7 +4929,7 @@
(lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
{
cd-external_options = newoptions;
-options = newoptions;
+options = *optionsptr = newoptions;
}
else
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli/tests 016.phpt
nlopess Sun Jul 6 16:38:18 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli/tests 016.phpt
Log:
fix test for good consoles (tm)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/016.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/sapi/cli/tests/016.phpt
diff -u php-src/sapi/cli/tests/016.phpt:1.1.2.4
php-src/sapi/cli/tests/016.phpt:1.1.2.5
--- php-src/sapi/cli/tests/016.phpt:1.1.2.4 Mon Mar 17 16:32:15 2008
+++ php-src/sapi/cli/tests/016.phpt Sun Jul 6 16:38:18 2008
@@ -11,6 +11,9 @@
?php
$php = getenv('TEST_PHP_EXECUTABLE');
+// disallow console escape sequences that may break the output
+putenv('TERM=VT100');
+
$codes = array();
$codes[1] = EOT
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli/tests 016.phpt
nlopess Sun Jul 6 16:42:10 2008 UTC
Modified files:
/php-src/sapi/cli/tests 016.phpt
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/016.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/cli/tests/016.phpt
diff -u php-src/sapi/cli/tests/016.phpt:1.1 php-src/sapi/cli/tests/016.phpt:1.2
--- php-src/sapi/cli/tests/016.phpt:1.1 Sat Mar 1 21:55:20 2008
+++ php-src/sapi/cli/tests/016.phpt Sun Jul 6 16:42:10 2008
@@ -11,6 +11,9 @@
?php
$php = getenv('TEST_PHP_EXECUTABLE');
+// disallow console escape sequences that may break the output
+putenv('TERM=VT100');
+
$codes = array();
$codes[1] = EOT
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug44654.phpt
nlopess Sun Jul 6 16:43:36 2008 UTC
Modified files:
/php-src/tests/lang bug44654.phpt
Log:
uhm, forgot to commit this one
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug44654.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/lang/bug44654.phpt
diff -u /dev/null php-src/tests/lang/bug44654.phpt:1.2
--- /dev/null Sun Jul 6 16:43:36 2008
+++ php-src/tests/lang/bug44654.phptSun Jul 6 16:43:36 2008
@@ -0,0 +1,8 @@
+--TEST--
+Bug #44654 (syntax error for #)
+--FILE--
+#?php echo 1; ?
+?php if (1) { ?#?php } ?
+#?php echo 1; ?
+--EXPECT--
+##1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xmlrpc config.w32
pajoye Sun Jul 6 16:52:59 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlrpc config.w32
Log:
- don't enable xmlrpc when libxml is missing
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.w32?r1=1.2.8.1r2=1.2.8.2diff_format=u
Index: php-src/ext/xmlrpc/config.w32
diff -u php-src/ext/xmlrpc/config.w32:1.2.8.1
php-src/ext/xmlrpc/config.w32:1.2.8.2
--- php-src/ext/xmlrpc/config.w32:1.2.8.1 Sun Jun 22 23:17:22 2008
+++ php-src/ext/xmlrpc/config.w32 Sun Jul 6 16:52:59 2008
@@ -1,19 +1,17 @@
-// $Id: config.w32,v 1.2.8.1 2008/06/22 23:17:22 pajoye Exp $
+// $Id: config.w32,v 1.2.8.2 2008/07/06 16:52:59 pajoye Exp $
// vim:ft=javascript
ARG_WITH(xmlrpc, XMLRPC-EPI support, no);
if (PHP_XMLRPC != no) {
if (CHECK_HEADER_ADD_INCLUDE(xmlrpc.h, CFLAGS_XMLRPC,
configure_module_dirname + /libxmlrpc)
-CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS)) {
+CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS)
+ADD_EXTENSION_DEP('xmlrpc', 'libxml')) {
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);
- if (!ADD_EXTENSION_DEP('xmlrpc', 'libxml')) {
- PHP_XMLRPC = no;
- }
} else {
WARNING(xmlrpc support can't be enabled, libraries or headers
are missing)
PHP_XMLRPC = no;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc config.w32
pajoye Sun Jul 6 16:55:01 2008 UTC
Modified files:
/php-src/ext/xmlrpc config.w32
Log:
- MFB: don't enable xmlrpc when libxml is missing
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xmlrpc/config.w32
diff -u php-src/ext/xmlrpc/config.w32:1.2 php-src/ext/xmlrpc/config.w32:1.3
--- php-src/ext/xmlrpc/config.w32:1.2 Mon Dec 22 13:16:42 2003
+++ php-src/ext/xmlrpc/config.w32 Sun Jul 6 16:55:01 2008
@@ -1,14 +1,21 @@
-// $Id: config.w32,v 1.2 2003/12/22 13:16:42 wez Exp $
+// $Id: config.w32,v 1.3 2008/07/06 16:55:01 pajoye 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);
- ADD_EXTENSION_DEP('xmlrpc', 'libxml');
+ if (CHECK_HEADER_ADD_INCLUDE(xmlrpc.h, CFLAGS_XMLRPC,
configure_module_dirname + /libxmlrpc)
+CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS)
+ADD_EXTENSION_DEP('xmlrpc', 'libxml')) {
+
+ 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);
+
+ } else {
+ WARNING(xmlrpc support can't be enabled, libraries or headers
are missing)
+ PHP_XMLRPC = no;
+ }
}
--
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
pajoye Sun Jul 6 16:58:51 2008 UTC
Modified files:
/php-src/ext/iconv config.w32
Log:
- update lib detection and does not enable it when lib/headers are missing
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.6 php-src/ext/iconv/config.w32:1.7
--- php-src/ext/iconv/config.w32:1.6Tue Nov 23 12:04:07 2004
+++ php-src/ext/iconv/config.w32Sun Jul 6 16:58:51 2008
@@ -1,11 +1,13 @@
-// $Id: config.w32,v 1.6 2004/11/23 12:04:07 edink Exp $
+// $Id: config.w32,v 1.7 2008/07/06 16:58:51 pajoye Exp $
// vim: ft=javascript
ARG_WITH(iconv, iconv support, yes);
if (PHP_ICONV != no) {
- if (/*CHECK_LIB(iconv.lib, iconv, PHP_ICONV) */
- CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV,
PHP_ICONV)) {
+ if ((CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
+ CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV))
{
+
EXTENSION(iconv, iconv.c);
AC_DEFINE(HAVE_ICONV, 1, Define if iconv extension is
enabled);
@@ -16,6 +18,9 @@
if (!PHP_ICONV_SHARED) {
ADD_DEF_FILE(ext\\iconv\\php_iconv.def);
}
+ } else {
+ WARNING(iconv support can't be enabled, libraries or headers
are missing)
+ PHP_ICONV = no;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/iconv config.w32
pajoye Sun Jul 6 16:59:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/iconv config.w32
Log:
- MFH: update lib detection and does not enable it when lib/headers are
missing
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/config.w32?r1=1.6r2=1.6.6.1diff_format=u
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.6 php-src/ext/iconv/config.w32:1.6.6.1
--- php-src/ext/iconv/config.w32:1.6Tue Nov 23 12:04:07 2004
+++ php-src/ext/iconv/config.w32Sun Jul 6 16:59:13 2008
@@ -1,11 +1,13 @@
-// $Id: config.w32,v 1.6 2004/11/23 12:04:07 edink Exp $
+// $Id: config.w32,v 1.6.6.1 2008/07/06 16:59:13 pajoye Exp $
// vim: ft=javascript
ARG_WITH(iconv, iconv support, yes);
if (PHP_ICONV != no) {
- if (/*CHECK_LIB(iconv.lib, iconv, PHP_ICONV) */
- CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV,
PHP_ICONV)) {
+ if ((CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
+ CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV))
{
+
EXTENSION(iconv, iconv.c);
AC_DEFINE(HAVE_ICONV, 1, Define if iconv extension is
enabled);
@@ -16,6 +18,9 @@
if (!PHP_ICONV_SHARED) {
ADD_DEF_FILE(ext\\iconv\\php_iconv.def);
}
+ } else {
+ WARNING(iconv support can't be enabled, libraries or headers
are missing)
+ PHP_ICONV = no;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli/tests 021.phpt
nlopess Sun Jul 6 16:59:39 2008 UTC Added files: (Branch: PHP_5_3) /php-src/sapi/cli/tests 021.phpt Log: add test for the shebang thing http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?view=markuprev=1.1 Index: php-src/sapi/cli/tests/021.phpt +++ php-src/sapi/cli/tests/021.phpt -- 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 gd.c
pajoye Sun Jul 6 17:06:43 2008 UTC
Modified files:
/php-src/ext/gd config.w32 gd.c
Log:
- update lib/headers detection
- nuke unused variables
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.24 php-src/ext/gd/config.w32:1.25
--- php-src/ext/gd/config.w32:1.24 Tue Apr 17 15:11:56 2007
+++ php-src/ext/gd/config.w32 Sun Jul 6 17:06:43 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.24 2007/04/17 15:11:56 pajoye Exp $
+// $Id: config.w32,v 1.25 2008/07/06 17:06:43 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -6,9 +6,14 @@
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
- CHECK_LIB(freetype2.lib, gd, PHP_GD)
- CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(freetype.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
+ (CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
+ (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib,
gd, PHP_GD) )
+ (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
+CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.386r2=1.387diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.386 php-src/ext/gd/gd.c:1.387
--- php-src/ext/gd/gd.c:1.386 Sun May 4 21:16:22 2008
+++ php-src/ext/gd/gd.c Sun Jul 6 17:06:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.386 2008/05/04 21:16:22 colder Exp $ */
+/* $Id: gd.c,v 1.387 2008/07/06 17:06:43 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1906,8 +1906,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
- HINSTANCE handle;
- long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.w32 gd.c
pajoye Sun Jul 6 17:07:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.w32 gd.c
Log:
- MFH:
- update lib/headers detection
- nuke unused variables
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4r2=1.10.4.4.2.1diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4
php-src/ext/gd/config.w32:1.10.4.4.2.1
--- php-src/ext/gd/config.w32:1.10.4.4 Tue Apr 17 15:31:45 2007
+++ php-src/ext/gd/config.w32 Sun Jul 6 17:07:26 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4 2007/04/17 15:31:45 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.1 2008/07/06 17:07:26 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -6,9 +6,14 @@
if (PHP_GD != no) {
if (CHECK_LIB(libjpeg.lib, gd, PHP_GD)
- CHECK_LIB(freetype2.lib, gd, PHP_GD)
- CHECK_LIB(libpng.lib, gd, PHP_GD)
- CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(freetype.lib, gd, PHP_GD) ||
CHECK_LIB(freetype2.lib, gd, PHP_GD) )
+ (CHECK_LIB(libpng_a.lib, gd, PHP_GD) ||
CHECK_LIB(libpng.lib, gd, PHP_GD) )
+ (CHECK_LIB(zlib_a.lib, gd, PHP_GD) || CHECK_LIB(zlib.lib,
gd, PHP_GD) )
+ (CHECK_LIB(libiconv_a.lib, gd, PHP_GD) ||
CHECK_LIB(libiconv.lib, gd, PHP_GD) )
+ CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
+ (CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
+CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
+ CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.8r2=1.312.2.20.2.32.2.9diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.8
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.9
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.8 Sun Jun 22 11:36:46 2008
+++ php-src/ext/gd/gd.c Sun Jul 6 17:07:26 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.8 2008/06/22 11:36:46 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.9 2008/07/06 17:07:26 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2168,8 +2168,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
- HINSTANCE handle;
- long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli/tests 021.phpt
Hello Nuno, nice! Small note though: ===DONE=== at the end of the script is better than echo DONE. Because run-tests.php treats it specially. marcus Sunday, July 6, 2008, 6:59:39 PM, you wrote: nlopess Sun Jul 6 16:59:39 2008 UTC Added files: (Branch: PHP_5_3) /php-src/sapi/cli/tests 021.phpt Log: add test for the shebang thing http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?view=markuprev=1.1 Index: php-src/sapi/cli/tests/021.phpt +++ php-src/sapi/cli/tests/021.phpt Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / EXTENSIONS
pajoye Sun Jul 6 19:24:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: - some updates (will be used to send mails when an extension is broken, snaps or from RM/QA) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.4r2=1.72.2.4.2.4.2.5diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.4 php-src/EXTENSIONS:1.72.2.4.2.4.2.5 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.4 Wed Feb 27 09:34:53 2008 +++ php-src/EXTENSIONS Sun Jul 6 19:24:54 2008 @@ -118,7 +118,7 @@ --- EXTENSION: dba -PRIMARY MAINTAINER: Marcus Börger [EMAIL PROTECTED] +PRIMARY MAINTAINER: Marcus Börger [EMAIL PROTECTED],Christopher Jones [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working COMMENT: DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini @@ -148,16 +148,22 @@ COMMENT: Tested on phpts and isapi versions --- EXTENSION: mysql -PRIMARY MAINTAINER: Zak Greant [EMAIL PROTECTED], Georg Richter [EMAIL PROTECTED] +PRIMARY MAINTAINER: Zak Greant [EMAIL PROTECTED], Georg Richter [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- EXTENSION: mysqli -PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED] +PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working SINCE: 5.0 --- +EXTENSION: mysqlnd +PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +--- EXTENSION: oci8 PRIMARY MAINTAINER: Christopher Jones [EMAIL PROTECTED], Antony Dovgal [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -188,7 +194,7 @@ SINCE: 5.1 --- EXTENSION: pdo_mysql -PRIMARY MAINTAINER: Ilia Alshanetsky [EMAIL PROTECTED] +PRIMARY MAINTAINER: Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Odd fixes STATUS: Working SINCE: 5.1 @@ -230,12 +236,9 @@ SINCE: 5.0 (Since 4.3.2 in PECL) COMMENT: Integrates SQLite embeddable SQL database engine. --- -EXTENSION: sybase -MAINTENANCE: Unknown -STATUS: Not Working EXTENSION: sybase_ct -MAINTENANCE: Unknown +PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] +MAINTENANCE:Maintained STATUS: Working --- @@ -266,7 +269,12 @@ STATUS: Working --- EXTENSION: xml -PRIMARY MAINTAINER: Thies C. Arntzen [EMAIL PROTECTED] +PRIMARY MAINTAINER: Thies C. Arntzen [EMAIL PROTECTED], Rob Richards [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +--- +EXTENSION: libxml +PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Christian Stocker [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- @@ -281,7 +289,7 @@ STATUS: Experimental --- EXTENSION: xmlwriter -PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED] +PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- @@ -297,7 +305,7 @@
[PHP-CVS] cvs: php-src /ext/sybase .cvsignore CREDITS config.m4 php_sybase_db.c php_sybase_db.h
pajoye Sun Jul 6 19:28:27 2008 UTC Removed files: /php-src/ext/sybase .cvsignore CREDITS config.m4 php_sybase_db.c php_sybase_db.h Log: - has been moved to siberia (the true one) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fdf .cvsignore CREDITS config.m4 config.w32 fdf.c fdf.dsp package.xml php_fdf.h /ext/fdf/tests .cvsignore 01-general.phpt 02-values.phpt 03-read-file.phpt 04-POST.phpt sim
pajoye Sun Jul 6 19:29:29 2008 UTC Removed files: /php-src/ext/fdf.cvsignore CREDITS config.m4 config.w32 fdf.c fdf.dsp package.xml php_fdf.h /php-src/ext/fdf/tests .cvsignore 01-general.phpt 02-values.phpt 03-read-file.phpt 04-POST.phpt simple.fdf Log: - has been moved to PECL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
pajoye Sun Jul 6 19:30:14 2008 UTC Modified files: /php-srcEXTENSIONS Log: - some updates (will be used to send mails when an extension is broken, snaps or from RM/QA) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.80r2=1.81diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.80 php-src/EXTENSIONS:1.81 --- php-src/EXTENSIONS:1.80 Wed Feb 27 09:34:44 2008 +++ php-src/EXTENSIONS Sun Jul 6 19:30:14 2008 @@ -118,7 +118,7 @@ --- EXTENSION: dba -PRIMARY MAINTAINER: Marcus Börger [EMAIL PROTECTED] +PRIMARY MAINTAINER: Marcus Börger [EMAIL PROTECTED],Christopher Jones [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working COMMENT: DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini @@ -148,16 +148,22 @@ COMMENT: Tested on phpts and isapi versions --- EXTENSION: mysql -PRIMARY MAINTAINER: Zak Greant [EMAIL PROTECTED], Georg Richter [EMAIL PROTECTED] +PRIMARY MAINTAINER: Zak Greant [EMAIL PROTECTED], Georg Richter [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- EXTENSION: mysqli -PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED] +PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working SINCE: 5.0 --- +EXTENSION: mysqlnd +PRIMARY MAINTAINER: Georg Richter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +--- EXTENSION: oci8 PRIMARY MAINTAINER: Christopher Jones [EMAIL PROTECTED], Antony Dovgal [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -188,7 +194,7 @@ SINCE: 5.1 --- EXTENSION: pdo_mysql -PRIMARY MAINTAINER: Unknown +PRIMARY MAINTAINER: Ilia Alshanetsky [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Andrey Hristov [EMAIL PROTECTED], Johannes Schlüter [EMAIL PROTECTED], Ulf Wendel [EMAIL PROTECTED] MAINTENANCE: Odd fixes STATUS: Working SINCE: 5.1 @@ -206,7 +212,7 @@ SINCE: 5.1 --- EXTENSION: pdo_pgsql -PRIMARY MAINTAINER: Unknown +PRIMARY MAINTAINER: Ilia Alshanetsky [EMAIL PROTECTED] MAINTENANCE: Odd fixes STATUS: Working SINCE: 5.1 @@ -230,12 +236,9 @@ SINCE: 5.0 (Since 4.3.2 in PECL) COMMENT: Integrates SQLite embeddable SQL database engine. --- -EXTENSION: sybase -MAINTENANCE: Unknown -STATUS: Not Working EXTENSION: sybase_ct -MAINTENANCE: Unknown +PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] +MAINTENANCE:Maintained STATUS: Working --- @@ -266,7 +269,12 @@ STATUS: Working --- EXTENSION: xml -PRIMARY MAINTAINER: Thies C. Arntzen [EMAIL PROTECTED] +PRIMARY MAINTAINER: Thies C. Arntzen [EMAIL PROTECTED], Rob Richards [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +--- +EXTENSION: libxml +PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Christian Stocker [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working --- @@ -281,7 +289,7 @@ STATUS: Experimental --- EXTENSION: xmlwriter -PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED] +PRIMARY MAINTAINER: Rob Richards [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c php_mbregex.c /ext/mbstring/tests mb_ereg2.phpt mb_regex_encoding_error1.phpt mb_regex_encoding_variation1.phpt mb_substr_error1.phpt mb_su
2008/6/28 Alexey Zakhlestin [EMAIL PROTECTED]: indeyetsSat Jun 28 21:23:08 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring mbstring.c php_mbregex.c /php-src/ext/mbstring/tests mb_ereg2.phpt mb_regex_encoding_error1.phpt mb_regex_encoding_variation1.phpt mb_substr_error1.phpt mb_substr_variation1.phpt mb_substr_variation2.phpt Log: updated to the new parameter-parsing api Please merge these changes to HEAD as well (HEAD is an active branch ;) Thanks for your work! Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_array.c spl_dllist.c spl_fixedarray.c spl_heap.c /ext/spl/tests array_024.phpt dllist_008.phpt fixedarray_018.phpt heap_010.phpt sxe_004.phpt sxe_005.phpt
colder Sun Jul 6 23:45:38 2008 UTC
Added files:
/php-src/ext/spl/tests array_024.phpt dllist_008.phpt
fixedarray_018.phpt heap_010.phpt
Modified files:
/php-src/ext/splspl_array.c spl_dllist.c spl_fixedarray.c
spl_heap.c
/php-src/ext/spl/tests sxe_004.phpt sxe_005.phpt
Log:
First part of count/handlers related fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.139r2=1.140diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.139 php-src/ext/spl/spl_array.c:1.140
--- php-src/ext/spl/spl_array.c:1.139 Tue May 20 12:04:37 2008
+++ php-src/ext/spl/spl_array.c Sun Jul 6 23:45:38 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.139 2008/05/20 12:04:37 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.140 2008/07/06 23:45:38 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -66,10 +66,11 @@
HashPosition pos;
int ar_flags;
int is_self;
- zend_function * fptr_offset_get;
- zend_function * fptr_offset_set;
- zend_function * fptr_offset_has;
- zend_function * fptr_offset_del;
+ zend_function *fptr_offset_get;
+ zend_function *fptr_offset_set;
+ zend_function *fptr_offset_has;
+ zend_function *fptr_offset_del;
+ zend_function *fptr_count;
zend_class_entry* ce_get_iterator;
} spl_array_object;
@@ -202,6 +203,10 @@
if (intern-fptr_offset_del-common.scope == parent) {
intern-fptr_offset_del = NULL;
}
+ zend_hash_find(class_type-function_table, count,
sizeof(count),(void **) intern-fptr_count);
+ if (intern-fptr_count-common.scope == parent) {
+ intern-fptr_count = NULL;
+ }
}
/* Cache iterator functions if ArrayIterator or derived. Check
current's */
/* cache since only current is always required */
@@ -1164,9 +1169,8 @@
zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, Seek
position %ld is out of range, opos);
} /* }}} */
-int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /*
{{{ */
+int inline spl_array_object_count_elements_helper(spl_array_object *intern,
long *count TSRMLS_DC) /* {{{ */
{
- spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
HashPosition pos;
@@ -1193,14 +1197,36 @@
}
} /* }}} */
+int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /*
{{{ */
+{
+ spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
+
+ if (intern-fptr_count) {
+ zval *rv;
+ zend_call_method_with_0_params(object, intern-std.ce,
intern-fptr_count, count, rv);
+ if (rv) {
+ zval_ptr_dtor(intern-retval);
+ MAKE_STD_ZVAL(intern-retval);
+ ZVAL_ZVAL(intern-retval, rv, 1, 1);
+ convert_to_long(intern-retval);
+ *count = (long) Z_LVAL_P(intern-retval);
+ return SUCCESS;
+ }
+ *count = 0;
+ return FAILURE;
+ }
+ return spl_array_object_count_elements_helper(intern, count TSRMLS_CC);
+} /* }}} */
+
/* {{{ proto int ArrayObject::count() U
proto int ArrayIterator::count() U
Return the number of elements in the Iterator. */
SPL_METHOD(Array, count)
{
long count;
+ spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- spl_array_object_count_elements(getThis(), count TSRMLS_CC);
+ spl_array_object_count_elements_helper(intern, count TSRMLS_CC);
RETURN_LONG(count);
} /* }}} */
@@ -1220,9 +1246,11 @@
zend_throw_exception(spl_ce_BadMethodCallException,
Function expects exactly one argument, 0 TSRMLS_CC);
return;
}
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 2, tmp, arg TSRMLS_CC);
+ zval_ptr_dtor(return_value_ptr);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 2, tmp, arg TSRMLS_CC);
} else {
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 1, tmp, NULL TSRMLS_CC);
+ zval_ptr_dtor(return_value_ptr);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 1, tmp, NULL TSRMLS_CC);
}
} /* }}} */
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_array.c spl_dllist.c spl_fixedarray.c spl_heap.c /ext/spl/tests array_024.phpt dllist_008.phpt fixedarray_018.phpt heap_010.phpt sxe_004.phpt sxe_005.phpt
colder Sun Jul 6 23:45:56 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests array_024.phpt dllist_008.phpt
fixedarray_018.phpt heap_010.phpt
Modified files:
/php-src/ext/splspl_array.c spl_dllist.c spl_fixedarray.c
spl_heap.c
/php-src/ext/spl/tests sxe_004.phpt sxe_005.phpt
Log:
MFH: First part of count/handlers related fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.14r2=1.71.2.17.2.13.2.15diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.14
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.15
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.14 Tue May 6 23:08:06 2008
+++ php-src/ext/spl/spl_array.c Sun Jul 6 23:45:55 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.14 2008/05/06 23:08:06 colder Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.15 2008/07/06 23:45:55 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -65,10 +65,11 @@
HashPosition pos;
int ar_flags;
int is_self;
- zend_function * fptr_offset_get;
- zend_function * fptr_offset_set;
- zend_function * fptr_offset_has;
- zend_function * fptr_offset_del;
+ zend_function *fptr_offset_get;
+ zend_function *fptr_offset_set;
+ zend_function *fptr_offset_has;
+ zend_function *fptr_offset_del;
+ zend_function *fptr_count;
zend_class_entry* ce_get_iterator;
} spl_array_object;
@@ -201,6 +202,10 @@
if (intern-fptr_offset_del-common.scope == parent) {
intern-fptr_offset_del = NULL;
}
+ zend_hash_find(class_type-function_table, count,
sizeof(count),(void **) intern-fptr_count);
+ if (intern-fptr_count-common.scope == parent) {
+ intern-fptr_count = NULL;
+ }
}
/* Cache iterator functions if ArrayIterator or derived. Check
current's */
/* cache since only current is always required */
@@ -1171,9 +1176,8 @@
zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, Seek
position %ld is out of range, opos);
} /* }}} */
-int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /*
{{{ */
+int inline spl_array_object_count_elements_helper(spl_array_object *intern,
long *count TSRMLS_DC) /* {{{ */
{
- spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
HashPosition pos;
@@ -1200,14 +1204,37 @@
}
} /* }}} */
+int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /*
{{{ */
+{
+ spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
+
+ if (intern-fptr_count) {
+ zval *rv;
+ zend_call_method_with_0_params(object, intern-std.ce,
intern-fptr_count, count, rv);
+ if (rv) {
+ zval_ptr_dtor(intern-retval);
+ MAKE_STD_ZVAL(intern-retval);
+ ZVAL_ZVAL(intern-retval, rv, 1, 1);
+ convert_to_long(intern-retval);
+ *count = (long) Z_LVAL_P(intern-retval);
+ return SUCCESS;
+ }
+ *count = 0;
+ return FAILURE;
+ }
+ return spl_array_object_count_elements_helper(intern, count TSRMLS_CC);
+} /* }}} */
+
/* {{{ proto int ArrayObject::count()
proto int ArrayIterator::count()
Return the number of elements in the Iterator. */
SPL_METHOD(Array, count)
{
long count;
+ spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ spl_array_object_count_elements_helper(intern, count TSRMLS_CC);
- spl_array_object_count_elements(getThis(), count TSRMLS_CC);
RETURN_LONG(count);
} /* }}} */
@@ -1226,9 +1253,9 @@
zend_throw_exception(spl_ce_BadMethodCallException,
Function expects exactly one argument, 0 TSRMLS_CC);
return;
}
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 2, tmp, arg TSRMLS_CC);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 2, tmp, arg TSRMLS_CC);
} else {
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 1, tmp, NULL TSRMLS_CC);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 1, tmp, NULL TSRMLS_CC);
}
} /* }}} */
[PHP-CVS] cvs: php-src /ext/spl/tests fixedarray_016.phpt
colder Sun Jul 6 23:52:44 2008 UTC
Added files:
/php-src/ext/spl/tests fixedarray_016.phpt
Log:
Add missing test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fixedarray_016.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fixedarray_016.phpt
+++ php-src/ext/spl/tests/fixedarray_016.phpt
--TEST--
SPL: FixedArray: var_dump
--FILE--
?php
$a = new SplFixedArray(2);
$a[0] = foo;
var_dump(empty($a[0]), empty($a[1]), $a);
?
--EXPECTF--
bool(false)
bool(true)
object(SplFixedArray)#1 (1) {
[uarray:uSplFixedArray:private]=
array(2) {
[0]=
unicode(3) foo
[1]=
NULL
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests fixedarray_016.phpt
colder Sun Jul 6 23:54:36 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests fixedarray_016.phpt
Log:
MFH: Add missing test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fixedarray_016.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fixedarray_016.phpt
+++ php-src/ext/spl/tests/fixedarray_016.phpt
--TEST--
SPL: FixedArray: var_dump
--FILE--
?php
$a = new SplFixedArray(2);
$a[0] = foo;
var_dump(empty($a[0]), empty($a[1]), $a);
?
--EXPECTF--
bool(false)
bool(true)
object(SplFixedArray)#1 (1) {
[uarray:uSplFixedArray:private]=
array(2) {
[0]=
unicode(3) foo
[1]=
NULL
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_array.c
colder Mon Jul 7 00:02:22 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_array.c
Log:
Avoid a leak on return_value
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.15r2=1.71.2.17.2.16diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.15
php-src/ext/spl/spl_array.c:1.71.2.17.2.16
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.15 Mon Dec 31 07:20:11 2007
+++ php-src/ext/spl/spl_array.c Mon Jul 7 00:02:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.15 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.16 2008/07/07 00:02:22 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1190,9 +1190,9 @@
zend_throw_exception(spl_ce_BadMethodCallException,
Function expects exactly one argument, 0 TSRMLS_CC);
return;
}
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 2, tmp, arg TSRMLS_CC);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 2, tmp, arg TSRMLS_CC);
} else {
- zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value, 1, tmp, NULL TSRMLS_CC);
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
return_value_ptr, 1, tmp, NULL TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.w32
sfoxMon Jul 7 01:13:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar config.w32
Log:
- Fixed config.w32 to keep Elizabeth happy
- NB This whole lot still might disappear, OpenSSL patch review pending
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.3r2=1.27.2.4diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.3
php-src/ext/phar/config.w32:1.27.2.4
--- php-src/ext/phar/config.w32:1.27.2.3Mon Jun 23 19:18:01 2008
+++ php-src/ext/phar/config.w32 Mon Jul 7 01:13:14 2008
@@ -1,12 +1,12 @@
-// $Id: config.w32,v 1.27.2.3 2008/06/23 19:18:01 sfox Exp $
+// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $
// vim:ft=javascript
ARG_ENABLE(phar, disable phar support, yes);
-ARG_ENABLE(phar-ssl, enable phar with native OpenSSL support, no);
+ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);
-if (PHP_PHAR_SSL != no) {
- PHP_PHAR = PHP_PHAR_SSL;
- PHP_PHAR_SHARED = PHP_PHAR_SSL_SHARED;
+if (PHP_PHAR_NATIVE_SSL != no) {
+ PHP_PHAR = PHP_PHAR_NATIVE_SSL;
+ PHP_PHAR_SHARED = PHP_PHAR_NATIVE_SSL_SHARED;
}
if (PHP_PHAR != no) {
@@ -14,9 +14,25 @@
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
- if (PHP_PHAR_SSL != no) {
- ADD_FLAG(LIBS_PHAR, libeay32.lib);
- AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+ if (PHP_PHAR_NATIVE_SSL != no) {
+ if (CHECK_LIB(libeay32st.lib, phar)) {
+ /* We don't really need GDI for this, but there's no
+ way to avoid linking it in the static openssl build */
+ ADD_FLAG(LIBS_PHAR, libeay32st.lib gdi32.lib);
+ if (PHP_DEBUG == no) {
+ /* Silence irrelevant-to-us warning in release
builds */
+ ADD_FLAG(LDFLAGS_PHAR, /IGNORE:4089 );
+ }
+ AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+ STDOUT.WriteLine('Native OpenSSL support in
Phar enabled');
+ } else {
+ WARNING('Could not enable native OpenSSL support in
Phar');
+ }
+ } else {
+ /* If ext/openssl is built-in we can at least use the API
directly */
+ if (PHP_OPENSSL != no !PHP_OPENSSL_SHARED) {
+ AC_DEFINE('PHAR_HAVE_OPENSSL', 1);
+ }
}
ADD_EXTENSION_DEP('phar', 'spl', true);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main .cvsignore config.w32.h
sfoxMon Jul 7 01:16:45 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/main config.w32.h Modified files: /php-src/main .cvsignore Log: - This file is generated from win32/build/config.w32.h.in. It should never have been in CVS in the first place... http://cvs.php.net/viewvc.cgi/php-src/main/.cvsignore?r1=1.10.4.1r2=1.10.4.1.2.1diff_format=u Index: php-src/main/.cvsignore diff -u php-src/main/.cvsignore:1.10.4.1 php-src/main/.cvsignore:1.10.4.1.2.1 --- php-src/main/.cvsignore:1.10.4.1Mon Sep 18 17:22:53 2006 +++ php-src/main/.cvsignore Mon Jul 7 01:16:44 2008 @@ -8,6 +8,7 @@ internal_functions_cli.c php_config.h php_config.h.in +config.w32.h *.lo *.la libs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js
sfoxMon Jul 7 01:23:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 confutils.js
Log:
- Fix up some bits and pieces.
- Always report re2c version.
- Head towards making it possible for all platforms to have compiler info in
phpinfo() output.
- Make it possible to switch off configure summary (--without-summary).
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.20r2=1.40.2.8.2.10.2.21diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.20
php-src/win32/build/config.w32:1.40.2.8.2.10.2.21
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.20 Sun Jul 6 09:55:44 2008
+++ php-src/win32/build/config.w32 Mon Jul 7 01:23:56 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.20 2008/07/06 09:55:44 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.21 2008/07/07 01:23:56 sfox Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -8,7 +8,7 @@
if (!CL) {
ERROR(MS C++ compiler is required);
}
-// Which version of the compiler do we have ?
+
function probe_binary(EXE, what)
{
// tricky escapes to get stderr redirection to work
@@ -30,24 +30,26 @@
return 0;
}
+var VC_VERSIONS = new Array();
+VC_VERSIONS[1200] = 'MSVC6 (Visual C++ 6.0)';
+VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)';
+VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
+VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
+VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
+
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL);
-VCVERS = VCVERS.substr(0, 2) + VCVERS.substr(3, 2);
-STDOUT.WriteLine(Detected MS compiler version + VCVERS);
-
-// 1200 is VC6
-// 1300 is vs.net 2002
-// 1310 is vs.net 2003
-// 1400 is vs.net 2005
-// 1500 is vs.net 2008
+VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+STDOUT.WriteLine( Detected compiler + VC_VERSIONS[VCVERS]);
+AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], Detected compiler version);
// do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64);
if (X64) {
- STDOUT.WriteLine(Detected 64-bit compiler);
+ STDOUT.WriteLine( Detected 64-bit compiler);
} else {
- STDOUT.WriteLine(Detected 32-bit compiler);
+ STDOUT.WriteLine( Detected 32-bit compiler);
}
+AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', Detected compiler
architecture);
// cygwin now ships with link.exe. Avoid searching the cygwin path
// for this, as we want the MS linker, not the fileutil
@@ -64,28 +66,19 @@
// There's a minimum requirement for re2c..
MINRE2C = 0.13.4;
-function probe_re2c_version(RE2C)
-{
- var command = cmd /c + RE2C + -v;
- var version = execute(command + ' 21');
-
- if (version.match(/((\d+)\.(\d+)\.(\d+))/)) {
- return RegExp.$1;
- }
- return 0;
-}
-
RE2C = PATH_PROG('re2c');
if (RE2C) {
var intvers, intmin;
var pattern = /\./g;
- RE2CVERS = probe_re2c_version(RE2C);
+ RE2CVERS = probe_binary(RE2C, version);
+ STDOUT.WriteLine(' Detected re2c version ' + RE2CVERS);
+
intvers = RE2CVERS.replace(pattern, '') - 0;
intmin = MINRE2C.replace(pattern, '') - 0;
if (intvers intmin) {
- STDOUT.WriteLine('WARNING: The minimum RE2C version requirement
is ' + MINRE2C + ', ' + RE2CVERS + ' detected');
+ STDOUT.WriteLine('WARNING: The minimum RE2C version requirement
is ' + MINRE2C);
STDOUT.WriteLine('Parsers will not be generated. Upgrade your
copy at http://sf.net/projects/re2c');
DEFINE('RE2C', '');
} else {
@@ -101,7 +94,9 @@
PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
// Try locating manifest tool
-PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+if (VCVERS 1200) {
+ PATH_PROG('mt', WshShell.Environment(Process).Item(PATH));
+}
// stick objects somewhere outside of the source tree
ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during
build', '');
@@ -389,3 +384,5 @@
}
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
+
+ARG_WITH('summary', 'Skip configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.19r2=1.60.2.1.2.8.2.20diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.19
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.20
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.19 Sat Jul 5 19:53:04 2008
+++ php-src/win32/build/confutils.jsMon Jul 7 01:23:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.19 2008/07/05 19:53:04 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.20 2008/07/07 01:23:56 sfox Exp $
var STDOUT =
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard info.c
sfoxMon Jul 7 01:25:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard info.c
Log:
- Don't do stuff twice over
@Jani: pick up mail!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.8r2=1.249.2.10.2.14.2.9diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.8
php-src/ext/standard/info.c:1.249.2.10.2.14.2.9
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.8 Thu Jul 3 08:06:55 2008
+++ php-src/ext/standard/info.c Mon Jul 7 01:25:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.8 2008/07/03 08:06:55 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.9 2008/07/07 01:25:53 sfox Exp $ */
#include php.h
#include php_ini.h
@@ -48,18 +48,6 @@
ZEND_EXTERN_MODULE_GLOBALS(iconv)
#endif
-#if _MSC_VER = 1500
-# define PHP_WINAPI_COMPILER MSVC9 (2008)
-#elif _MSC_VER = 1400
-# define PHP_WINAPI_COMPILER MSVC8 (2005)
-#elif _MSC_VER = 1310
-# define PHP_WINAPI_COMPILER MSVC7.1 (.NET 2003)
-#elif _MSC_VER = 1300
-# define PHP_WINAPI_COMPILER MSVC7 (.NET 2002)
-#elif _MSC_VER 1300
-# define PHP_WINAPI_COMPILER MSVC6
-#endif
-
#define SECTION(name) if (!sapi_module.phpinfo_as_text) { \
PUTS(h2 name
/h2\n); \
} else { \
@@ -473,15 +461,16 @@
php_info_print_table_start();
php_info_print_table_row(2, System, php_uname );
php_info_print_table_row(2, Build Date, __DATE__ __TIME__
);
+#ifdef COMPILER
+ php_info_print_table_row(2, Compiler, COMPILER);
+#endif
+#ifdef ARCHITECTURE
+ php_info_print_table_row(2, Architecture, ARCHITECTURE);
+#endif
#ifdef CONFIGURE_COMMAND
php_info_print_table_row(2, Configure Command,
CONFIGURE_COMMAND );
#endif
-
-#ifdef PHP_WIN32
- php_info_print_table_row(2, Windows Compiler and Version,
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API,
sapi_module.pretty_name );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
