[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Aug 2 20:34:44 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1704r2=1.1705ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1704 php-src/ChangeLog:1.1705 --- php-src/ChangeLog:1.1704Sun Aug 1 20:33:41 2004 +++ php-src/ChangeLog Mon Aug 2 20:34:43 2004 @@ -1,3 +1,81 @@ +2004-08-02 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_reflection_api.c: + - Add methods to check parameter count + +2004-08-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_0) + ext/sqlite/sqlite.c: + MFH: Allow sqlite_fetch_column_types() to properly handle table names with + spaces in them. + +* ext/sqlite/sqlite.c: + Allow sqlite_fetch_column_types() to properly handle table names with + spaces in them. + +2004-08-02 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_0) + ZendEngine2/zend_compile.c: + MFH Change to use memcmp instead of strcmp + +* ZendEngine2/zend_compile.c: + - Change to use memcmp instead of strcmp + +2004-08-02 Wez Furlong [EMAIL PROTECTED] + +* ext/com_dotnet/com_dotnet.c: + Better error reporting + +2004-08-02 Andi Gutmans [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + - Fix typo + +2004-08-02 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_scanner.l: + - Remove all for now + +* tests/classes/__call_002.phpt + tests/classes/__set__get_002.phpt + tests/classes/__set__get_003.phpt + tests/classes/destructor_visibility_001.phpt + tests/classes/destructor_visibility_002.phpt + tests/classes/destructor_visibility_003.phpt: + MFB Enforce protocol of magic methods/classes + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_execute_API.c + ext/mbstring/tests/htmlent.phpt + tests/classes/ctor_failure.phpt: + MFB: Enforce protocol on magic methods/functions + +2004-08-02 Sascha Schumann [EMAIL PROTECTED] + +* ext/session/session.c: + fix empty_string issue + + Patch submitted by Antony Dovgal [EMAIL PROTECTED] + +* ext/session/mod_files.c: + don't read empty files + + 0 malloc noticed by Antony Dovgal [EMAIL PROTECTED] + +2004-08-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + Zend/zend_execute.c + ZendEngine2/zend_execute.c: + MFH: A gentler (performance wise) allocation of buffer for temp variables. + +* ZendEngine2/zend_execute.c: + A gentler (performance wise) allocation of buffer for temp variables. + 2004-08-01 Marcus Boerger [EMAIL PROTECTED] * tests/classes/__call_002.phpt @@ -7590,7 +7668,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1704 2004/08/02 00:33:41 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1705 2004/08/03 00:34:43 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Aug 2 20:34:47 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.515r2=1.516ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.515 ZendEngine2/ChangeLog:1.516 --- ZendEngine2/ChangeLog:1.515 Sun Aug 1 20:33:46 2004 +++ ZendEngine2/ChangeLog Mon Aug 2 20:34:47 2004 @@ -1,3 +1,40 @@ +2004-08-02 Marcus Boerger [EMAIL PROTECTED] + +* zend_reflection_api.c: + - Add methods to check parameter count + +* (PHP_5_0) + zend_compile.c: + MFH Change to use memcmp instead of strcmp + +* zend_compile.c: + - Change to use memcmp instead of strcmp + +2004-08-02 Andi Gutmans [EMAIL PROTECTED] + +* zend_compile.c: + - Fix typo + +2004-08-02 Marcus Boerger [EMAIL PROTECTED] + +* zend_language_parser.y + zend_language_scanner.l: + - Remove all for now + +* zend_compile.c + zend_compile.h + zend_execute_API.c: + MFB: Enforce protocol on magic methods/functions + +2004-08-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_0) + zend_execute.c: + MFH: A gentler (performance wise) allocation of buffer for temp variables. + +* zend_execute.c: + A gentler (performance wise) allocation of buffer for temp variables. + 2004-08-01 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_0) @@ -5196,7 +5233,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.515 2004/08/02 00:33:46 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.516 2004/08/03 00:34:47 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -6920,7 +6957,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.515 2004/08/02 00:33:46 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.516 2004/08/03 00:34:47 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/session mod_files.c
sas Mon Aug 2 04:27:24 2004 EDT
Modified files:
/php-src/ext/sessionmod_files.c
Log:
don't read empty files
0 malloc noticed by Antony Dovgal [EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/ext/session/mod_files.c?r1=1.95r2=1.96ty=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.95 php-src/ext/session/mod_files.c:1.96
--- php-src/ext/session/mod_files.c:1.95Mon Mar 29 16:44:07 2004
+++ php-src/ext/session/mod_files.c Mon Aug 2 04:27:24 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_files.c,v 1.95 2004/03/29 21:44:07 wez Exp $ */
+/* $Id: mod_files.c,v 1.96 2004/08/02 08:27:24 sas Exp $ */
#include php.h
@@ -320,6 +320,12 @@
return FAILURE;
data-st_size = *vallen = sbuf.st_size;
+
+ if (sbuf.st_size == 0) {
+ *val = STR_EMPTY_ALLOC();
+ return SUCCESS;
+ }
+
*val = emalloc(sbuf.st_size);
#if defined(HAVE_PREAD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
sas Mon Aug 2 04:27:46 2004 EDT
Modified files:
/php-src/ext/sessionsession.c
Log:
fix empty_string issue
Patch submitted by Antony Dovgal [EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.392r2=1.393ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.392 php-src/ext/session/session.c:1.393
--- php-src/ext/session/session.c:1.392 Mon Jul 19 03:19:43 2004
+++ php-src/ext/session/session.c Mon Aug 2 04:27:46 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.392 2004/07/19 07:19:43 andi Exp $ */
+/* $Id: session.c,v 1.393 2004/08/02 08:27:46 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1060,7 +1060,7 @@
smart_str_0(var);
REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
} else {
- REGISTER_STRINGL_CONSTANT(SID, , 0, 1);
+ REGISTER_STRINGL_CONSTANT(SID, STR_EMPTY_ALLOC(), 0, 1);
}
if (PS(apply_trans_sid)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/tests htmlent.phpt /tests/classes ctor_failure.phpt ZendEngine2 zend_compile.c zend_compile.h zend_execute_API.c
helly Mon Aug 2 04:27:58 2004 EDT
Modified files:
/ZendEngine2zend_compile.c zend_compile.h zend_execute_API.c
/php-src/ext/mbstring/tests htmlent.phpt
/php-src/tests/classes ctor_failure.phpt
Log:
MFB: Enforce protocol on magic methods/functions
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.c?r1=1.571r2=1.572ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.571 ZendEngine2/zend_compile.c:1.572
--- ZendEngine2/zend_compile.c:1.571Thu Jul 29 13:45:29 2004
+++ ZendEngine2/zend_compile.c Mon Aug 2 04:27:57 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.c,v 1.571 2004/07/29 17:45:29 pollita Exp $ */
+/* $Id: zend_compile.c,v 1.572 2004/08/02 08:27:57 helly Exp $ */
#include zend_language_parser.h
#include zend.h
@@ -1089,16 +1089,37 @@
void zend_do_end_function_declaration(znode *function_token TSRMLS_DC)
{
+ char lcname[16];
+ int name_len;
+
zend_do_extended_info(TSRMLS_C);
zend_do_return(NULL, 0 TSRMLS_CC);
zend_do_handle_exception(TSRMLS_C);
pass_two(CG(active_op_array) TSRMLS_CC);
- if (CG(active_class_entry)
-!strcmp(CG(active_op_array)-function_name, ZEND_CLONE_FUNC_NAME)
-CG(active_op_array)-num_args != 0) {
- zend_error(E_COMPILE_ERROR, The clone method cannot accept any
arguments);
+ /* we don't care if the function name is longer, in fact lowercasing only
+* the beginning of the name speeds up th echeck process */
+ name_len = strlen(CG(active_op_array)-function_name);
+ zend_str_tolower_copy(lcname, CG(active_op_array)-function_name,
MIN(name_len, sizeof(lcname)-1));
+ lcname[sizeof(lcname)-1] = '\0'; // zend_str_tolower_copy won't necessarily
set the zero byte
+
+ if (CG(active_class_entry)) {
+ if (name_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME) - 1
!strcmp(lcname, ZEND_DESTRUCTOR_FUNC_NAME) CG(active_op_array)-num_args != 0) {
+ zend_error(E_COMPILE_ERROR, Destuctor %s::%s() cannot take
arguments, CG(active_class_entry)-name, ZEND_DESTRUCTOR_FUNC_NAME);
+ } else if (name_len == sizeof(ZEND_CLONE_FUNC_NAME) - 1
!strcmp(lcname, ZEND_CLONE_FUNC_NAME) CG(active_op_array)-num_args != 0) {
+ zend_error(E_COMPILE_ERROR, Method %s::%s() cannot accept any
arguments, CG(active_class_entry)-name, ZEND_CLONE_FUNC_NAME);
+ } else if (name_len == sizeof(ZEND_GET_FUNC_NAME) - 1
!strcmp(lcname, ZEND_GET_FUNC_NAME) CG(active_op_array)-num_args != 1) {
+ zend_error(E_COMPILE_ERROR, Method %s::%s() must take exactly
1 argument, CG(active_class_entry)-name, ZEND_GET_FUNC_NAME);
+ } else if (name_len == sizeof(ZEND_SET_FUNC_NAME) - 1
!strcmp(lcname, ZEND_SET_FUNC_NAME) CG(active_op_array)-num_args != 2) {
+ zend_error(E_COMPILE_ERROR, Method %s::%s() must take exactly
2 arguments, CG(active_class_entry)-name, ZEND_SET_FUNC_NAME);
+ } else if (name_len == sizeof(ZEND_CALL_FUNC_NAME) - 1
!strcmp(lcname, ZEND_CALL_FUNC_NAME) CG(active_op_array)-num_args != 2) {
+ zend_error(E_COMPILE_ERROR, Method %s::%s() must take exactly
2 arguments, CG(active_class_entry)-name, ZEND_CALL_FUNC_NAME);
+ }
+ } else {
+ if (name_len == sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1 !strcmp(lcname,
ZEND_AUTOLOAD_FUNC_NAME) CG(active_op_array)-num_args != 1) {
+ zend_error(E_COMPILE_ERROR, %s() must take exactly 1
argument, ZEND_AUTOLOAD_FUNC_NAME);
+ }
}
CG(active_op_array)-line_end = zend_get_compiled_lineno(TSRMLS_C);
@@ -1116,10 +1137,6 @@
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
zend_arg_info *cur_arg_info;
- if (CG(active_class_entry) CG(active_class_entry)-destructor ==
(zend_function *) CG(active_op_array))
- {
- zend_error(E_COMPILE_ERROR, Destuctor %s::%s() cannot take
arguments, CG(active_class_entry)-name, CG(active_op_array)-function_name);
- }
CG(active_op_array)-num_args++;
opline-opcode = op;
opline-result = *var;
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.h?r1=1.286r2=1.287ty=u
Index: ZendEngine2/zend_compile.h
diff -u ZendEngine2/zend_compile.h:1.286 ZendEngine2/zend_compile.h:1.287
--- ZendEngine2/zend_compile.h:1.286Thu Jul 29 13:45:29 2004
+++ ZendEngine2/zend_compile.h Mon Aug 2 04:27:57 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.h,v 1.286 2004/07/29 17:45:29 pollita Exp $ */
+/* $Id: zend_compile.h,v 1.287 2004/08/02 08:27:57 helly Exp $ */
#ifndef ZEND_COMPILE_H
#define ZEND_COMPILE_H
@@ -840,6
[PHP-CVS] cvs: php-src /tests/classes __call_002.phpt __set__get_002.phpt __set__get_003.phpt destructor_visibility_001.phpt destructor_visibility_002.phpt destructor_visibility_003.phpt
helly Mon Aug 2 04:30:00 2004 EDT
Modified files:
/php-src/tests/classes __call_002.phpt __set__get_002.phpt
__set__get_003.phpt
destructor_visibility_001.phpt
destructor_visibility_002.phpt
destructor_visibility_003.phpt
Log:
MFB Enforce protocol of magic methods/classes
http://cvs.php.net/diff.php/php-src/tests/classes/__call_002.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/__call_002.phpt
diff -u /dev/null php-src/tests/classes/__call_002.phpt:1.2
--- /dev/null Mon Aug 2 04:29:59 2004
+++ php-src/tests/classes/__call_002.phpt Mon Aug 2 04:29:59 2004
@@ -0,0 +1,15 @@
+--TEST--
+ZE2 __call() signature check
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+
+class Test {
+ function __call() {
+ }
+}
+
+?
+--EXPECTF--
+Fatal error: Method Test::__call() must take exactly 2 arguments in %s__call_002.php
on line %d
http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_002.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/__set__get_002.phpt
diff -u /dev/null php-src/tests/classes/__set__get_002.phpt:1.2
--- /dev/null Mon Aug 2 04:29:59 2004
+++ php-src/tests/classes/__set__get_002.phpt Mon Aug 2 04:29:59 2004
@@ -0,0 +1,14 @@
+--TEST--
+ZE2 __get() signature check
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+class Test {
+ function __get($x,$y) {
+ }
+}
+
+?
+--EXPECTF--
+Fatal error: Method Test::__get() must take exactly 1 argument in
%s__set__get_002.php on line %d
http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_003.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/__set__get_003.phpt
diff -u /dev/null php-src/tests/classes/__set__get_003.phpt:1.2
--- /dev/null Mon Aug 2 04:29:59 2004
+++ php-src/tests/classes/__set__get_003.phpt Mon Aug 2 04:29:59 2004
@@ -0,0 +1,14 @@
+--TEST--
+ZE2 __set() signature check
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+class Test {
+ function __set() {
+ }
+}
+
+?
+--EXPECTF--
+Fatal error: Method Test::__set() must take exactly 2 arguments in
%s__set__get_003.php on line %d
http://cvs.php.net/diff.php/php-src/tests/classes/destructor_visibility_001.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/destructor_visibility_001.phpt
diff -u /dev/null php-src/tests/classes/destructor_visibility_001.phpt:1.2
--- /dev/null Mon Aug 2 04:30:00 2004
+++ php-src/tests/classes/destructor_visibility_001.phptMon Aug 2 04:29:59
2004
@@ -0,0 +1,24 @@
+--TEST--
+ZE2 Ensuring destructor visibility
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+
+class Base {
+ private function __destruct() {
+ echo __METHOD__ . \n;
+ }
+}
+
+class Derived extends Base {
+}
+
+$obj = new Derived;
+
+unset($obj);
+
+?
+===DONE===
+--EXPECTF--
+Fatal error: Call to private Derived::__destruct() from context '' in
%sdestructor_visibility_001.php on line %d
http://cvs.php.net/diff.php/php-src/tests/classes/destructor_visibility_002.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/destructor_visibility_002.phpt
diff -u /dev/null php-src/tests/classes/destructor_visibility_002.phpt:1.2
--- /dev/null Mon Aug 2 04:30:00 2004
+++ php-src/tests/classes/destructor_visibility_002.phptMon Aug 2 04:29:59
2004
@@ -0,0 +1,24 @@
+--TEST--
+ZE2 Ensuring destructor visibility
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+
+class Base {
+ private function __destruct() {
+ echo __METHOD__ . \n;
+ }
+}
+
+class Derived extends Base {
+}
+
+$obj = new Derived;
+
+?
+===DONE===
+--EXPECTF--
+===DONE===
+
+Warning: Call to private Derived::__destruct() from context '' during shutdown
ignored in Unknown on line %d
http://cvs.php.net/diff.php/php-src/tests/classes/destructor_visibility_003.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/destructor_visibility_003.phpt
diff -u /dev/null php-src/tests/classes/destructor_visibility_003.phpt:1.2
--- /dev/null Mon Aug 2 04:30:00 2004
+++ php-src/tests/classes/destructor_visibility_003.phptMon Aug 2 04:29:59
2004
@@ -0,0 +1,28 @@
+--TEST--
+ZE2 Ensuring destructor visibility
+--SKIPIF--
+?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
+--FILE--
+?php
+
+class Base {
+ private function __destruct() {
+ echo __METHOD__ . \n;
+ }
+}
+
+class Derived extends Base {
+ public function __destruct() {
+ echo __METHOD__ . \n;
+ }
+}
+
+$obj = new Derived;
+
Re: [PHP-CVS] cvs: php-src /sapi/activescript CREDITS EXPERIMENTAL README classfactory.cpp config.w32 marshal.cpp php5activescript.c php5activescript.def php5activescript.dsp php5activescript.h php5as_cla
On Wed, 28 Jul 2004, Wez Furlong wrote: wez Wed Jul 28 08:35:53 2004 EDT Removed files: /php-src/sapi/activescriptCREDITS EXPERIMENTAL README classfactory.cpp config.w32 marshal.cpp php5activescript.c php5activescript.def php5activescript.dsp php5activescript.h php5as_classfactory.h php5as_scriptengine.h scriptengine.cpp Log: Move activescript sapi to PECL How does this work on Unix now? pear install activescript is working? regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/activescript CREDITS EXPERIMENTAL README classfactory.cpp config.w32 marshal.cpp php5activescript.c php5activescript.def php5activescript.dsp php5activescript.h php5as_cla
On Monday 02 August 2004 11:24, Derick Rethans wrote: On Wed, 28 Jul 2004, Wez Furlong wrote: Move activescript sapi to PECL How does this work on Unix now? pear install activescript is working? What makes you think it works on Unix? Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/activescript CREDITS EXPERIMENTAL README classfactory.cpp config.w32 marshal.cpp php5activescript.c php5activescript.def php5activescript.dsp php5activescript.h php5as
On Mon, 2 Aug 2004, Edin Kadribasic wrote: On Monday 02 August 2004 11:24, Derick Rethans wrote: On Wed, 28 Jul 2004, Wez Furlong wrote: Move activescript sapi to PECL How does this work on Unix now? pear install activescript is working? What makes you think it works on Unix? Hehe, I was thinking of the SAPI install through PECL, but that of course makes little sense for a winblows-only SAPI ;-) regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Mon Aug 2 06:04:42 2004 EDT Modified files: /CVSROOTavail Log: - Upgrade tony2001 http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.893r2=1.894ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.893 CVSROOT/avail:1.894 --- CVSROOT/avail:1.893 Mon Jul 26 19:28:28 2004 +++ CVSROOT/avail Mon Aug 2 06:04:41 2004 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh # The Livedocs developers @@ -29,7 +29,7 @@ # The PHP Documentation Group maintains the documentation and its # translations.
[PHP-CVS] cvs: php-src /win32/build wsyslog.mc
fmk Mon Aug 2 13:45:55 2004 EDT Modified files: /php-src/win32/buildwsyslog.mc Log: Fix line endings http://cvs.php.net/diff.php/php-src/win32/build/wsyslog.mc?r1=1.1r2=1.2ty=u Index: php-src/win32/build/wsyslog.mc diff -u php-src/win32/build/wsyslog.mc:1.1 php-src/win32/build/wsyslog.mc:1.2 --- php-src/win32/build/wsyslog.mc:1.1 Sat Jul 31 19:59:46 2004 +++ php-src/win32/build/wsyslog.mc Mon Aug 2 13:45:54 2004 @@ -1,28 +1,28 @@ -MessageId=1 -Severity=Success -SymbolicName=PHP_SYSLOG_SUCCESS_TYPE -Language=English -%1 %2 -. - -MessageId=2 -Severity=Informational -SymbolicName=PHP_SYSLOG_INFO_TYPE -Language=English -%1 %2 -. - -MessageId=3 -Severity=Warning -SymbolicName=PHP_SYSLOG_WARNING_TYPE -Language=English -%1 %2 -. - -MessageId=4 -Severity=Error -SymbolicName=PHP_SYSLOG_ERROR_TYPE -Language=English -%1 %2 -. - +MessageId=1 +Severity=Success +SymbolicName=PHP_SYSLOG_SUCCESS_TYPE +Language=English +%1 %2 +. + +MessageId=2 +Severity=Informational +SymbolicName=PHP_SYSLOG_INFO_TYPE +Language=English +%1 %2 +. + +MessageId=3 +Severity=Warning +SymbolicName=PHP_SYSLOG_WARNING_TYPE +Language=English +%1 %2 +. + +MessageId=4 +Severity=Error +SymbolicName=PHP_SYSLOG_ERROR_TYPE +Language=English +%1 %2 +. + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Aug 2 13:54:50 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Search in PATH before explicit_path. This resolves conflict between Microsoft and
cygwin tools with the same name.
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.42r2=1.43ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.42 php-src/win32/build/confutils.js:1.43
--- php-src/win32/build/confutils.js:1.42 Wed Jul 7 08:25:10 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 13:54:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.42 2004/07/07 12:25:10 edink Exp $
+// $Id: confutils.js,v 1.43 2004/08/02 17:54:49 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -456,7 +456,20 @@
thing_to_find = thing_to_find.replace(new RegExp(/, g), \\);
- if (explicit_path != null) {
+ if (env_name != null) {
+ env = WshShell.Environment(Process).Item(env_name);
+ env = env.split(;);
+ for (i = 0; i env.length; i++) {
+ file = glob(env[i] + \\ + thing_to_find);
+ if (file) {
+ found = true;
+ place = true;
+ break;
+ }
+ }
+ }
+
+ if (!found explicit_path != null) {
if (typeof(explicit_path) == string) {
explicit_path = explicit_path.split(;);
}
@@ -467,19 +480,6 @@
found = true;
place = file[0];
place = place.substr(0, place.length -
thing_to_find.length - 1);
- break;
- }
- }
- }
-
- if (!found env_name != null) {
- env = WshShell.Environment(Process).Item(env_name);
- env = env.split(;);
- for (i = 0; i env.length; i++) {
- file = glob(env[i] + \\ + thing_to_find);
- if (file) {
- found = true;
- place = true;
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_dotnet.c
wez Mon Aug 2 14:02:48 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_dotnet.c
Log:
Better error reporting
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_dotnet.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/com_dotnet/com_dotnet.c
diff -u php-src/ext/com_dotnet/com_dotnet.c:1.7 php-src/ext/com_dotnet/com_dotnet.c:1.8
--- php-src/ext/com_dotnet/com_dotnet.c:1.7 Wed Jun 16 19:57:25 2004
+++ php-src/ext/com_dotnet/com_dotnet.c Mon Aug 2 14:02:48 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_dotnet.c,v 1.7 2004/06/16 23:57:25 abies Exp $ */
+/* $Id: com_dotnet.c,v 1.8 2004/08/02 18:02:48 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -152,7 +152,8 @@
SUCCEEDED(IUnknown_QueryInterface(V_UNKNOWN(retval),
IID_IObjectHandle, handle))) {
VARIANT unwrapped;
- if (SUCCEEDED(IObjectHandle_Unwrap(handle, unwrapped))) {
+ hr = IObjectHandle_Unwrap(handle, unwrapped);
+ if (SUCCEEDED(hr)) {
/* unwrapped is now the dispatch pointer we want */
V_DISPATCH(obj-v) = V_DISPATCH(unwrapped);
V_VT(obj-v) = VT_DISPATCH;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
fmk Mon Aug 2 14:48:50 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
VC6 hack to avoid CONFIGURE_COMMAND string length over 2048 when building many
extensions
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.43r2=1.44ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.43 php-src/win32/build/confutils.js:1.44
--- php-src/win32/build/confutils.js:1.43 Mon Aug 2 13:54:49 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 14:48:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.43 2004/08/02 17:54:49 fmk Exp $
+// $Id: confutils.js,v 1.44 2004/08/02 18:48:49 fmk Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -256,7 +256,9 @@
args = WScript.Arguments;
for (i = 0; i args.length; i++) {
arg = args(i);
- nice += ' ' + arg + '';
+ if (nice.length + arg.length 2045) { // The max string length for
CONFIGURE_COMMAND is 2048 in VC6
+ nice += ' ' + arg + '';
+ }
if (arg == --help) {
configure_help_mode = true;
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
iliaa Mon Aug 2 18:43:41 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Allow sqlite_fetch_column_types() to properly handle table names with
spaces in them.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.147r2=1.148ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.147 php-src/ext/sqlite/sqlite.c:1.148
--- php-src/ext/sqlite/sqlite.c:1.147 Tue Jul 27 12:40:43 2004
+++ php-src/ext/sqlite/sqlite.c Mon Aug 2 18:43:40 2004
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.147 2004/07/27 16:40:43 iliaa Exp $
+ $Id: sqlite.c,v 1.148 2004/08/02 22:43:40 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1071,7 +1071,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.147 2004/07/27 16:40:43 iliaa Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.148 2004/08/02 22:43:40 iliaa Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1597,7 +1597,7 @@
DB_FROM_ZVAL(db, zdb);
}
- if (!(sql = sqlite_mprintf(SELECT * FROM %q LIMIT 1, tbl))) {
+ if (!(sql = sqlite_mprintf(SELECT * FROM '%q' LIMIT 1, tbl))) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/sqlite sqlite.c
iliaa Mon Aug 2 18:43:42 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/sqlite sqlite.c
Log:
MFH: Allow sqlite_fetch_column_types() to properly handle table names with
spaces in them.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.1r2=1.146.2.2ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.146.2.1 php-src/ext/sqlite/sqlite.c:1.146.2.2
--- php-src/ext/sqlite/sqlite.c:1.146.2.1 Tue Jul 27 12:40:46 2004
+++ php-src/ext/sqlite/sqlite.c Mon Aug 2 18:43:42 2004
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.146.2.1 2004/07/27 16:40:46 iliaa Exp $
+ $Id: sqlite.c,v 1.146.2.2 2004/08/02 22:43:42 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1071,7 +1071,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.146.2.1 2004/07/27 16:40:46 iliaa Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.146.2.2 2004/08/02 22:43:42 iliaa Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1597,7 +1597,7 @@
DB_FROM_ZVAL(db, zdb);
}
- if (!(sql = sqlite_mprintf(SELECT * FROM %q LIMIT 1, tbl))) {
+ if (!(sql = sqlite_mprintf(SELECT * FROM '%q' LIMIT 1, tbl))) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/reflection parameters_001.phpt
helly Mon Aug 2 18:59:58 2004 EDT
Added files:
/php-src/tests/reflection parameters_001.phpt
Log:
Add test
http://cvs.php.net/co.php/php-src/tests/reflection/parameters_001.phpt?r=1.1p=1
Index: php-src/tests/reflection/parameters_001.phpt
+++ php-src/tests/reflection/parameters_001.phpt
--TEST--
invoke with non object or null value
--FILE--
?php
class Test {
function func($x, $y = NULL){
}
}
$f = new ReflectionMethod('Test', 'func');
$p = new ReflectionParameter(array('Test', 'func'), 'x');
var_dump($p-isOptional());
$p = new ReflectionParameter(array('Test', 'func'), 'y');
var_dump($p-isOptional());
try {
$p = new ReflectionParameter(array('Test', 'func'), 'z');
var_dump($p-isOptional());
}
catch (Exception $e) {
var_dump($e-getMessage());
}
?
===DONE===
--EXPECT--
bool(false)
bool(true)
string(54) The parameter specified by its name could not be found
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/reflection parameters_001.phpt
helly Mon Aug 2 19:00:35 2004 EDT Modified files: /php-src/tests/reflection parameters_001.phpt Log: Correct test name http://cvs.php.net/diff.php/php-src/tests/reflection/parameters_001.phpt?r1=1.1r2=1.2ty=u Index: php-src/tests/reflection/parameters_001.phpt diff -u php-src/tests/reflection/parameters_001.phpt:1.1 php-src/tests/reflection/parameters_001.phpt:1.2 --- php-src/tests/reflection/parameters_001.phpt:1.1Mon Aug 2 18:59:58 2004 +++ php-src/tests/reflection/parameters_001.phptMon Aug 2 19:00:35 2004 @@ -1,5 +1,5 @@ --TEST-- -invoke with non object or null value +Check for parameter being optional --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/reflection parameters_001.phpt
helly Mon Aug 2 19:10:53 2004 EDT
Modified files:
/php-src/tests/reflection parameters_001.phpt
Log:
- Expand to test number of parameters
http://cvs.php.net/diff.php/php-src/tests/reflection/parameters_001.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/reflection/parameters_001.phpt
diff -u php-src/tests/reflection/parameters_001.phpt:1.2
php-src/tests/reflection/parameters_001.phpt:1.3
--- php-src/tests/reflection/parameters_001.phpt:1.2Mon Aug 2 19:00:35 2004
+++ php-src/tests/reflection/parameters_001.phptMon Aug 2 19:10:53 2004
@@ -10,6 +10,8 @@
$f = new ReflectionMethod('Test', 'func');
+var_dump($f-getNumberOfParameters());
+var_dump($f-getNumberOfRequiredParameters());
$p = new ReflectionParameter(array('Test', 'func'), 'x');
var_dump($p-isOptional());
@@ -28,6 +30,8 @@
?
===DONE===
--EXPECT--
+int(2)
+int(1)
bool(false)
bool(true)
string(54) The parameter specified by its name could not be found
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Mon Aug 2 20:02:49 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
A better fix for the VC 2k max literal string limit
(also affects vc7)
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.44r2=1.45ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.44 php-src/win32/build/confutils.js:1.45
--- php-src/win32/build/confutils.js:1.44 Mon Aug 2 14:48:49 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 20:02:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.44 2004/08/02 18:48:49 fmk Exp $
+// $Id: confutils.js,v 1.45 2004/08/03 00:02:48 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -256,9 +256,7 @@
args = WScript.Arguments;
for (i = 0; i args.length; i++) {
arg = args(i);
- if (nice.length + arg.length 2045) { // The max string length for
CONFIGURE_COMMAND is 2048 in VC6
- nice += ' ' + arg + '';
- }
+ nice += ' ' + arg + '';
if (arg == --help) {
configure_help_mode = true;
break;
@@ -1212,8 +1210,9 @@
outfile.Write(indata);
var keys = (new VBArray(configure_hdr.Keys())).toArray();
- var i;
+ var i, j;
var item;
+ var pieces, stuff_to_crack, chunk;
outfile.WriteBlankLines(1);
outfile.WriteLine(/* values determined by configure.js */);
@@ -1222,7 +1221,29 @@
item = configure_hdr.Item(keys[i]);
outfile.WriteBlankLines(1);
outfile.WriteLine(/* + item[1] + */);
- outfile.WriteLine(#define + keys[i] + + item[0]);
+ pieces = item[0];
+
+ if (typeof(pieces) == string pieces.charCodeAt(0) == 34) {
+ /* quoted string have a maximal length of 2k under vc.
+* solution is to crack them and let the compiler concat
+* them implicitly */
+ stuff_to_crack = pieces;
+ pieces = ;
+
+ while (stuff_to_crack.length) {
+ j = 65;
+ while (stuff_to_crack.charCodeAt(j) != 32 j
stuff_to_crack.length)
+ j++;
+
+ chunk = stuff_to_crack.substr(0, j);
+ pieces += chunk;
+ stuff_to_crack = stuff_to_crack.substr(chunk.length);
+ if (stuff_to_crack.length)
+ pieces += ' ';
+ }
+ }
+
+ outfile.WriteLine(#define + keys[i] + + pieces);
}
outfile.Close();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming config.w32
wez Mon Aug 2 20:47:56 2004 EDT
Modified files:
/php-src/ext/ming config.w32
Log:
Avoid possible exception
http://cvs.php.net/diff.php/php-src/ext/ming/config.w32?r1=1.2r2=1.3ty=u
Index: php-src/ext/ming/config.w32
diff -u php-src/ext/ming/config.w32:1.2 php-src/ext/ming/config.w32:1.3
--- php-src/ext/ming/config.w32:1.2 Thu Mar 11 13:48:26 2004
+++ php-src/ext/ming/config.w32 Mon Aug 2 20:47:56 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2004/03/11 18:48:26 fmk Exp $
+// $Id: config.w32,v 1.3 2004/08/03 00:47:56 wez Exp $
// vim:ft=javascript
ARG_WITH(ming, MING support, no);
@@ -15,7 +15,7 @@
}
c = file_get_contents(ming_h + \\ming.h);
- if (c.match(/MING_VERSION\s+(0.[a-zA-Z0-9]+)/)) {
+ if (typeof(c) == string c.match(/MING_VERSION\s+(0.[a-zA-Z0-9]+)/)) {
v = RegExp.$1;
if (v 0.2) {
if (CHECK_LIB(libungif.lib, ming, PHP_MING)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
wez Mon Aug 2 20:58:29 2004 EDT
Modified files:
/php-src/win32/buildconfutils.js
Log:
Revert the search path tweak; it broke the snap build for ming
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.45r2=1.46ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.45 php-src/win32/build/confutils.js:1.46
--- php-src/win32/build/confutils.js:1.45 Mon Aug 2 20:02:48 2004
+++ php-src/win32/build/confutils.jsMon Aug 2 20:58:29 2004
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.45 2004/08/03 00:02:48 wez Exp $
+// $Id: confutils.js,v 1.46 2004/08/03 00:58:29 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -456,20 +456,7 @@
thing_to_find = thing_to_find.replace(new RegExp(/, g), \\);
- if (env_name != null) {
- env = WshShell.Environment(Process).Item(env_name);
- env = env.split(;);
- for (i = 0; i env.length; i++) {
- file = glob(env[i] + \\ + thing_to_find);
- if (file) {
- found = true;
- place = true;
- break;
- }
- }
- }
-
- if (!found explicit_path != null) {
+ if (explicit_path != null) {
if (typeof(explicit_path) == string) {
explicit_path = explicit_path.split(;);
}
@@ -480,6 +467,19 @@
found = true;
place = file[0];
place = place.substr(0, place.length -
thing_to_find.length - 1);
+ break;
+ }
+ }
+ }
+
+ if (!found env_name != null) {
+ env = WshShell.Environment(Process).Item(env_name);
+ env = env.split(;);
+ for (i = 0; i env.length; i++) {
+ file = glob(env[i] + \\ + thing_to_find);
+ if (file) {
+ found = true;
+ place = true;
break;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
wez Mon Aug 2 21:03:32 2004 EDT
Modified files:
/php-src/win32/buildconfig.w32
Log:
Explicitly check PATH before cygwin for mc.exe, as we want MS message compiler,
not GNU Midnight Commander.
http://cvs.php.net/diff.php/php-src/win32/build/config.w32?r1=1.29r2=1.30ty=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.29 php-src/win32/build/config.w32:1.30
--- php-src/win32/build/config.w32:1.29 Sat Jul 31 20:29:50 2004
+++ php-src/win32/build/config.w32 Mon Aug 2 21:03:32 2004
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.29 2004/08/01 00:29:50 wez Exp $
+// $Id: config.w32,v 1.30 2004/08/03 01:03:32 wez Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -16,7 +16,7 @@
PATH_PROG('re2c');
PATH_PROG('zip');
PATH_PROG('lemon');
-PATH_PROG('mc');
+PATH_PROG('mc', WshShell.Environment(Process).Item(PATH));
ARG_ENABLE('debug', 'Compile with debugging symbols', no);
ARG_ENABLE('zts', 'Thread safety', 'yes');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build buildconf.js
wez Mon Aug 2 21:23:35 2004 EDT
Modified files:
/php-src/win32/buildbuildconf.js
Log:
Catch exceptions from broken config.w32 files
http://cvs.php.net/diff.php/php-src/win32/build/buildconf.js?r1=1.11r2=1.12ty=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.11 php-src/win32/build/buildconf.js:1.12
--- php-src/win32/build/buildconf.js:1.11 Thu Feb 12 07:30:41 2004
+++ php-src/win32/build/buildconf.jsMon Aug 2 21:23:35 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: buildconf.js,v 1.11 2004/02/12 12:30:41 wez Exp $ */
+/* $Id: buildconf.js,v 1.12 2004/08/03 01:23:35 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
@@ -209,7 +209,11 @@
calls = modules.match(re);
for (i = 0; i calls.length; i++) {
item = calls[i];
+ C.WriteLine(try {);
C.WriteLine(item);
+ C.WriteLine(} catch (e) {);
+ C.WriteLine('\tSTDOUT.WriteLine(problem: + e);');
+ C.WriteLine(});
}
C.WriteBlankLines(1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mime_magic mime_magic.c
fmk Tue Aug 3 00:15:35 2004 EDT Modified files: /php-src/ext/mime_magic mime_magic.c Log: sys/stat.h is includes in php_streams.h no need to do that again. http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.37r2=1.38ty=u Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.37 php-src/ext/mime_magic/mime_magic.c:1.38 --- php-src/ext/mime_magic/mime_magic.c:1.37Fri Jan 16 06:15:13 2004 +++ php-src/ext/mime_magic/mime_magic.c Tue Aug 3 00:15:34 2004 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe [EMAIL PROTECTED] | +--+ - $Id: mime_magic.c,v 1.37 2004/01/16 11:15:13 sniper Exp $ + $Id: mime_magic.c,v 1.38 2004/08/03 04:15:34 fmk Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -160,7 +160,6 @@ #include fcntl.h #include sys/types.h -#include sys/stat.h #ifdef HAVE_UNISTD_H #include unistd.h #endif -- 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) /pear go-pear.bat
cellog Tue Aug 3 00:31:59 2004 EDT Added files: (Branch: PHP_4_3) /php-src/pear go-pear.bat Log: commit for win32 - binary so line endings are always preserved http://cvs.php.net/co.php/php-src/pear/go-pear.bat?r=1.1p=1 Index: php-src/pear/go-pear.bat +++ php-src/pear/go-pear.bat -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /pear go-pear.bat
cellog Tue Aug 3 00:36:00 2004 EDT Modified files: /php-src/pear go-pear.bat Log: commit for win32 - binary so line endings are always preserved - this time on HEAD, where it belongs http://cvs.php.net/diff.php/php-src/pear/go-pear.bat?r1=1.1r2=1.2ty=u Index: php-src/pear/go-pear.bat diff -u /dev/null php-src/pear/go-pear.bat:1.2 --- /dev/null Tue Aug 3 00:36:00 2004 +++ php-src/pear/go-pear.batTue Aug 3 00:36:00 2004 @@ -0,0 +1,4 @@ [EMAIL PROTECTED] OFF +set PHP_BIN=php.exe +%PHP_BIN% -n -d output_buffering=0 PEAR\go-pear.php +pause -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /pear go-pear.bat
cellog Tue Aug 3 00:36:56 2004 EDT Added files: (Branch: PHP_5_0) /php-src/pear go-pear.bat Log: commit for win32 - binary so line endings are always preserved - ..and in PHP_5_0, where it also belongs http://cvs.php.net/co.php/php-src/pear/go-pear.bat?r=1.1p=1 Index: php-src/pear/go-pear.bat +++ php-src/pear/go-pear.bat -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
