[PHP-CVS-DAILY] cvs: Zend / ChangeLog
changelog Mon Mar 3 20:32:58 2003 EDT Modified files: /Zend ChangeLog Log: ChangeLog update Index: Zend/ChangeLog diff -u Zend/ChangeLog:1.114 Zend/ChangeLog:1.115 --- Zend/ChangeLog:1.114Thu Feb 27 20:31:31 2003 +++ Zend/ChangeLog Mon Mar 3 20:32:57 2003 @@ -1,3 +1,11 @@ +2003-03-03 Harald Radi [EMAIL PROTECTED] + +* (PHP_4_3) + zend_API.c + zend_API.h: + MFZE2: adding zend_disable_class + thanks to George again + 2003-02-27 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_4_3) @@ -962,7 +970,7 @@ 2002-05-13 Sterling Hughes [EMAIL PROTECTED] -* zend_qsort.c: add $Id: ChangeLog,v 1.114 2003/02/28 01:31:31 changelog Exp $ tag +* zend_qsort.c: add $Id: ChangeLog,v 1.115 2003/03/04 01:32:57 changelog Exp $ tag 2002-05-13 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Mar 3 20:33:09 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.186 ZendEngine2/ChangeLog:1.187 --- ZendEngine2/ChangeLog:1.186 Sun Mar 2 20:32:58 2003 +++ ZendEngine2/ChangeLog Mon Mar 3 20:33:08 2003 @@ -1,3 +1,14 @@ +2003-03-03 Harald Radi [EMAIL PROTECTED] + +* zend_API.c: + add missing strtolower + +* zend_API.c + zend_API.h: + commiting zend_disable_class patch for George: + disabled classes will be replaced by dummy classes + that print a warning upon instanciation + 2003-03-02 Zeev Suraski [EMAIL PROTECTED] * zend_execute_API.c: @@ -563,7 +574,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.186 2003/03/03 01:32:58 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.187 2003/03/04 01:33:08 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php4(PHP_4_3) /main main.c
At 02:54 03.03.2003, Harald Radi wrote: phanto Sun Mar 2 20:54:29 2003 EDT Modified files: (Branch: PHP_4_3) /php4/main main.c Log: MFH: adding disable_classes ini directive Why was this *new functionality* MFHed? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php4(PHP_4_3) /main main.c
because it is a rather small manageable security fix ? regards, Harald Radi -- nme - we can heal you http://www.nme.at Ortner Radi Schwenk GnbR Tumpenweg 528 5084 Grossgmain, Salzburg Austria -Original Message- From: Marcus Börger [mailto:[EMAIL PROTECTED] Sent: Monday, March 03, 2003 11:59 AM To: Harald Radi Cc: [EMAIL PROTECTED] Subject: Re: [PHP-CVS] cvs: php4(PHP_4_3) /main main.c At 02:54 03.03.2003, Harald Radi wrote: phanto Sun Mar 2 20:54:29 2003 EDT Modified files: (Branch: PHP_4_3) /php4/main main.c Log: MFH: adding disable_classes ini directive Why was this *new functionality* MFHed? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes abstract_static.phpt
helly Mon Mar 3 06:13:58 2003 EDT
Added files:
/php4/tests/classes abstract_static.phpt
Log:
Adding tests for abstract static methods
Index: php4/tests/classes/abstract_static.phpt
+++ php4/tests/classes/abstract_static.phpt
--TEST--
A static abstrcat method may not be called
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class fail {
abstract static function show();
}
class pass extends fail {
static function show() {
echo Call to function show()\n;
}
}
pass::show();
fail::show();
echo Done\n; // shouldn't be displayed
?
--EXPECTF--
Call to function show()
Fatal error: Cannot call abstract method fail::show() in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php4(PHP_4_3) /main main.c
At 12:13 03.03.2003, Harald Radi wrote: because it is a rather small manageable security fix ? Ah security is reason enough -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes ctor_dtor.phpt ctor_dtor_inheritance.phpt
helly Mon Mar 3 06:19:02 2003 EDT
Added files:
/php4/tests/classes ctor_dtor.phpt ctor_dtor_inheritance.phpt
Log:
Adding tests for ctor/dtor handling
Index: php4/tests/classes/ctor_dtor.phpt
+++ php4/tests/classes/ctor_dtor.phpt
--TEST--
The new constructor/destructor is called
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class early {
function early() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
function __construct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
function __destruct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
}
class late {
function __construct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
function late() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
function __destruct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
}
}
$t = new early();
$t-early();
unset($t);
$t = new late();
$t-late();
//unset($t); delay to end of script
echo Done\n;
?
--EXPECTF--
early::__construct
early::early
early::__destruct
late::__construct
late::late
Done
late::__destruct
Index: php4/tests/classes/ctor_dtor_inheritance.phpt
+++ php4/tests/classes/ctor_dtor_inheritance.phpt
--TEST--
A derived class can use the inherited constructor/destructor
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
// This test checks for:
// - inherited constructors/destructors are not called automatically
// - base classes know about derived properties in constructor/destructor
// - base class constructors/destructors know the instanciated class name
class base {
public $name;
function __construct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
$this-name = 'base';
print_r($this);
}
function __destruct() {
echo __CLASS__ . :: . __FUNCTION__ . \n;
print_r($this);
}
}
class derived extends base {
public $other;
function __construct() {
$this-name = 'init';
$this-other = 'other';
print_r($this);
parent::__construct();
echo __CLASS__ . :: . __FUNCTION__ . \n;
$this-name = 'derived';
print_r($this);
}
function __destruct() {
parent::__destruct();
echo __CLASS__ . :: . __FUNCTION__ . \n;
print_r($this);
}
}
echo Testing class base\n;
$t = new base();
unset($t);
echo Testing class derived\n;
$t = new derived();
unset($t);
echo Done\n;
?
--EXPECTF--
Testing class base
base::__construct
base Object
(
[name] = base
)
base::__destruct
base Object
(
[name] = base
)
Testing class derived
derived Object
(
[other] = other
[name] = init
)
base::__construct
derived Object
(
[other] = other
[name] = base
)
derived::__construct
derived Object
(
[other] = other
[name] = derived
)
base::__destruct
derived Object
(
[other] = other
[name] = derived
)
derived::__destruct
derived Object
(
[other] = other
[name] = derived
)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes __call_001.phpt __clone_001.phpt __set__get_001.phpt constants_scope_001.phpt dereferencing_001.phpt factory_001.phpt object_reference_001.phpt singleton_001.phpt /tests/lang error_2_exception_001.phpt namespace_001.phpt
jay Mon Mar 3 11:44:38 2003 EDT
Added files:
/php4/tests/classes __call_001.phpt __clone_001.phpt
__set__get_001.phpt constants_scope_001.phpt
dereferencing_001.phpt factory_001.phpt
object_reference_001.phpt singleton_001.phpt
/php4/tests/langerror_2_exception_001.phpt namespace_001.phpt
Log:
Added some tests for ZE2 features and their functionality.
Index: php4/tests/classes/__call_001.phpt
+++ php4/tests/classes/__call_001.phpt
--TEST--
ZE2 __call()
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class Caller {
var $x = array(1, 2, 3);
function __call($m, $a) {
echo Method $m called:\n;
var_dump($a);
return $this-x;
}
}
$foo = new Caller();
$a = $foo-test(1, '2', 3.4, true);
var_dump($a);
?
--EXPECT--
Method test called:
array(4) {
[0]=
int(1)
[1]=
string(1) 2
[2]=
float(2)
[3]=
bool(true)
}
array(3) {
[0]=
int(1)
[1]=
int(2)
[2]=
int(3)
}
Index: php4/tests/classes/__clone_001.phpt
+++ php4/tests/classes/__clone_001.phpt
--TEST--
ZE2 __clone()
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class MyCloneable {
static $id = 0;
function MyCloneable() {
$this-id = self::$id++;
}
function __clone() {
$this-name = $that-name;
$this-address = New York;
$this-id = self::$id++;
}
}
$original = new MyCloneable();
$original-name = Hello;
$original-address = Tel-Aviv;
echo $original-id . \n;
$clone = $original-__clone();
echo $clone-id . \n;
echo $clone-name . \n;
echo $clone-address . \n;
?
--EXPECT--
0
1
Hello
New York
Index: php4/tests/classes/__set__get_001.phpt
+++ php4/tests/classes/__set__get_001.phpt
--TEST--
ZE2 __set() and __get()
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class Setter {
public $n;
public $x = array('a' = 1, 'b' = 2, 'c' = 3);
function __get($nm) {
echo Getting [$nm]\n;
if (isset($this-x[$nm])) {
$r = $this-x[$nm];
echo Returning: $r\n;
return $r;
}
else {
echo Nothing!\n;
}
}
function __set($nm, $val) {
echo Setting [$nm] to $val\n;
if (isset($this-x[$nm])) {
$this-x[$nm] = $val;
echo OK!\n;
}
else {
echo Not OK!\n;
}
}
}
$foo = new Setter();
// this doesn't go through __set()... should it?
$foo-n = 1;
// the rest are fine...
$foo-a = 100;
$foo-a++;
$foo-z++;
var_dump($foo);
?
--EXPECT--
Setting [a] to 100
OK!
Getting [a]
Returning: 100
Setting [a] to 101
OK!
Getting [z]
Nothing!
Setting [z] to 1
Not OK!
object(setter)(2) {
[n]=
int(1)
[x]=
array(3) {
[a]=
int(101)
[b]=
int(2)
[c]=
int(3)
}
}
Index: php4/tests/classes/constants_scope_001.phpt
+++ php4/tests/classes/constants_scope_001.phpt
--TEST--
ZE2 class constants and scope
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class ErrorCodes {
const FATAL = Fatal error\n;
const WARNING = Warning\n;
const INFO = Informational message\n;
static function print_fatal_error_codes() {
echo FATAL = . FATAL;
echo self::FATAL = . self::FATAL;
}
}
/* Call the static function and move into the ErrorCodes scope */
ErrorCodes::print_fatal_error_codes();
?
--EXPECT--
FATAL = Fatal error
self::FATAL = Fatal error
Index: php4/tests/classes/dereferencing_001.phpt
+++ php4/tests/classes/dereferencing_001.phpt
--TEST--
ZE2 dereferencing of objects from methods
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class Name {
function Name($_name) {
$this-name = $_name;
}
function display() {
echo $this-name . \n;
}
}
class Person {
private $name;
function Person($_name, $_address) {
$this-name = new Name($_name);
}
function getName() {
return $this-name;
}
}
$person = new Person(John, New York);
$person-getName()-display();
?
--EXPECT--
John
Index: php4/tests/classes/factory_001.phpt
+++ php4/tests/classes/factory_001.phpt
--TEST--
ZE2 factory objects
--SKIPIF--
?php if
[PHP-CVS] cvs: CVSROOT / avail
sas Mon Mar 3 12:49:04 2003 EDT Modified files: /CVSROOTavail Log: pear karma for andrew Index: CVSROOT/avail diff -u CVSROOT/avail:1.600 CVSROOT/avail:1.601 --- CVSROOT/avail:1.600 Fri Feb 28 13:46:46 2003 +++ CVSROOT/avail Mon Mar 3 12:49:03 2003 @@ -45,7 +45,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP 4 tree, the PEAR website, and the PEAR documentation. -avail|moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas|pear,peardoc +avail|andrew,moh,sterling,jon,rael,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,jeichorn,bjoern,chregu,bkelly,tfromm,subjective,cox,fireclaw,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,maehdros,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,djanubis,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,ruibarreiros,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas|pear,peardoc avail|cox,mj,vblavet,dickmann,tal|php4/pear avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio|pearweb -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main php_variables.c
iliaa Mon Mar 3 14:37:09 2003 EDT Modified files: /php4/main php_variables.c Log: Fixed compiler warnings. Index: php4/main/php_variables.c diff -u php4/main/php_variables.c:1.54 php4/main/php_variables.c:1.55 --- php4/main/php_variables.c:1.54 Sun Mar 2 10:41:12 2003 +++ php4/main/php_variables.c Mon Mar 3 14:37:09 2003 @@ -17,15 +17,17 @@ +--+ */ -/* $Id: php_variables.c,v 1.54 2003/03/02 15:41:12 zeev Exp $ */ +/* $Id: php_variables.c,v 1.55 2003/03/03 19:37:09 iliaa Exp $ */ #include stdio.h #include php.h #include ext/standard/php_standard.h +#include ext/standard/credits.h #include php_variables.h #include php_globals.h #include php_content_types.h #include SAPI.h +#include php_logos.h #include zend_globals.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main php_variables.h
iliaa Mon Mar 3 14:41:36 2003 EDT Modified files: /php4/main php_variables.h Log: Compiler warning fix. Index: php4/main/php_variables.h diff -u php4/main/php_variables.h:1.16 php4/main/php_variables.h:1.17 --- php4/main/php_variables.h:1.16 Sun Mar 2 05:19:15 2003 +++ php4/main/php_variables.h Mon Mar 3 14:41:36 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_variables.h,v 1.16 2003/03/02 10:19:15 zeev Exp $ */ +/* $Id: php_variables.h,v 1.17 2003/03/03 19:41:36 iliaa Exp $ */ #ifndef PHP_VARIABLES_H #define PHP_VARIABLES_H @@ -31,6 +31,7 @@ #define PARSE_STRING 3 void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC); +void php_startup_auto_globals(TSRMLS_D); extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC); PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC); /* binary-safe version */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /main main.c
iliaa Mon Mar 3 14:46:16 2003 EDT
Modified files:
/php4/main main.c
Log:
More compiler warnings fixed.
Index: php4/main/main.c
diff -u php4/main/main.c:1.532 php4/main/main.c:1.533
--- php4/main/main.c:1.532 Sun Mar 2 20:27:22 2003
+++ php4/main/main.cMon Mar 3 14:46:16 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.532 2003/03/03 01:27:22 phanto Exp $ */
+/* $Id: main.c,v 1.533 2003/03/03 19:46:16 iliaa Exp $ */
/* {{{ includes
*/
@@ -112,9 +112,6 @@
} last_error_type;
static last_error_type last_error;
-
-static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC);
-
#define SAFE_FILENAME(f) ((f)?(f):-)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/mcrypt mcrypt.dsp
edink Mon Mar 3 16:23:48 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mcryptmcrypt.dsp Log: Enabled mcrypt_generic_deinit() on windows (#22520) Index: php4/ext/mcrypt/mcrypt.dsp diff -u php4/ext/mcrypt/mcrypt.dsp:1.5.16.1 php4/ext/mcrypt/mcrypt.dsp:1.5.16.2 --- php4/ext/mcrypt/mcrypt.dsp:1.5.16.1 Thu Dec 19 05:37:45 2002 +++ php4/ext/mcrypt/mcrypt.dsp Mon Mar 3 16:23:48 2003 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MSSQL_EXPORTS /D COMPILE_DL_MCRYPT /D DBNTWIN32 /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\mcrypt\include /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MCRYPT_EXPORTS /D COMPILE_DL_MCRYPT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBMCRYPT=1 /D HAVE_LIBMCRYPT24=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\mcrypt\include /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MCRYPT_EXPORTS /D COMPILE_DL_MCRYPT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBMCRYPT=1 /D HAVE_LIBMCRYPT24=1 /D HAVE_MCRYPT_GENERIC_DEINIT /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I mssql-70 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MSSQL_EXPORTS /D COMPILE_DL_MCRYPT /D DBNTWIN32 /D ZTS=1 /D MSSQL70=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\mcrypt\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MCRYPT_EXPORTS /D COMPILE_DL_MCRYPT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBMCRYPT=1 /D HAVE_LIBMCRYPT24=1 /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\..\bindlib_w32 /I ..\..\TSRM /I ..\..\..\php_build\mcrypt\include /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MCRYPT_EXPORTS /D COMPILE_DL_MCRYPT /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_LIBMCRYPT=1 /D HAVE_LIBMCRYPT24=1 /D HAVE_MCRYPT_GENERIC_DEINIT /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard credits_ext.h credits_sapi.h
edink Mon Mar 3 16:56:51 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard credits_ext.h credits_sapi.h Log: Update credits. Index: php4/ext/standard/credits_ext.h diff -u php4/ext/standard/credits_ext.h:1.13.2.2 php4/ext/standard/credits_ext.h:1.13.2.3 --- php4/ext/standard/credits_ext.h:1.13.2.2Thu Dec 26 18:39:51 2002 +++ php4/ext/standard/credits_ext.h Mon Mar 3 16:56:50 2003 @@ -31,13 +31,13 @@ CREDIT_LINE(FilePro, Chad Robinson); CREDIT_LINE(FriBidi, Onn Ben-Zvi, Tal Peer); CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski); -CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto); +CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye); CREDIT_LINE(GetText, Alex Plotnick); CREDIT_LINE(GNU GMP support, Stanislav Malyshev); CREDIT_LINE(HwAPI, Uwe Steinmann); CREDIT_LINE(HyperWave, Uwe Steinmann); CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); -CREDIT_LINE(Informix, Danny Heijl, Christian Cartus); +CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius); CREDIT_LINE(Ingres II, David Hénot); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev); CREDIT_LINE(IRCG, Sascha Schumann); @@ -53,10 +53,10 @@ CREDIT_LINE(msession, Mark L. Woodward); CREDIT_LINE(mSQL, Zeev Suraski); CREDIT_LINE(MS SQL, Frank M. Kromann); -CREDIT_LINE(Multibyte (Japanese) String Functions, Tsukada Takuya, Rui Hirokawa); +CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); -CREDIT_LINE(ncurses, Ilia Alshanetsky, Hartmut Holzgraefe, Georg Richter); -CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson); +CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter); +CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); CREDIT_LINE(OpenSSL, Stig Venaas, Wez Furlong, Sascha Kettler); CREDIT_LINE(Oracle, Stig Bakken, Mitch Golden, Rasmus Lerdorf, Andreas Karajannis, Thies C. Arntzen); Index: php4/ext/standard/credits_sapi.h diff -u php4/ext/standard/credits_sapi.h:1.9.2.1 php4/ext/standard/credits_sapi.h:1.9.2.2 --- php4/ext/standard/credits_sapi.h:1.9.2.1Tue Nov 19 10:11:33 2002 +++ php4/ext/standard/credits_sapi.hMon Mar 3 16:56:51 2003 @@ -18,7 +18,6 @@ CREDIT_LINE(CGI / FastCGI, Rasmus Lerdorf, Stig Bakken, Shane Caraveo); CREDIT_LINE(CLI, Edin Kadribasic, Marcus Boerger); CREDIT_LINE(Embed, Edin Kadribasic); -CREDIT_LINE(fastcgi, Ben Mansell); CREDIT_LINE(ISAPI, Andi Gutmans, Zeev Suraski); CREDIT_LINE(Java Servlet, Sam Ruby); CREDIT_LINE(NSAPI, Jayakumar Muthukumarasamy); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mysqli config.m4 mysqli.c mysqli_fe.c mysqli_nonapi.c mysqli_profiler.c php_mysqli.h
georg Mon Mar 3 17:36:48 2003 EDT
Added files:
/php4/ext/mysqlimysqli_profiler.c
Modified files:
/php4/ext/mysqliphp_mysqli.h mysqli.c mysqli_nonapi.c mysqli_fe.c
config.m4
Log:
added profiler support
Index: php4/ext/mysqli/php_mysqli.h
diff -u php4/ext/mysqli/php_mysqli.h:1.10 php4/ext/mysqli/php_mysqli.h:1.11
--- php4/ext/mysqli/php_mysqli.h:1.10 Sat Feb 22 02:31:01 2003
+++ php4/ext/mysqli/php_mysqli.hMon Mar 3 17:36:47 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.10 2003/02/22 07:31:01 georg Exp $
+ $Id: php_mysqli.h,v 1.11 2003/03/03 22:36:47 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -25,11 +25,21 @@
#undef LIST
#endif
+#ifdef PHP_WIN32
+#include win32/time.h
+#else
+#include sys/time.h
+#endif
+
#include mysql.h
#ifndef PHP_MYSQLI_H
#define PHP_MYSQLI_H
+#define MYSQLI_PR_TYPE_QUERY0
+#define MYSQLI_PR_TYPE_PREPARE 1
+
+
typedef struct {
ulong buflen;
char*buffer;
@@ -45,6 +55,18 @@
chartype;
} STMT;
+typedef struct {
+ charactive;
+ struct timeval start;
+ unsigned intcount[2];
+ ulong min_row_val[2];
+ ulong max_row_val[2];
+ ulong row_val[2];
+ double min_elapsed[2];
+ double max_elapsed[2];
+ double elapsed[2];
+} PROFILER;
+
typedef struct _mysqli_object {
zend_object zo;
void *ptr;
@@ -71,6 +93,13 @@
extern function_entry mysqli_result_methods[];
extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int flag);
extern void php_clear_stmt_bind(STMT *stmt);
+
+/* Profiler functions */
+extern void php_mysqli_profiler_result_info(MYSQL_RES *res);
+void php_mysqli_profiler_explain(MYSQL *mysql, char *query);
+void php_mysqli_profiler_header(char *query);
+void php_mysqli_profiler_elapsed_time();
+
zend_class_entry *mysqli_link_class_entry;
zend_class_entry *mysqli_stmt_class_entry;
zend_class_entry *mysqli_result_class_entry;
@@ -153,8 +182,8 @@
#define MYSQLI_BIND_SEND_DATA 4
/* fetch types */
-#define FETCH_SIMPLE 0
-#define FETCH_RESULT 1
+#define FETCH_SIMPLE 1
+#define FETCH_RESULT 2
PHP_MYSQLI_API void mysqli_register_link(zval *return_value, void *link TSRMLS_DC);
PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt TSRMLS_DC);
@@ -230,6 +259,7 @@
PHP_FUNCTION(mysqli_select_db);
PHP_FUNCTION(mysqli_send_long_data);
PHP_FUNCTION(mysqli_send_query);
+PHP_FUNCTION(mysqli_set_profiler_opt);
PHP_FUNCTION(mysqli_slave_query);
PHP_FUNCTION(mysqli_ssl_set);
PHP_FUNCTION(mysqli_stat);
@@ -245,16 +275,17 @@
PHP_FUNCTION(mysqli_warning_count);
ZEND_BEGIN_MODULE_GLOBALS(mysqli)
- long default_link;
- long num_links;
- long max_links;
- unsigned int default_port;
- char *default_host;
- char *default_user;
- char *default_pw;
- char *default_socket;
- long error_no;
- char *error_msg;
+ longdefault_link;
+ longnum_links;
+ longmax_links;
+ unsigned intdefault_port;
+ char*default_host;
+ char*default_user;
+ char*default_pw;
+ char*default_socket;
+ longerror_no;
+ char*error_msg;
+ PROFILERprofiler;
ZEND_END_MODULE_GLOBALS(mysqli)
#ifdef ZTS
@@ -262,6 +293,18 @@
#else
#define MyG(v) (mysqli_globals.v)
#endif
+
+#define MYSQLI_PROFILER_GETTIME gettimeofday(MyG(profiler.start), NULL)
+#define MYSQLI_PROFILER_REPORTTIME php_mysqli_profiler_elapsed_time()
+#define MYSQLI_PROFILER_HEADER(query) php_mysqli_profiler_header(query)
+#define MYSQLI_PROFILER_REPORT_RESULT(res) php_mysqli_profiler_result_info(res)
+#define MYSQLI_PROFILER_EXPLAIN(mysql,query) \
+if (!strncasecmp(select, Z_STRVAL_PP(query), 6)){ \
+ php_mysqli_profiler_explain(mysql,query); \
+ if (mysql_errno(mysql)) { \
+ RETURN_FALSE; \
+ } \
+}
ZEND_EXTERN_MODULE_GLOBALS(mysqli);
Index: php4/ext/mysqli/mysqli.c
diff -u php4/ext/mysqli/mysqli.c:1.7 php4/ext/mysqli/mysqli.c:1.8
--- php4/ext/mysqli/mysqli.c:1.7Sat Feb 22 02:31:01 2003
+++ php4/ext/mysqli/mysqli.cMon Mar 3 17:36:47 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.7 2003/02/22 07:31:01 georg Exp $
+ $Id: mysqli.c,v 1.8 2003/03/03 22:36:47 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -176,6 +176,7 @@
[PHP-CVS] cvs: php4 /ext/mysqli/tests 051.phpt 052.phpt
georg Mon Mar 3 17:50:34 2003 EDT Modified files: /php4/ext/mysqli/tests 051.phpt 052.phpt Log: disabled output of errormessages Index: php4/ext/mysqli/tests/051.phpt diff -u php4/ext/mysqli/tests/051.phpt:1.1 php4/ext/mysqli/tests/051.phpt:1.2 --- php4/ext/mysqli/tests/051.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php4/ext/mysqli/tests/051.phpt Mon Mar 3 17:50:34 2003 @@ -13,7 +13,7 @@ mysqli_execute($stmt1); mysqli_close($link); - mysqli_stmt_close($stmt1); + @mysqli_stmt_close($stmt1); printf(Ok\n); ? --EXPECT-- Index: php4/ext/mysqli/tests/052.phpt diff -u php4/ext/mysqli/tests/052.phpt:1.1 php4/ext/mysqli/tests/052.phpt:1.2 --- php4/ext/mysqli/tests/052.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php4/ext/mysqli/tests/052.phpt Mon Mar 3 17:50:34 2003 @@ -12,8 +12,8 @@ $stmt2 = mysqli_prepare($link, SELECT CURRENT_USER()); mysqli_close($link); - mysqli_execute($stmt2); - mysqli_stmt_close($stmt2); + @mysqli_execute($stmt2); + @mysqli_stmt_close($stmt2); printf(Ok\n); ? --EXPECT-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mysqli php_mysqli.h
georg Mon Mar 3 17:50:56 2003 EDT
Modified files:
/php4/ext/mysqliphp_mysqli.h
Log:
fixed bug in macro-definition
Index: php4/ext/mysqli/php_mysqli.h
diff -u php4/ext/mysqli/php_mysqli.h:1.11 php4/ext/mysqli/php_mysqli.h:1.12
--- php4/ext/mysqli/php_mysqli.h:1.11 Mon Mar 3 17:36:47 2003
+++ php4/ext/mysqli/php_mysqli.hMon Mar 3 17:50:56 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.11 2003/03/03 22:36:47 georg Exp $
+ $Id: php_mysqli.h,v 1.12 2003/03/03 22:50:56 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -299,7 +299,7 @@
#define MYSQLI_PROFILER_HEADER(query) php_mysqli_profiler_header(query)
#define MYSQLI_PROFILER_REPORT_RESULT(res) php_mysqli_profiler_result_info(res)
#define MYSQLI_PROFILER_EXPLAIN(mysql,query) \
-if (!strncasecmp(select, Z_STRVAL_PP(query), 6)){ \
+if (!strncasecmp(select, query, 6)){ \
php_mysqli_profiler_explain(mysql,query); \
if (mysql_errno(mysql)) { \
RETURN_FALSE; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
imajes Mon Mar 3 18:05:18 2003 EDT Modified files: /CVSROOTavail Log: giving Sara commit access to phpweb Index: CVSROOT/avail diff -u CVSROOT/avail:1.601 CVSROOT/avail:1.602 --- CVSROOT/avail:1.601 Mon Mar 3 12:49:03 2003 +++ CVSROOT/avail Mon Mar 3 18:05:18 2003 @@ -31,7 +31,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web +avail|cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,sniper,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard credits_ext.h credits_sapi.h /sapi/apache2filter CREDITS /sapi/apache2handler CREDITS
edink Mon Mar 3 19:10:11 2003 EDT Modified files: /php4/ext/standard credits_ext.h credits_sapi.h /php4/sapi/apache2filterCREDITS /php4/sapi/apache2handler CREDITS Log: Credits update. Index: php4/ext/standard/credits_ext.h diff -u php4/ext/standard/credits_ext.h:1.16 php4/ext/standard/credits_ext.h:1.17 --- php4/ext/standard/credits_ext.h:1.16Fri Jan 3 05:48:38 2003 +++ php4/ext/standard/credits_ext.h Mon Mar 3 19:10:10 2003 @@ -30,15 +30,15 @@ CREDIT_LINE(FBSQL, Frank M. Kromann); CREDIT_LINE(FDF, Uwe Steinmann); CREDIT_LINE(FilePro, Chad Robinson); -CREDIT_LINE(FriBidi, Onn Ben-Zvi, Tal Peer); CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski); -CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto); +CREDIT_LINE(GD imaging, Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto, Ilia Alshanetsky, Pierre-Alain Joye); CREDIT_LINE(GetText, Alex Plotnick); CREDIT_LINE(GNU GMP support, Stanislav Malyshev); CREDIT_LINE(HwAPI, Uwe Steinmann); CREDIT_LINE(HyperWave, Uwe Steinmann); +CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi ); CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); -CREDIT_LINE(Informix, Danny Heijl, Christian Cartus); +CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius); CREDIT_LINE(Ingres II, David Hénot); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev); CREDIT_LINE(IRCG, Sascha Schumann); @@ -55,9 +55,10 @@ CREDIT_LINE(mSQL, Zeev Suraski); CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); +CREDIT_LINE(MySQLi, Zak Greant, Georg Richter); CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter); -CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson); +CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky); CREDIT_LINE(ODBC, Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky); CREDIT_LINE(OpenSSL, Stig Venaas, Wez Furlong, Sascha Kettler); CREDIT_LINE(Oracle, Stig Bakken, Mitch Golden, Rasmus Lerdorf, Andreas Karajannis, Thies C. Arntzen); @@ -82,7 +83,6 @@ CREDIT_LINE(System V Semaphores, Tom May); CREDIT_LINE(System V Shared Memory, Christian Cartus); CREDIT_LINE(tokenizer, Andrei Zmievski); -CREDIT_LINE(User-space object overloading, Andrei Zmievski); CREDIT_LINE(Verisign Payflow Pro, John Donagher, David Croft); CREDIT_LINE(W32API, James Moore); CREDIT_LINE(WDDX, Andrei Zmievski); Index: php4/ext/standard/credits_sapi.h diff -u php4/ext/standard/credits_sapi.h:1.12 php4/ext/standard/credits_sapi.h:1.13 --- php4/ext/standard/credits_sapi.h:1.12 Fri Jan 3 05:52:23 2003 +++ php4/ext/standard/credits_sapi.hMon Mar 3 19:10:10 2003 @@ -14,14 +14,15 @@ CREDIT_LINE(AOLserver, Sascha Schumann); CREDIT_LINE(Apache 1.3 (apache_hooks), Rasmus Lerdorf, Zeev Suraski, Stig Bakken, David Sklar, George Schlossnagle, Lukas Schroeder); CREDIT_LINE(Apache 1.3, Rasmus Lerdorf, Zeev Suraski, Stig Bakken, David Sklar); -CREDIT_LINE(Apache 2.0, Sascha Schumann, Aaron Bannert); +CREDIT_LINE(Apache 2.0 Filter, Sascha Schumann, Aaron Bannert); +CREDIT_LINE(Apache 2.0 Handler, Ian Holsman, Justin Erenkrantz (based on Apache 2.0 Filter code)); CREDIT_LINE(Caudium / Roxen, David Hedbor); CREDIT_LINE(CGI / FastCGI, Rasmus Lerdorf, Stig Bakken, Shane Caraveo); CREDIT_LINE(CLI, Edin Kadribasic, Marcus Boerger); CREDIT_LINE(Embed, Edin Kadribasic); CREDIT_LINE(ISAPI, Andi Gutmans, Zeev Suraski); CREDIT_LINE(Java Servlet, Sam Ruby); -CREDIT_LINE(NSAPI, Jayakumar Muthukumarasamy); +CREDIT_LINE(NSAPI, Jayakumar Muthukumarasamy, Uwe Schindler); CREDIT_LINE(phttpd, Thies C. Arntzen); CREDIT_LINE(pi3web, Holger Zimmermann); CREDIT_LINE(Sendmail Milter, Harald Radi); Index: php4/sapi/apache2filter/CREDITS diff -u php4/sapi/apache2filter/CREDITS:1.2 php4/sapi/apache2filter/CREDITS:1.3 --- php4/sapi/apache2filter/CREDITS:1.2 Wed May 8 01:17:59 2002 +++ php4/sapi/apache2filter/CREDITS Mon Mar 3 19:10:10 2003 @@ -1,2 +1,2 @@ -Apache 2.0 +Apache 2.0 Filter Sascha Schumann, Aaron Bannert Index: php4/sapi/apache2handler/CREDITS diff -u php4/sapi/apache2handler/CREDITS:1.1 php4/sapi/apache2handler/CREDITS:1.2 --- php4/sapi/apache2handler/CREDITS:1.1Tue Feb 11 12:40:11 2003 +++ php4/sapi/apache2handler/CREDITSMon Mar 3 19:10:11 2003 @@ -1,3 +1,2 @@ -Apache 2.0 -Sascha Schumann, Aaron Bannert original work -Ian Holsman Justin Erenkrantz is for converting this to a handler +Apache 2.0 Handler +Ian Holsman, Justin Erenkrantz (based on Apache 2.0 Filter code) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
