[PHP-CVS] cvs: php-src /main config.w32.h
zeevTue Feb 10 13:50:11 2004 EDT Modified files: /php-src/main config.w32.h Log: Clear that up http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.84&r2=1.85&ty=u Index: php-src/main/config.w32.h diff -u php-src/main/config.w32.h:1.84 php-src/main/config.w32.h:1.85 --- php-src/main/config.w32.h:1.84 Tue Feb 10 12:55:32 2004 +++ php-src/main/config.w32.h Tue Feb 10 13:50:10 2004 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.84 2004/02/10 17:55:32 zeev Exp $ + $Id: config.w32.h,v 1.85 2004/02/10 18:50:10 zeev Exp $ */ /* Default PHP / PEAR directories */ @@ -189,7 +189,12 @@ #define PHP_SHLIB_SUFFIX "dll" #define HAVE_SQLDATASOURCES #define POSIX_MALLOC_THRESHOLD 10 -//#define HAVE_SOCKLEN_T 1 + + +/* + * defining HAVE_SOCKLEN_T prevents PHP from building with the latest platform SDK... + * #define HAVE_SOCKLEN_T + */ /* Win32 supports strcoll */ #define HAVE_STRCOLL 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevTue Feb 10 13:46:55 2004 EDT
Modified files:
/php-src/main main.c
Log:
Cleanup
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.590&r2=1.591&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.590 php-src/main/main.c:1.591
--- php-src/main/main.c:1.590 Tue Feb 10 12:55:32 2004
+++ php-src/main/main.c Tue Feb 10 13:46:53 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.590 2004/02/10 17:55:32 zeev Exp $ */
+/* $Id: main.c,v 1.591 2004/02/10 18:46:53 zeev Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
case ZMSG_MEMORY_LEAK_DETECTED:
case ZMSG_MEMORY_LEAK_REPEATED:
#if ZEND_DEBUG
- if ((EG(error_reporting) & E_WARNING) && PG(report_memleaks)) {
+ if (EG(error_reporting) & E_WARNING) {
char memory_leak_buf[512];
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
@@ -952,7 +952,7 @@
break;
case ZMSG_MEMORY_LEAKS_GRAND_TOTAL:
#if ZEND_DEBUG
- if ((EG(error_reporting) & E_WARNING) && PG(report_memleaks)) {
+ if (EG(error_reporting) & E_WARNING) {
char memory_leak_buf[512];
snprintf(memory_leak_buf, 512, "=== Total %d memory
leaks detected ===\n", *((zend_uint *) data));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main config.w32.h main.c
zeevTue Feb 10 12:55:33 2004 EDT
Modified files:
/php-src/main config.w32.h main.c
Log:
Fix report_memleaks
http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.83&r2=1.84&ty=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.83 php-src/main/config.w32.h:1.84
--- php-src/main/config.w32.h:1.83 Tue Dec 9 18:59:33 2003
+++ php-src/main/config.w32.h Tue Feb 10 12:55:32 2004
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.83 2003/12/09 23:59:33 sniper Exp $
+ $Id: config.w32.h,v 1.84 2004/02/10 17:55:32 zeev Exp $
*/
/* Default PHP / PEAR directories */
@@ -189,6 +189,7 @@
#define PHP_SHLIB_SUFFIX "dll"
#define HAVE_SQLDATASOURCES
#define POSIX_MALLOC_THRESHOLD 10
+//#define HAVE_SOCKLEN_T 1
/* Win32 supports strcoll */
#define HAVE_STRCOLL 1
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.589&r2=1.590&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.589 php-src/main/main.c:1.590
--- php-src/main/main.c:1.589 Tue Feb 10 12:44:18 2004
+++ php-src/main/main.c Tue Feb 10 12:55:32 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.589 2004/02/10 17:44:18 zeev Exp $ */
+/* $Id: main.c,v 1.590 2004/02/10 17:55:32 zeev Exp $ */
/* {{{ includes
*/
@@ -952,7 +952,7 @@
break;
case ZMSG_MEMORY_LEAKS_GRAND_TOTAL:
#if ZEND_DEBUG
- if ((EG(error_reporting)&E_WARNING) && PG(report_memleaks)) {
+ if ((EG(error_reporting) & E_WARNING) && PG(report_memleaks)) {
char memory_leak_buf[512];
snprintf(memory_leak_buf, 512, "=== Total %d memory
leaks detected ===\n", *((zend_uint *) data));
@@ -1200,8 +1200,10 @@
*/
void php_request_shutdown(void *dummy)
{
+ zend_bool report_memleaks;
TSRMLS_FETCH();
+ report_memleaks = PG(report_memleaks);
/* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
* inside zend_executor callback functions.
*/
@@ -1244,8 +1246,8 @@
sapi_deactivate(TSRMLS_C);
} zend_end_try();
- zend_try {
- shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
+ zend_try {
+ shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0
TSRMLS_CC);
} zend_end_try();
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevTue Feb 10 12:44:18 2004 EDT
Modified files:
/php-src/main main.c
Log:
Whitespace
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.588&r2=1.589&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.588 php-src/main/main.c:1.589
--- php-src/main/main.c:1.588 Sun Feb 8 23:04:24 2004
+++ php-src/main/main.c Tue Feb 10 12:44:18 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.588 2004/02/09 04:04:24 iliaa Exp $ */
+/* $Id: main.c,v 1.589 2004/02/10 17:44:18 zeev Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
case ZMSG_MEMORY_LEAK_DETECTED:
case ZMSG_MEMORY_LEAK_REPEATED:
#if ZEND_DEBUG
- if ((EG(error_reporting)&E_WARNING) && PG(report_memleaks)) {
+ if ((EG(error_reporting) & E_WARNING) && PG(report_memleaks)) {
char memory_leak_buf[512];
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
zeevTue Feb 10 04:37:17 2004 EDT
Modified files:
/php-srcNEWS
Log:
Update NEWS
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1598&r2=1.1599&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1598 php-src/NEWS:1.1599
--- php-src/NEWS:1.1598 Thu Feb 5 16:11:26 2004
+++ php-src/NEWSTue Feb 10 04:37:11 2004
@@ -1,6 +1,9 @@
PHPNEWS
|||
?? ??? 2004, PHP 5 Beta 4
+- Added support for ++ and += (and similar) to SimpleXML. (Andi, Zeev)
+- Added infrastructure for ++ and += (and similar) to object overloading
+ modules. (Andi, Zeev)
- Readded support for using classes before they are declared according to
the behavior in PHP 4. This won't work with classes who are using PHP 5
features such as interfaces. (Zeev, Andi)
@@ -8,7 +11,7 @@
- Improved destructor implementation to always call destructors on clean
shutdown. An order of destruction is not guaranteed. (Zeev, Andi)
- Fixed problem with parse error in include() file not stopping PHP's
- execution (Ilia)
+ execution. (Ilia)
- Redesigned exception support. This fixes many bugs in the previous design
such as nested try's and problems with overloaded extensions. (Zeev, Andi)
- Redesigned clone by adding a clone keyword (clone $obj) and copying all
@@ -42,11 +45,11 @@
(Ilia, runekl[at]opoint[dot]com
- Fixed bug #26947 (ext/dom: Crash when using DomDocument::getElementById()).
(Christian)
-- Fixed bug #26911 (crash in sqlite extension when fetching data from empty
+- Fixed bug #26911 (crash in sqlite extension when fetching data from empty
queries). (Ilia)
- Fixed bug #26844 (ext/mime_magic: magic file validation broken). (Jani)
- Fixed bug #26819 (http_build_query() crashes on NULL output). (Ilia)
-- Fixed bug #26817 (http_build_query() does not handle private & protected
+- Fixed bug #26817 (http_build_query() does not handle private & protected
object properties correctly). (Ilia)
- Fixed bug #26815 (foreach of (DOM) childnodes crashes when Xinclude is used).
(Rob)
@@ -68,12 +71,12 @@
- Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus)
- Fixed bug #26640 (__autoload() not invoked by Reflection classes). (Jani)
- Fixed bug #26543 (call_user_func() broken for self, parent). (Stanislav)
-- Fixed bug #26077 (memory leak when new() result is not assigned and no
+- Fixed bug #26077 (memory leak when new() result is not assigned and no
constructor is defined). (Stanislav)
- Fixed bug #26065 (Crash when nesting classes). (Marcus)
- Fixed bug #25816 (disallow arrays in class constants). (Stanislav)
- Fixed bug #25329 (sqlite_create_function with method and reference to $this).
- (Marcus)
+ (Marcus)
- Fixed bug #25038 (call_user_func() issues a warning if function throws an
exception). (Marcus)
- Fixed bug #24608 (__set not triggered when overloading with array).
@@ -121,19 +124,19 @@
- Fixed get_declared_classes() to return only classes. (Andrey, Marcus)
- Fixed __autoload() to preserve case of the passed class name. (Andi)
- Fixed bug #26615 () (runekl at opoint dot com, Derick)
-- Fixed bug #26591 ("__autoload threw an exception" during an uncaught).
+- Fixed bug #26591 ("__autoload threw an exception" during an uncaught).
(Marcus)
- Fixed bug #26534 (stream_get_meta_data() -> Access Violation). (Wez)
-- Fixed bug #26528 (HTML entities are not being decoded by
+- Fixed bug #26528 (HTML entities are not being decoded by
xml_parse()/xml_parse_into_struct()). (Ilia)
- Fixed bug #26182 (Object properties created redundantly). (Andi)
- Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals).
(Moriyoshi)
- Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
- Fixed bug #26072 (--disable-libxml does not work). (Jani)
-- Fixed bug #26001 (serialize crashes when accessing an overloaded object that
+- Fixed bug #26001 (serialize crashes when accessing an overloaded object that
has no properties (NULL hashtable)). (Wez)
-- Fixed bug #25664 (COM crashes when calling a Delphi implementations of
+- Fixed bug #25664 (COM crashes when calling a Delphi implementations of
ITypeInfo). (Wez)
- Fixed bug #24837 (Incorrect behaviour of PPP using foreach). (Marcus)
- Fixed bug #24693 (Allow session.use_trans_sid to be enabled/disabled from
@@ -159,10 +162,10 @@
statements into ibase_query()
. Added ability to bind PHP arrays to native Interbase arrays
. Added ibase_commit_ret() and ibase_rollback_ret()
- . Added ibase_drop_db()
+ . Added ibase_drop_db()
. Added ibase_gen_id()
. Added ibase_name_result()
- . Added ibase_errcode()
+ . Added ibase_errcode()
. Added ibase_affected_rows() and ibase_num_params()
. Added ibase_param_info()
. Added ibase_wait_event()
@@ -191,7 +194,7 @@
- Fixed
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevTue Feb 10 04:30:42 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Implement get callback for SimpleXML (it now supports pre/post increment
as well as binary-assign-ops)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.125&r2=1.126&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.125 php-src/ext/simplexml/simplexml.c:1.126
--- php-src/ext/simplexml/simplexml.c:1.125 Sun Feb 8 12:25:54 2004
+++ php-src/ext/simplexml/simplexml.c Tue Feb 10 04:30:38 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.125 2004/02/08 17:25:54 zeev Exp $ */
+/* $Id: simplexml.c,v 1.126 2004/02/10 09:30:38 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1013,6 +1013,21 @@
}
/* }}} */
+static zval *sxe_get_value(zval *z TSRMLS_DC)
+{
+ zval *retval;
+
+ MAKE_STD_ZVAL(retval);
+
+ if (sxe_object_cast(z, retval, IS_STRING, 0 TSRMLS_CC)==FAILURE) {
+ zend_error(E_ERROR, "Unable to cast node to string");
+ }
+
+ retval->refcount = 0;
+ return retval;
+}
+
+
static zend_object_handlers sxe_object_handlers = {
ZEND_OBJECTS_STORE_HANDLERS,
sxe_property_read,
@@ -1020,7 +1035,7 @@
sxe_dimension_read,
sxe_dimension_write,
NULL,
- NULL,
+ sxe_get_value, /* get */
NULL,
sxe_property_exists,
sxe_property_delete,
@@ -1577,7 +1592,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.125 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.126 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c /ext/simplexml simplexml.c
zeevSun Feb 8 12:25:55 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/simplexml simplexml.c
Log:
Update to new API
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.14&r2=1.15&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.14
php-src/ext/com_dotnet/com_handlers.c:1.15
--- php-src/ext/com_dotnet/com_handlers.c:1.14 Wed Feb 4 06:14:30 2004
+++ php-src/ext/com_dotnet/com_handlers.c Sun Feb 8 12:25:53 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
+/* $Id: com_handlers.c,v 1.15 2004/02/08 17:25:53 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -104,7 +104,7 @@
return obj->have_default_bind ? SUCCESS : FAILURE;
}
-static zval *com_read_dimension(zval *object, zval *offset TSRMLS_DC)
+static zval *com_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
{
zval *return_value;
php_com_dotnet_object *obj;
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.124&r2=1.125&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.124 php-src/ext/simplexml/simplexml.c:1.125
--- php-src/ext/simplexml/simplexml.c:1.124 Wed Feb 4 06:12:31 2004
+++ php-src/ext/simplexml/simplexml.c Sun Feb 8 12:25:54 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.124 2004/02/04 11:12:31 zeev Exp $ */
+/* $Id: simplexml.c,v 1.125 2004/02/08 17:25:54 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -263,7 +263,7 @@
/* {{{ sxe_dimension_read()
*/
-static zval * sxe_dimension_read(zval *object, zval *offset TSRMLS_DC)
+static zval * sxe_dimension_read(zval *object, zval *offset, int type TSRMLS_DC)
{
return sxe_prop_dim_read(object, offset, 0, 1, 0 TSRMLS_CC);
}
@@ -1577,7 +1577,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.124 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.125 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug24573.phpt
zeevWed Feb 4 12:55:44 2004 EDT Modified files: /php-src/tests/lang bug24573.phpt Log: Update test (reason: can no longer assign to $this) http://cvs.php.net/diff.php/php-src/tests/lang/bug24573.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/lang/bug24573.phpt diff -u php-src/tests/lang/bug24573.phpt:1.1 php-src/tests/lang/bug24573.phpt:1.2 --- php-src/tests/lang/bug24573.phpt:1.1Fri Jul 18 08:24:49 2003 +++ php-src/tests/lang/bug24573.phptWed Feb 4 12:55:44 2004 @@ -9,7 +9,7 @@ $this = null; debug_backtrace(); $this = $__this; - } + } } $f = new Foo; @@ -19,5 +19,6 @@ echo "OK\n"; ?> ---EXPECT-- -OK +--EXPECTF-- + +Fatal error: Cannot re-assign $this in %s on line %d \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes final_redeclare.phpt
zeevWed Feb 4 12:47:36 2004 EDT
Modified files:
/php-src/tests/classes final_redeclare.phpt
Log:
Update test (reason: early binding changes its behavior)
http://cvs.php.net/diff.php/php-src/tests/classes/final_redeclare.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/final_redeclare.phpt
diff -u php-src/tests/classes/final_redeclare.phpt:1.2
php-src/tests/classes/final_redeclare.phpt:1.3
--- php-src/tests/classes/final_redeclare.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/final_redeclare.phpt Wed Feb 4 12:47:35 2004
@@ -12,7 +12,6 @@
}
$t = new pass();
-$t->show();
class fail extends pass {
function show() {
@@ -23,6 +22,4 @@
echo "Done\n"; // Shouldn't be displayed
?>
--EXPECTF--
-Call to function pass::show()
-
Fatal error: Cannot override final method pass::show() in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes class_final.phpt
zeevWed Feb 4 12:45:10 2004 EDT
Modified files:
/php-src/tests/classes class_final.phpt
Log:
Update test (reason: early binding changes its behavior)
http://cvs.php.net/diff.php/php-src/tests/classes/class_final.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/class_final.phpt
diff -u php-src/tests/classes/class_final.phpt:1.2
php-src/tests/classes/class_final.phpt:1.3
--- php-src/tests/classes/class_final.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/class_final.phpt Wed Feb 4 12:45:08 2004
@@ -12,7 +12,6 @@
}
$t = new base();
-$t->show();
class derived extends base {
}
@@ -20,6 +19,4 @@
echo "Done\n"; // shouldn't be displayed
?>
--EXPECTF--
-base
-
Fatal error: Class derived may not inherit from final class (base) in %s on line %d
--
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
zeevWed Feb 4 07:45:57 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
kill warning
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.116&r2=1.117&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.116 php-src/ext/sqlite/sqlite.c:1.117
--- php-src/ext/sqlite/sqlite.c:1.116 Wed Feb 4 06:14:35 2004
+++ php-src/ext/sqlite/sqlite.c Wed Feb 4 07:45:56 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+--+
- $Id: sqlite.c,v 1.116 2004/02/04 11:14:35 zeev Exp $
+ $Id: sqlite.c,v 1.117 2004/02/04 12:45:56 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -791,7 +791,7 @@
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(intern->std.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
- retval->handle = zend_objects_store_put(intern, NULL,
sqlite_object_free_storage, NULL TSRMLS_CC);
+ retval->handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
retval->handlers = handlers;
}
@@ -1054,7 +1054,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.116 2004/02/04 11:14:35 zeev Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.117 2004/02/04 12:45:56 zeev 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();
--
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_directory.c spl_iterators.c
zeevWed Feb 4 07:45:48 2004 EDT
Modified files:
/php-src/ext/splspl_array.c spl_directory.c spl_iterators.c
Log:
API updates
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.30 php-src/ext/spl/spl_array.c:1.31
--- php-src/ext/spl/spl_array.c:1.30Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_array.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.30 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_array.c,v 1.31 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -75,8 +75,8 @@
HashPosition pos;
} spl_array_object;
-/* {{{ spl_array_object_dtor */
-static void spl_array_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+/* {{{ spl_array_object_free_storage */
+static void spl_array_object_free_storage(void *object TSRMLS_DC)
{
spl_array_object *intern = (spl_array_object *)object;
@@ -114,7 +114,7 @@
}
zend_hash_internal_pointer_reset_ex(HASH_OF(intern->array), &intern->pos);
- retval.handle = zend_objects_store_put(intern, spl_array_object_dtor, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL TSRMLS_CC);
if (class_type == spl_ce_ArrayIterator) {
retval.handlers = &spl_handler_ArrayIterator;
} else {
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.21 php-src/ext/spl/spl_directory.c:1.22
--- php-src/ext/spl/spl_directory.c:1.21Fri Jan 23 16:33:56 2004
+++ php-src/ext/spl/spl_directory.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.21 2004/01/23 21:33:56 helly Exp $ */
+/* $Id: spl_directory.c,v 1.22 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -50,9 +50,9 @@
zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-/* {{{ spl_ce_dir_object_dtor */
+/* {{{ spl_ce_dir_object_free_storage */
/* close all resources and the memory allocated for the object */
-static void spl_ce_dir_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void spl_ce_dir_object_free_storage(void *object TSRMLS_DC)
{
spl_ce_dir_object *intern = (spl_ce_dir_object *)object;
@@ -99,7 +99,7 @@
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(intern->std.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern, spl_ce_dir_object_dtor, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_ce_dir_object_free_storage, NULL TSRMLS_CC);
retval.handlers = &spl_ce_dir_handlers;
return retval;
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.18 php-src/ext/spl/spl_iterators.c:1.19
--- php-src/ext/spl/spl_iterators.c:1.18Wed Jan 28 17:59:03 2004
+++ php-src/ext/spl/spl_iterators.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.18 2004/01/28 22:59:03 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.19 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -413,7 +413,7 @@
}
/* {{{ spl_RecursiveIteratorIterator_dtor */
-static void spl_RecursiveIteratorIterator_dtor(void *_object, zend_object_handle
handle TSRMLS_DC)
+static void spl_RecursiveIteratorIterator_free_storage(void *_object TSRMLS_DC)
{
spl_recursive_it_object *object = (spl_recursive_it_object *)_object;
zend_object_iterator *sub_iter;
@@ -449,7 +449,7 @@
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(intern->std.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern,
spl_RecursiveIteratorIterator_dtor, NULL TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_RecursiveIteratorIterator_free_storage, NULL
TSRMLS_CC);
retval.handlers = &spl_handlers_rec_it_it;
return retval;
}
@@ -791,8 +791,8 @@
zval_ptr_dtor(&retva
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c php_com_dotnet_internal.h /ext/dom php_dom.c /ext/mono php_mono.c /ext/mysqli mysqli.c /ext/sqlite sqlite.c /ext/tidy php_tidy.h tidy.c /ext/xsl php_xsl.c php_xsl.h
zeevWed Feb 4 06:14:48 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c
php_com_dotnet_internal.h
/php-src/ext/domphp_dom.c
/php-src/ext/mono php_mono.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy php_tidy.h tidy.c
/php-src/ext/xslphp_xsl.c php_xsl.h
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.13
php-src/ext/com_dotnet/com_handlers.c:1.14
--- php-src/ext/com_dotnet/com_handlers.c:1.13 Tue Jan 13 11:05:38 2004
+++ php-src/ext/com_dotnet/com_handlers.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.13 2004/01/13 16:05:38 wez Exp $ */
+/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -554,7 +554,7 @@
}
}
-void php_com_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+void php_com_object_free_storage(void *object TSRMLS_DC)
{
php_com_dotnet_object *obj = (php_com_dotnet_object*)object;
@@ -616,7 +616,8 @@
obj->code_page = CP_ACP;
obj->ce = ce;
- retval.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+
+ retval.handle = zend_objects_store_put(obj, NULL, php_com_object_free_storage,
php_com_object_clone TSRMLS_CC);
retval.handlers = &php_com_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.3 php-src/ext/com_dotnet/com_misc.c:1.4
--- php-src/ext/com_dotnet/com_misc.c:1.3 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_misc.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_misc.c,v 1.3 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_misc.c,v 1.4 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,7 +60,7 @@
IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
Z_TYPE_P(z) = IS_OBJECT;
- z->value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z->value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z->value.obj.handlers = &php_com_object_handlers;
}
@@ -83,7 +83,7 @@
Z_TYPE_P(z) = IS_OBJECT;
- z->value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z->value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z->value.obj.handlers = &php_com_object_handlers;
}
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.2
php-src/ext/com_dotnet/com_saproxy.c:1.3
--- php-src/ext/com_dotnet/com_saproxy.c:1.2Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_saproxy.cWed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.2 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_saproxy.c,v 1.3 2004/02/04 11:14:30 zeev Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -261,7 +261,7 @@
saproxy_object_cast
};
-static void saproxy_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void saproxy_free_storage(void *object TSRMLS_DC)
{
php_com_saproxy *proxy = (php_com_saproxy *)object;
@@ -313,7 +313,7 @@
proxy->indices[proxy->dimensions-1] = index;
Z_TYPE_P(proxy_out) = IS_OBJECT;
- Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, saproxy_dtor,
saproxy_clone TSRMLS_CC);
+ Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, NULL,
saproxy_free_storage, saproxy_clone TSRMLS_CC);
Z_OBJ_HT_P(proxy_out) = &php_com_saproxy_handlers;
return 1;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.9
---
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Feb 4 06:12:39 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.123&r2=1.124&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.123 php-src/ext/simplexml/simplexml.c:1.124
--- php-src/ext/simplexml/simplexml.c:1.123 Mon Feb 2 03:10:31 2004
+++ php-src/ext/simplexml/simplexml.c Wed Feb 4 06:12:31 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.123 2004/02/02 08:10:31 sniper Exp $ */
+/* $Id: simplexml.c,v 1.124 2004/02/04 11:12:31 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -114,16 +114,16 @@
/* {{{ match_ns()
*/
-static inline int
+static inline int
match_ns(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name)
{
if (name == NULL && (node->ns == NULL || node->ns->prefix == NULL)) {
return 1;
}
-
+
if (node->ns && !xmlStrcmp(node->ns->href, name)) {
return 1;
- }
+ }
return 0;
}
@@ -392,7 +392,7 @@
newnode = node;
++counter;
}
-
+
next_iter:
node = node->next;
}
@@ -459,7 +459,7 @@
xmlNodePtr node;
xmlAttrPtr attr = NULL;
int exists = 0;
-
+
sxe = php_sxe_fetch_object(object TSRMLS_CC);
name = Z_STRVAL_P(member);
@@ -488,7 +488,7 @@
exists = 1;
break;
}
-
+
attr = attr->next;
}
}
@@ -568,9 +568,9 @@
node = node->children;
while (node) {
nnext = node->next;
-
+
SKIP_TEXT(node);
-
+
if (!xmlStrcmp(node->name, Z_STRVAL_P(member))) {
xmlUnlinkNode(node);
php_libxml_node_free_resource(node TSRMLS_CC);
@@ -613,7 +613,7 @@
xmlChar*contents;
MAKE_STD_ZVAL(*value);
-
+
if (node->children && node->children->type == XML_TEXT_NODE &&
!xmlIsBlankNode(node->children)) {
contents = xmlNodeListGetString(node->doc, node->children, 1);
if (contents) {
@@ -676,7 +676,7 @@
goto next_iter;
}
}
-
+
name = (char *) node->name;
if (!name) {
goto next_iter;
@@ -685,7 +685,7 @@
}
_get_base_node_value(sxe, node, &value TSRMLS_CC);
-
+
h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void **)
&data_ptr) == SUCCESS) {
if (Z_TYPE_PP(data_ptr) == IS_ARRAY) {
@@ -738,7 +738,7 @@
/* }}} */
/* {{{ xpath()
- */
+ */
SXE_METHOD(xpath)
{
php_sxe_object*sxe;
@@ -813,7 +813,7 @@
add_next_index_zval(return_value, value);
}
}
-
+
xmlXPathFreeObject(retval);
}
/* }}} */
@@ -838,10 +838,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename,
&filename_len) == FAILURE) {
RETURN_FALSE;
}
-
+
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
GET_NODE(sxe, node);
-
+
if (node) {
if (XML_DOCUMENT_NODE == node->parent->type) {
xmlSaveFile(filename, (xmlDocPtr) sxe->document->ptr);
@@ -850,7 +850,7 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
+ }
xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 1, NULL);
xmlOutputBufferClose(outbuf);
@@ -873,11 +873,11 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
[PHP-CVS] cvs: php-src /ext/standard http.c
zeevTue Jan 6 15:38:01 2004 EDT
Modified files:
/php-src/ext/standard http.c
Log:
Fix C++ style declaration
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.9 php-src/ext/standard/http.c:1.10
--- php-src/ext/standard/http.c:1.9 Tue Jan 6 15:07:06 2004
+++ php-src/ext/standard/http.c Tue Jan 6 15:38:00 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.9 2004/01/06 20:07:06 iliaa Exp $ */
+/* $Id: http.c,v 1.10 2004/01/06 20:38:00 zeev Exp $ */
#include "php_http.h"
#include "php_ini.h"
@@ -62,12 +62,13 @@
/* handling for private & protected object properties */
if (*key == '\0' && type != NULL) {
+ char *tmp;
+
zend_object *zobj = zend_objects_get_address(type TSRMLS_CC);
if (zend_check_property_access(zobj, key TSRMLS_CC) !=
SUCCESS) {
/* private or protected property access outside of the
class */
continue;
}
- char *tmp;
zend_unmangle_property_name(key, &tmp, &key);
key_len = strlen(key);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h
zeevSun Dec 21 13:30:58 2003 EDT Modified files: /php-srcconfigure.in /php-src/main php_version.h Log: B3 here we go (away) Index: php-src/configure.in diff -u php-src/configure.in:1.487 php-src/configure.in:1.488 --- php-src/configure.in:1.487 Sun Dec 21 13:26:29 2003 +++ php-src/configure.inSun Dec 21 13:30:57 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.487 2003/12/21 18:26:29 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.488 2003/12/21 18:30:57 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION="b3" +EXTRA_VERSION="RC1" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.76 php-src/main/php_version.h:1.77 --- php-src/main/php_version.h:1.76 Sun Dec 21 13:26:29 2003 +++ php-src/main/php_version.h Sun Dec 21 13:30:57 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b3" -#define PHP_VERSION "5.0.0b3" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.0.0RC1" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
zeevSun Dec 21 13:30:32 2003 EDT Modified files: /php-srcNEWS Log: Update date Index: php-src/NEWS diff -u php-src/NEWS:1.1549 php-src/NEWS:1.1550 --- php-src/NEWS:1.1549 Fri Dec 19 12:13:20 2003 +++ php-src/NEWSSun Dec 21 13:30:31 2003 @@ -1,6 +1,6 @@ PHPNEWS ||| -19 Dec 2003, PHP 5 Beta 3 +21 Dec 2003, PHP 5 Beta 3 - Bundled new tidy extension (John, Wez) - Upgraded PCRE library to version 4.5. (Andrei) - Dropped Windows 95 support. (Andi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h
zeevSun Dec 21 13:26:31 2003 EDT Modified files: /php-srcconfigure.in /php-src/main php_version.h Log: B3 here we come Index: php-src/configure.in diff -u php-src/configure.in:1.486 php-src/configure.in:1.487 --- php-src/configure.in:1.486 Sat Dec 20 16:27:48 2003 +++ php-src/configure.inSun Dec 21 13:26:29 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.486 2003/12/20 21:27:48 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.487 2003/12/21 18:26:29 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION="b3-dev" +EXTRA_VERSION="b3" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.75 php-src/main/php_version.h:1.76 --- php-src/main/php_version.h:1.75 Sat Dec 20 16:27:49 2003 +++ php-src/main/php_version.h Sun Dec 21 13:26:29 2003 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b3-dev" -#define PHP_VERSION "5.0.0b3-dev" +#define PHP_EXTRA_VERSION "b3" +#define PHP_VERSION "5.0.0b3" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevSun Dec 14 17:10:54 2003 EDT Modified files: /CVSROOTavail Log: Add engine karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.799 CVSROOT/avail:1.800 --- CVSROOT/avail:1.799 Fri Dec 12 04:26:49 2003 +++ CVSROOT/avail Sun Dec 14 17:10:51 2003 @@ -21,7 +21,7 @@ # People who work on the Engine -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
zeevSun Dec 14 07:32:36 2003 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Cleanup
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.645
php-src/ext/standard/basic_functions.c:1.646
--- php-src/ext/standard/basic_functions.c:1.645Thu Dec 4 17:38:22 2003
+++ php-src/ext/standard/basic_functions.c Sun Dec 14 07:32:35 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.645 2003/12/04 22:38:22 wez Exp $ */
+/* $Id: basic_functions.c,v 1.646 2003/12/14 12:32:35 zeev Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -157,150 +157,6 @@
static void user_shutdown_function_dtor(php_shutdown_function_entry
*shutdown_function_entry);
static void user_tick_function_dtor(user_tick_function_entry *tick_function_entry);
-/* Demo code. Enable only if you need this. */
-#define ENABLE_TEST_CLASS 0
-
-#if ENABLE_TEST_CLASS
-void test_class_startup(void);
-pval test_class_get_property(zend_property_reference *property_reference);
-int test_class_set_property(zend_property_reference *property_reference, pval *value);
-void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference
*property_reference);
-
-pval test_class_get_property(zend_property_reference *property_reference)
-{
- pval result;
- zend_overloaded_element *overloaded_property;
- zend_llist_element *element;
-
- printf("Reading a property from a OverloadedTestClass object:\n");
-
- for (element = property_reference->elements_list->head; element; element =
element->next) {
- overloaded_property = (zend_overloaded_element *) element->data;
-
- switch (Z_TYPE_P(overloaded_property)) {
-
- case OE_IS_ARRAY:
- printf("Array offset: ");
- break;
-
- case OE_IS_OBJECT:
- printf("Object property: ");
- break;
- }
-
- switch (Z_TYPE(overloaded_property->element)) {
-
- case IS_LONG:
- printf("%ld (numeric)\n",
Z_LVAL(overloaded_property->element));
- break;
-
- case IS_STRING:
- printf("'%s'\n",
Z_STRVAL(overloaded_property->element));
- break;
- }
- pval_destructor(&overloaded_property->element);
- }
-
- Z_STRVAL(result) = estrndup("testing", 7);
- Z_STRLEN(result) = 7;
- Z_TYPE(result) = IS_STRING;
- return result;
-}
-
-int test_class_set_property(zend_property_reference *property_reference, pval * value)
-{
- zend_overloaded_element *overloaded_property;
- zend_llist_element *element;
-
- printf("Writing to a property from a OverloadedTestClass object:\n");
- printf("Writing '");
- zend_print_variable(value);
- printf("'\n");
-
- for (element = property_reference->elements_list->head; element; element =
element->next) {
- overloaded_property = (zend_overloaded_element *) element->data;
-
- switch (Z_TYPE_P(overloaded_property)) {
-
- case OE_IS_ARRAY:
- printf("Array offset: ");
- break;
-
- case OE_IS_OBJECT:
- printf("Object property: ");
- break;
- }
-
- switch (Z_TYPE(overloaded_property->element)) {
-
- case IS_LONG:
- printf("%ld (numeric)\n",
Z_LVAL(overloaded_property->element));
- break;
-
- case IS_STRING:
- printf("'%s'\n",
Z_STRVAL(overloaded_property->element));
- break;
- }
- pval_destructor(&overloaded_property->element);
- }
- return 0;
-}
-
-void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference
*property_reference)
-{
- zend_overloaded_element *overloaded_property;
- zend_llist_element *element;
-
- printf("Invoking a method on OverloadedTestClass object:\n");
-
- for (element = property_reference->elements_list->head; element; element =
element->next) {
- overloaded_prope
[PHP-CVS] cvs: CVSROOT / avail
zeevMon Dec 8 13:37:11 2003 EDT Modified files: /CVSROOTavail Log: Add karma Index: CVSROOT/avail diff -u CVSROOT/avail:1.792 CVSROOT/avail:1.793 --- CVSROOT/avail:1.792 Sun Dec 7 16:40:15 2003 +++ CVSROOT/avail Mon Dec 8 13:37:10 2003 @@ -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|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,phpdoc,pecl,pear,peardoc,spl,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-pt # People who work on the Engine -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c /ext/mono php_mono.c /ext/simplexml simplexml.c
zeevTue Oct 7 11:47:24 2003 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/mono php_mono.c
/php-src/ext/simplexml simplexml.c
Log:
Fix cast callbacks
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.3
php-src/ext/com_dotnet/com_handlers.c:1.4
--- php-src/ext/com_dotnet/com_handlers.c:1.3 Sun Oct 5 04:08:44 2003
+++ php-src/ext/com_dotnet/com_handlers.c Tue Oct 7 11:47:22 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.3 2003/10/05 08:08:44 zeev Exp $ */
+/* $Id: com_handlers.c,v 1.4 2003/10/07 15:47:22 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -445,7 +445,7 @@
return ret;
}
-static void com_object_cast(zval *readobj, zval *writeobj, int type, int should_free
TSRMLS_DC)
+static int com_object_cast(zval *readobj, zval *writeobj, int type, int should_free
TSRMLS_DC)
{
php_com_dotnet_object *obj;
VARIANT v;
@@ -463,12 +463,12 @@
if (V_VT(&obj->v) == VT_DISPATCH) {
if (!obj->have_default_bind && !com_get_default_binding(obj
TSRMLS_CC)) {
- return;
+ return FAILURE;
}
if (FAILURE == php_com_do_invoke_by_id(obj, obj->default_bind,
DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v, 0, NULL
TSRMLS_CC)) {
- return;
+ return FAILURE;
}
} else {
VariantCopy(&v, &obj->v);
@@ -495,6 +495,7 @@
php_com_zval_from_variant(writeobj, &v, obj->code_page TSRMLS_CC);
VariantClear(&v);
+ return SUCCESS;
}
zend_object_handlers php_com_object_handlers = {
Index: php-src/ext/mono/php_mono.c
diff -u php-src/ext/mono/php_mono.c:1.9 php-src/ext/mono/php_mono.c:1.10
--- php-src/ext/mono/php_mono.c:1.9 Sun Oct 5 04:08:47 2003
+++ php-src/ext/mono/php_mono.c Tue Oct 7 11:47:22 2003
@@ -16,7 +16,7 @@
+------+
*/
-/* $Id: php_mono.c,v 1.9 2003/10/05 08:08:47 zeev Exp $ */
+/* $Id: php_mono.c,v 1.10 2003/10/07 15:47:22 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -712,7 +712,7 @@
return mono_class_entry;
}
-static void
+static int
cast_object(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_DC)
{
php_mono_object *pm;
@@ -729,7 +729,10 @@
case IS_DOUBLE:
php_call_mono_method(pm, "ToDouble", sizeof("ToDouble")-1,
(void **) NULL, 0, &writeobj TSRMLS_CC);
break;
- }
+ default:
+ return FAILURE;
+ }
+ return SUCCESS;
}
static zend_object_handlers mono_object_handlers[] = {
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.63 php-src/ext/simplexml/simplexml.c:1.64
--- php-src/ext/simplexml/simplexml.c:1.63 Sun Oct 5 21:04:49 2003
+++ php-src/ext/simplexml/simplexml.c Tue Oct 7 11:47:23 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.63 2003/10/06 01:04:49 moriyoshi Exp $ */
+/* $Id: simplexml.c,v 1.64 2003/10/07 15:47:23 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -724,7 +724,7 @@
/* {{{ cast_object()
*/
-static void
+static int
cast_object(zval *object, int type, char *contents TSRMLS_DC)
{
if (contents) {
@@ -744,18 +744,22 @@
case IS_DOUBLE:
convert_to_double(object);
break;
+ default:
+ return FAILURE;
}
+ return SUCCESS;
}
/* }}} */
/* {{{ sxe_object_cast()
*/
-static void
+static int
sxe_object_cast(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_DC)
{
php_sxe_object *sxe;
char *contents = NULL;
zval free_obj;
+ int rv;
sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
if (should_free) {
@@ -774,7 +778,7 @@
}
}
- cast_object(writeobj, type, contents TSRMLS_CC);
+ rv = cast_object(writeobj, type, contents TSRMLS_CC);
if (contents) {
xmlFree(contents);
@@ -782,6 +786,7 @@
if (should_free) {
zval_dtor(&free_obj);
}
+ return rv;
}
/* }}} */
@@ -1070,7 +1075,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.63 $");
+ php_info_print_table_row(2, "Re
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c /ext/dom php_dom.c /ext/mono php_mono.c /ext/simplexml simplexml.c /ext/standard math.c
zeevSun Oct 5 04:08:50 2003 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/domphp_dom.c
/php-src/ext/mono php_mono.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/standard math.c
Log:
Sync with new API
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.2
php-src/ext/com_dotnet/com_handlers.c:1.3
--- php-src/ext/com_dotnet/com_handlers.c:1.2 Mon Aug 18 00:41:48 2003
+++ php-src/ext/com_dotnet/com_handlers.c Sun Oct 5 04:08:44 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.2 2003/08/18 04:41:48 iliaa Exp $ */
+/* $Id: com_handlers.c,v 1.3 2003/10/05 08:08:44 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -204,15 +204,6 @@
}
}
-static zval **com_property_get_ptr(zval *object, zval *member TSRMLS_DC)
-{
- zval **prop_ptr;
-
- prop_ptr = emalloc(sizeof(zval **));
- *prop_ptr = com_property_read(object, member, 0 TSRMLS_CC);
- return prop_ptr;
-}
-
static void com_object_set(zval **property, zval *value TSRMLS_DC)
{
/* Not yet implemented in the engine */
@@ -512,8 +503,7 @@
com_property_write,
com_read_dimension,
com_write_dimension,
- com_property_get_ptr,
- com_property_get_ptr,
+ NULL,
com_object_get,
com_object_set,
com_property_exists,
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.33 php-src/ext/dom/php_dom.c:1.34
--- php-src/ext/dom/php_dom.c:1.33 Mon Sep 29 07:43:26 2003
+++ php-src/ext/dom/php_dom.c Sun Oct 5 04:08:46 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.33 2003/09/29 11:43:26 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.34 2003/10/05 08:08:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -441,7 +441,6 @@
memcpy(&dom_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
dom_object_handlers.read_property = dom_read_property;
dom_object_handlers.write_property = dom_write_property;
- dom_object_handlers.get_property_ptr = dom_property_get_ptr;
zend_hash_init(&classes, 0, NULL, NULL, 1);
Index: php-src/ext/mono/php_mono.c
diff -u php-src/ext/mono/php_mono.c:1.8 php-src/ext/mono/php_mono.c:1.9
--- php-src/ext/mono/php_mono.c:1.8 Mon Aug 11 20:55:57 2003
+++ php-src/ext/mono/php_mono.c Sun Oct 5 04:08:47 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mono.c,v 1.8 2003/08/12 00:55:57 iliaa Exp $ */
+/* $Id: php_mono.c,v 1.9 2003/10/05 08:08:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -736,7 +736,6 @@
ZEND_OBJECTS_STORE_HANDLERS,
property_read,
property_write,
- property_get_ptr,
property_get_ptr,
NULL,
NULL,
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.60 php-src/ext/simplexml/simplexml.c:1.61
--- php-src/ext/simplexml/simplexml.c:1.60 Thu Oct 2 15:45:05 2003
+++ php-src/ext/simplexml/simplexml.c Sun Oct 5 04:08:48 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.60 2003/10/02 19:45:05 moriyoshi Exp $ */
+/* $Id: simplexml.c,v 1.61 2003/10/05 08:08:48 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -264,41 +264,6 @@
}
/* }}} */
-/* {{{ sxe_property_get_ptr()
- */
-static zval **
-sxe_property_get_ptr(zval *object, zval *member TSRMLS_DC)
-{
-#if 0
- zval **property_ptr;
- zval *property;
-
- property_ptr = emalloc(sizeof(zval **));
-
- property = sxe_property_read(object, member, 0 TSRMLS_CC);
-
- *property_ptr = property;
-
- return property_ptr;
-#else
- /* necessary voodoo hack */
- struct compounded_zval_ptr {
- zval zv;
- zval *pzv;
- };
-
- zval *property;
-
- property = sxe_property_read(object, member, 0 TSRMLS_CC);
- property = erealloc(property, sizeof(struct compounded_zval_ptr));
-
- ((struct compounded_zval_ptr *)property)->pzv = property;
-
- return &((struct compounded_zval_ptr *)property)->pzv;
-#endif
-}
-/* }}} */
-
/* {{{ sxe_property_exists()
*/
static int
@@ -830,8 +795,7 @@
sxe_property_write,
NULL,
NULL,
- sxe_property_get_ptr,
- sxe_property_get_ptr,
+ NULL,
sxe_object_get,
sxe_object_set,
sxe_property_exists,
@@ -1085,7 +1049,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "en
Re: [PHP-CVS] cvs: php-src /main SAPI.c /main/streams streams.c userspace.c /tests/lang bug24054.phpt
I don't think %zd is portable. We need to come up with some alternative
solution, or some check.
Zeev
At 18:27 13/09/2003, Ard Biesheuvel wrote:
abies Sat Sep 13 11:27:11 2003 EDT
Modified files:
/php-src/main SAPI.c
/php-src/main/streams streams.c userspace.c
/php-src/tests/lang bug24054.phpt
Log:
Fixed for 64bit archs
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.178 php-src/main/SAPI.c:1.179
--- php-src/main/SAPI.c:1.178 Wed Sep 10 04:47:37 2003
+++ php-src/main/SAPI.c Sat Sep 13 11:27:04 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.178 2003/09/10 08:47:37 sr Exp $ */
+/* $Id: SAPI.c,v 1.179 2003/09/13 15:27:04 abies Exp $ */
#include
#include
@@ -517,7 +517,7 @@
switch (op) {
case SAPI_HEADER_SET_STATUS:
- sapi_update_response_code((int) arg TSRMLS_CC);
+ sapi_update_response_code((long) arg TSRMLS_CC);
return SUCCESS;
case SAPI_HEADER_REPLACE:
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.35
php-src/main/streams/streams.c:1.36
--- php-src/main/streams/streams.c:1.35 Thu Sep 11 01:07:26 2003
+++ php-src/main/streams/streams.c Sat Sep 13 11:27:08 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.35 2003/09/11 05:07:26 iliaa Exp $ */
+/* $Id: streams.c,v 1.36 2003/09/13 15:27:08 abies Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -368,7 +368,7 @@
* as leaked; it will log a warning, but lets help
it out and display what kind
* of stream it was. */
char leakbuf[512];
- snprintf(leakbuf, sizeof(leakbuf), __FILE__ "(%d)
: Stream of type '%s' 0x%08X (path:%s) was not closed\n", __LINE__,
stream->ops->label, (unsigned int)stream, stream->__orig_path);
+ snprintf(leakbuf, sizeof(leakbuf), __FILE__ "(%d)
: Stream of type '%s' %p (path:%s) was not closed\n", __LINE__,
stream->ops->label, stream, stream->__orig_path);
if (stream->__orig_path) {
pefree(stream->__orig_path,
stream->is_persistent);
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.9
php-src/main/streams/userspace.c:1.10
--- php-src/main/streams/userspace.c:1.9Mon Jun 16 15:13:39 2003
+++ php-src/main/streams/userspace.cSat Sep 13 11:27:08 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.9 2003/06/16 19:13:39 pollita Exp $ */
+/* $Id: userspace.c,v 1.10 2003/09/13 15:27:08 abies Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -430,7 +430,7 @@
/* don't allow strange buffer overruns due to bogus return */
if (didwrite > count) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_WRITE " wrote %d bytes more data than requested (%d written, %d
max)",
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_WRITE " wrote %zd bytes more data than requested (%zd written,
%zd max)",
us->wrapper->classname,
didwrite - count, didwrite, count);
didwrite = count;
@@ -471,7 +471,7 @@
convert_to_string(retval);
didread = Z_STRLEN_P(retval);
if (didread > count) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_READ " - read %d bytes more data than requested (%d read, %d
max) - excess data will be lost",
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_READ " - read %zd bytes more data than requested (%zd read, %zd
max) - excess data will be lost",
us->wrapper->classname, didread -
count, didread, count);
didread = count;
}
Index: php-src/tests/lang/bug24054.phpt
diff -u php-src/tests/lang/bug24054.phpt:1.1
php-src/tests/lang/bug24054.phpt:1.2
--- php-src/tests/lang/bug24054.phpt:1.1Fri Jun 6 07:09:55 2003
+++ php-src/tests/lang/bug24054.phptSat Sep 13 11:27:09 2003
@@ -3,15 +3,24 @@
--FILE--
- $i = 1000;
- $i *= 1001;
+define('LONG_MAX', is_int(50)? 9223372036854775807 : 0x7FFF);
+define('LONG_MIN', -LONG_MAX - 1);
+printf("%d,%d,%d,%d\n",is_int(LONG_MIN ),is_int(LONG_MAX ),
+
is_int(LONG_MIN-1),is_int(LONG_MAX+1));
- $j = 1000;
- $j = $j * 1001;
+ $i = LONG_MAX;
- var
[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/gmp gmp.c /ext/ldap ldap.c /ext/mbstring mbstring.c /ext/mcve mcve.c /ext/mssql php_mssql.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext/sockets sockets.c /ext/sqlite sqlite.c /ext/sysvmsg sysvmsg.c /ext/xml xml.c /ext/xmlrpc xmlrpc-epi-php.c /ext/yaz php_yaz.c
zeevSun Aug 31 08:41:54 2003 EDT
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/gmpgmp.c
/php-src/ext/ldap ldap.c
/php-src/ext/mbstring mbstring.c
/php-src/ext/mcve mcve.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/oci8 oci8.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/opensslopenssl.c
/php-src/ext/oracle oracle.c
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/socketssockets.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sysvmsgsysvmsg.c
/php-src/ext/xmlxml.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/yazphp_yaz.c
Log:
Fix Win32 linkage problems
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.27 php-src/ext/curl/interface.c:1.28
--- php-src/ext/curl/interface.c:1.27 Tue Aug 5 19:50:59 2003
+++ php-src/ext/curl/interface.cSun Aug 31 08:41:34 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.27 2003/08/05 23:50:59 sniper Exp $ */
+/* $Id: interface.c,v 1.28 2003/08/31 12:41:34 zeev Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -96,6 +96,9 @@
#ifdef COMPILE_DL_CURL
ZEND_GET_MODULE (curl)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ PHP_MINFO_FUNCTION
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.34 php-src/ext/gmp/gmp.c:1.35
--- php-src/ext/gmp/gmp.c:1.34 Sun Aug 3 13:44:36 2003
+++ php-src/ext/gmp/gmp.c Sun Aug 31 08:41:35 2003
@@ -99,6 +99,9 @@
#ifdef COMPILE_DL_GMP
ZEND_GET_MODULE(gmp)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.144 php-src/ext/ldap/ldap.c:1.145
--- php-src/ext/ldap/ldap.c:1.144 Tue Aug 5 07:54:01 2003
+++ php-src/ext/ldap/ldap.c Sun Aug 31 08:41:36 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.144 2003/08/05 11:54:01 sniper Exp $ */
+/* $Id: ldap.c,v 1.145 2003/08/31 12:41:36 zeev Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -180,6 +180,9 @@
#ifdef COMPILE_DL_LDAP
ZEND_GET_MODULE(ldap)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
static void _close_ldap_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -299,7 +302,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.144 2003/08/05
11:54:01 sniper Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.145 2003/08/31
12:41:36 zeev Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.194 php-src/ext/mbstring/mbstring.c:1.195
--- php-src/ext/mbstring/mbstring.c:1.194 Mon Aug 25 17:54:26 2003
+++ php-src/ext/mbstring/mbstring.c Sun Aug 31 08:41:37 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.194 2003/08/25 21:54:26 helly Exp $ */
+/* $Id: mbstring.c,v 1.195 2003/08/31 12:41:37 zeev Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -227,6 +227,9 @@
#ifdef COMPILE_DL_MBSTRING
ZEND_GET_MODULE(mbstring)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ allocators */
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.25 php-src/ext/mcve/mcve.c:1.26
--- php-src/ext/mcve/mcve.c:1.25Thu Aug 28 20:53:45 2003
+++ php-src/ext/mcve/mcve.c Sun Aug 31 08:41:38 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.25 2003/08/29 00:53:45 sniper Exp $ */
+/* $Id: mcve.c,v 1.26 2003/08/31 12:41:38 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -150,6 +150,9 @@
/* declare the module for dynamic loading */
#ifdef COMPILE_DL_MCVE
ZEND_GET_MODULE(mcve)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
#endif
/* {{{ MCVE_CONN destructor */
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.121 php-src/ext/mssql/php_mssql.c:1.122
--- php-src/ext/mssql/php_mssql.c:1.121 Thu Aug 28 17:00:18 2003
+++ php-src/ext/mssql/php_mssql.c Sun Aug 31 08:41:39 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.121 2003/08/28 21:00:18 andrey Exp $ */
+/* $Id: php_mssql.c,v 1.122 2003/08/31
[PHP-CVS] cvs: php-src /main main.c
zeevWed Aug 20 19:00:08 2003 EDT
Modified files:
/php-src/main main.c
Log:
No need for those code blocks anymore...
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.566 php-src/main/main.c:1.567
--- php-src/main/main.c:1.566 Mon Aug 18 23:25:00 2003
+++ php-src/main/main.c Wed Aug 20 19:00:08 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.566 2003/08/19 03:25:00 wez Exp $ */
+/* $Id: main.c,v 1.567 2003/08/20 23:00:08 zeev Exp $ */
/* {{{ includes
*/
@@ -849,63 +849,58 @@
TSRMLS_FETCH();
switch (message) {
- case ZMSG_FAILED_INCLUDE_FOPEN: {
- php_error_docref("function.include" TSRMLS_CC,
E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')",
php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
- }
+ case ZMSG_FAILED_INCLUDE_FOPEN:
+ php_error_docref("function.include" TSRMLS_CC, E_WARNING,
"Failed opening '%s' for inclusion (include_path='%s')", php_strip_url_passwd((char *)
data), STR_PRINT(PG(include_path)));
break;
- case ZMSG_FAILED_REQUIRE_FOPEN: {
- php_error_docref("function.require" TSRMLS_CC,
E_COMPILE_ERROR, "Failed opening required '%s' (include_path='%s')",
php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
- }
+ case ZMSG_FAILED_REQUIRE_FOPEN:
+ php_error_docref("function.require" TSRMLS_CC,
E_COMPILE_ERROR, "Failed opening required '%s' (include_path='%s')",
php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path)));
break;
- case ZMSG_FAILED_HIGHLIGHT_FOPEN: {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed
opening '%s' for highlighting", php_strip_url_passwd((char *) data));
- }
+ case ZMSG_FAILED_HIGHLIGHT_FOPEN:
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed opening
'%s' for highlighting", php_strip_url_passwd((char *) data));
break;
case ZMSG_MEMORY_LEAK_DETECTED:
- case ZMSG_MEMORY_LEAK_REPEATED: {
+ case ZMSG_MEMORY_LEAK_REPEATED:
#if ZEND_DEBUG
- if ((EG(error_reporting)&E_WARNING) &&
PG(report_memleaks)) {
- char memory_leak_buf[512];
+ if ((EG(error_reporting)&E_WARNING) && PG(report_memleaks)) {
+ char memory_leak_buf[512];
- if (message==ZMSG_MEMORY_LEAK_DETECTED) {
- zend_mem_header *t = (zend_mem_header
*) data;
- void *ptr = (void *)((char
*)t+sizeof(zend_mem_header)+MEM_HEADER_PADDING);
-
- snprintf(memory_leak_buf, 512, "%s(%d)
: Freeing 0x%.8lX (%d bytes), script=%s\n", t->filename, t->lineno, (unsigned
long)ptr, t->size, SAFE_FILENAME(SG(request_info).path_translated));
- if (t->orig_filename) {
- char relay_buf[512];
+ if (message==ZMSG_MEMORY_LEAK_DETECTED) {
+ zend_mem_header *t = (zend_mem_header *) data;
+ void *ptr = (void *)((char
*)t+sizeof(zend_mem_header)+MEM_HEADER_PADDING);
+
+ snprintf(memory_leak_buf, 512, "%s(%d) :
Freeing 0x%.8lX (%d bytes), script=%s\n", t->filename, t->lineno, (unsigned long)ptr,
t->size, SAFE_FILENAME(SG(request_info).path_translated));
+ if (t->orig_filename) {
+ char relay_buf[512];
- snprintf(relay_buf, 512,
"%s(%d) : Actual location (location was relayed)\n", t->orig_filename, t->orig_lineno);
- strcat(memory_leak_buf,
relay_buf);
- }
- } else {
- unsigned long leak_count = (unsigned
long) data;
-
- snprintf(memory_leak_buf, 512, "Last
leak repeated %ld t
Re: [PHP-CVS] cvs: php-src /ext/dom php_dom.c
At 02:16 19/08/2003, Marcus Börger wrote:
Hello Zeev,
Tuesday, August 19, 2003, 1:13:25 AM, you wrote:
ZS> zeevMon Aug 18 19:13:25 2003 EDT
ZS> Modified files:
ZS> /php-src/ext/domphp_dom.c
ZS> Log:
ZS> Get rid of PZVAL_UNLOCK() - fix untested
ZS> Index: php-src/ext/dom/php_dom.c
ZS> diff -u php-src/ext/dom/php_dom.c:1.23 php-src/ext/dom/php_dom.c:1.24
ZS> --- php-src/ext/dom/php_dom.c:1.23 Sun Jul 27 16:21:36 2003
ZS> +++ php-src/ext/dom/php_dom.c Mon Aug 18 19:13:25 2003
ZS> @@ -18,7 +18,7 @@
ZS>
+--+
ZS> */
ZS> -/* $Id: php_dom.c,v 1.23 2003/07/27 20:21:36 rrichards Exp $ */
ZS> +/* $Id: php_dom.c,v 1.24 2003/08/18 23:13:25 zeev Exp $ */
ZS> #ifdef HAVE_CONFIG_H
ZS> #include "config.h"
ZS> @@ -306,8 +306,7 @@
ZS> ret = hnd->read_func(obj, &retval TSRMLS_CC);
ZS> if (ret == SUCCESS) {
ZS> /* ensure we're creating a temporary variable */
ZS> - retval->refcount = 1;
ZS> - PZVAL_UNLOCK(retval);
ZS> + retval->refcount = 0;
ZS> } else {
ZS> retval = EG(uninitialized_zval_ptr);
ZS> }
Ah! yes, thanks!
What? :)
Zeev
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom php_dom.c
zeevMon Aug 18 19:13:25 2003 EDT
Modified files:
/php-src/ext/domphp_dom.c
Log:
Get rid of PZVAL_UNLOCK() - fix untested
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.23 php-src/ext/dom/php_dom.c:1.24
--- php-src/ext/dom/php_dom.c:1.23 Sun Jul 27 16:21:36 2003
+++ php-src/ext/dom/php_dom.c Mon Aug 18 19:13:25 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.23 2003/07/27 20:21:36 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.24 2003/08/18 23:13:25 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -306,8 +306,7 @@
ret = hnd->read_func(obj, &retval TSRMLS_CC);
if (ret == SUCCESS) {
/* ensure we're creating a temporary variable */
- retval->refcount = 1;
- PZVAL_UNLOCK(retval);
+ retval->refcount = 0;
} else {
retval = EG(uninitialized_zval_ptr);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevMon Aug 18 18:33:15 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix a gazillion leaks in SimpleXML. One gazillion to go ;)
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.56 php-src/ext/simplexml/simplexml.c:1.57
--- php-src/ext/simplexml/simplexml.c:1.56 Mon Aug 18 07:26:12 2003
+++ php-src/ext/simplexml/simplexml.c Mon Aug 18 18:33:15 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.56 2003/08/18 11:26:12 zeev Exp $ */
+/* $Id: simplexml.c,v 1.57 2003/08/18 22:33:15 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -181,6 +181,9 @@
return_value = value;
}
+ return_value->refcount = 0;
+ return_value->is_ref = 0;
+
return return_value;
}
/* }}} */
@@ -487,7 +490,7 @@
zend_internal_function *f;
f = emalloc(sizeof(zend_internal_function));
- f->type = ZEND_OVERLOADED_FUNCTION;
+ f->type = ZEND_OVERLOADED_FUNCTION_TEMPORARY;
f->arg_info = NULL;
f->num_args = 0;
f->scope = sxe_class_entry;
@@ -630,15 +633,19 @@
simplexml_ce_to_xml_string(INTERNAL_FUNCTION_PARAMETERS)
{
php_sxe_object *sxe;
+ xmlChar *strval;
+
if (ZEND_NUM_ARGS() != 0) {
RETURN_FALSE;
}
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
- xmlDocDumpMemory((xmlDocPtr) sxe->document->ptr, (xmlChar **)
&Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value));
+ xmlDocDumpMemory((xmlDocPtr) sxe->document->ptr, &strval,
&Z_STRLEN_P(return_value));
+ Z_STRVAL_P(return_value) = estrndup(strval, Z_STRLEN_P(return_value));
+ xmlFree(strval);
+
Z_TYPE_P(return_value) = IS_STRING;
- zval_add_ref(&return_value);
}
/* }}} */
@@ -744,10 +751,11 @@
{
php_sxe_object *sxe;
char *contents = NULL;
+ zval free_obj;
sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
if (should_free) {
- zval_dtor(writeobj);
+ free_obj = *writeobj;
}
if (!sxe->node) {
@@ -767,6 +775,9 @@
if (contents) {
xmlFree(contents);
}
+ if (should_free) {
+ zval_dtor(&free_obj);
+ }
}
/* }}} */
@@ -1056,7 +1067,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.56 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.57 $");
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevMon Aug 18 18:31:29 2003 EDT
Modified files:
/php-src/main main.c
Log:
Improve tracking
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.564 php-src/main/main.c:1.565
--- php-src/main/main.c:1.564 Mon Aug 11 01:24:42 2003
+++ php-src/main/main.c Mon Aug 18 18:31:29 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.564 2003/08/11 05:24:42 fujimoto Exp $ */
+/* $Id: main.c,v 1.565 2003/08/18 22:31:29 zeev Exp $ */
/* {{{ includes
*/
@@ -867,10 +867,10 @@
break;
case ZMSG_MEMORY_LEAK_DETECTED:
case ZMSG_MEMORY_LEAK_REPEATED: {
+#if ZEND_DEBUG
TSRMLS_FETCH();
if ((EG(error_reporting)&E_WARNING) &&
PG(report_memleaks)) {
-#if ZEND_DEBUG
char memory_leak_buf[512];
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
@@ -894,9 +894,26 @@
# else
fprintf(stderr, "%s", memory_leak_buf);
# endif
+ }
+ }
#endif
+ break;
+ case ZMSG_MEMORY_LEAKS_GRAND_TOTAL: {
+#if ZEND_DEBUG
+ TSRMLS_FETCH();
+
+ if ((EG(error_reporting)&E_WARNING) &&
PG(report_memleaks)) {
+ char memory_leak_buf[512];
+
+ snprintf(memory_leak_buf, 512, "=== Total %d
memory leaks detected ===\n", *((zend_uint *) data));
+# if defined(PHP_WIN32)
+ OutputDebugString(memory_leak_buf);
+# else
+ fprintf(stderr, "%s", memory_leak_buf);
+# endif
}
}
+#endif
break;
case ZMSG_LOG_SCRIPT_NAME: {
struct tm *ta, tmbuf;
--
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_extension.c
zeevMon Aug 18 16:45:00 2003 EDT Modified files: /php-src/ext/com_dotnet com_extension.c Log: Fix leak - non persistent hashes cannot be used in MINIT! Index: php-src/ext/com_dotnet/com_extension.c diff -u php-src/ext/com_dotnet/com_extension.c:1.1 php-src/ext/com_dotnet/com_extension.c:1.2 --- php-src/ext/com_dotnet/com_extension.c:1.1 Thu Aug 14 12:49:55 2003 +++ php-src/ext/com_dotnet/com_extension.c Mon Aug 18 16:45:00 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: com_extension.c,v 1.1 2003/08/14 16:49:55 wez Exp $ */ +/* $Id: com_extension.c,v 1.2 2003/08/18 20:45:00 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -118,7 +118,7 @@ ce.create_object = php_com_object_new; zend_register_internal_class_ex(&ce, php_com_variant_class_entry, "variant" TSRMLS_CC); - zend_ts_hash_init(&php_com_typelibraries, 0, NULL, php_com_typelibrary_dtor, 0); + zend_ts_hash_init(&php_com_typelibraries, 0, NULL, php_com_typelibrary_dtor, 1); #if HAVE_MSCOREE_H INIT_CLASS_ENTRY(ce, "dotnet", NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
At 18:10 18/08/2003, Rob Richards wrote: From: Zeev Suraski > PZVAL_UNLOCK() should *never* be used by anything outside the engine. The > leak is somewhere else. If that should never be called outside the engine, then the issue seems to be from any extension that needs to override zend_std_read_property. DOM has the same issue, as it currently needs to call pzval_unlock when returning the property value as it uses the libxml structure to store and grab the property values, thus needing to create the zval each time. With no way to clean it up, it just ends up leaking. I don't have time to thoroughly look into it right now but again, nothing should touch PZVAL_UNLOCK() under any circumstances other than the engine. It's *not* refcount-- equivalent. It has to do with semantics that don't apply to extensions at all. I'm not exactly sure why it's even exported... Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
At 15:47 18/08/2003, Rob Richards wrote: Without PZVAL_UNLOCK(return_value), sxe_property_read seems to leak every time it is called. PZVAL_UNLOCK() should *never* be used by anything outside the engine. The leak is somewhere else. Even with it there, I see leaks when returning a single value since it was only called when returning an array. What was it crashing on? Again, it should never be called no matter what. I see leaks all over SimpleXML right now, I'll try looking into them. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevMon Aug 18 07:26:12 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
WTF was that doing here? :)
Fix crash
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.55 php-src/ext/simplexml/simplexml.c:1.56
--- php-src/ext/simplexml/simplexml.c:1.55 Thu Aug 7 17:39:00 2003
+++ php-src/ext/simplexml/simplexml.c Mon Aug 18 07:26:12 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.55 2003/08/07 21:39:00 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.56 2003/08/18 11:26:12 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -179,8 +179,6 @@
zval_dtor(return_value);
FREE_ZVAL(return_value);
return_value = value;
- } else {
- PZVAL_UNLOCK(return_value);
}
return return_value;
@@ -1058,7 +1056,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.55 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.56 $");
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
zeevTue Aug 5 04:31:56 2003 EDT
Modified files:
/php-srcrun-tests.php
Log:
Display the currently running test
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.168 php-src/run-tests.php:1.169
--- php-src/run-tests.php:1.168 Fri Jul 25 01:51:57 2003
+++ php-src/run-tests.php Tue Aug 5 04:31:56 2003
@@ -676,6 +676,9 @@
$shortname = str_replace($cwd.'/', '', $file);
$tested = trim($section_text['TEST'])." [$shortname]";
+ echo "TEST $tested\r";
+ flush();
+
$tmp = realpath(dirname($file));
$tmp_skipif = $tmp . uniqid('/phpt.');
$tmp_file = ereg_replace('\.phpt$','.php',$file);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ftp php_ftp.c
zeevThu Aug 7 12:03:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ftpphp_ftp.c
Log:
Another broken prototype
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.74.2.10 php-src/ext/ftp/php_ftp.c:1.74.2.11
--- php-src/ext/ftp/php_ftp.c:1.74.2.10 Thu Aug 7 12:02:04 2003
+++ php-src/ext/ftp/php_ftp.c Thu Aug 7 12:03:05 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.74.2.10 2003/08/07 16:02:04 zeev Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.11 2003/08/07 16:03:05 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -176,7 +176,7 @@
/* }}} */
#ifdef HAVE_OPENSSL_EXT
-/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout)]])
+/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout]])
Opens a FTP-SSL stream */
PHP_FUNCTION(ftp_ssl_connect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/snmp snmp.c
zeevThu Aug 7 12:46:11 2003 EDT
Modified files:
/php-src/ext/snmp snmp.c
Log:
Remove 'proto' from internal functions
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.85 php-src/ext/snmp/snmp.c:1.86
--- php-src/ext/snmp/snmp.c:1.85Thu Jul 24 17:48:55 2003
+++ php-src/ext/snmp/snmp.c Thu Aug 7 12:46:11 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.85 2003/07/24 21:48:55 harrie Exp $ */
+/* $Id: snmp.c,v 1.86 2003/08/07 16:46:11 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
+/* {{{ int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
Set the security name in the snmpv3 session */
static int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
{
@@ -729,7 +729,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
+/* {{{ int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
Set the security level in the snmpv3 session */
static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level
TSRMLS_DC)
{
@@ -750,7 +750,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
+/* {{{ int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
Set the authentication protocol in the snmpv3 session */
static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot
TSRMLS_DC)
{
@@ -771,7 +771,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot)
+/* {{{ int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot)
Set the security protocol in the snmpv3 session */
static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot
TSRMLS_DC)
{
@@ -802,7 +802,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass)
+/* {{{ int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass)
Make key from pass phrase in the snmpv3 session */
static int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass TSRMLS_DC)
{
@@ -834,7 +834,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass)
+/* {{{ int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass)
Make key from pass phrase in the snmpv3 session */
static int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass TSRMLS_DC)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard exec.c
zeevThu Aug 7 11:50:18 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard exec.c
Log:
That's slightly more accurate
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.84.2.10 php-src/ext/standard/exec.c:1.84.2.11
--- php-src/ext/standard/exec.c:1.84.2.10 Tue Aug 5 16:16:47 2003
+++ php-src/ext/standard/exec.c Thu Aug 7 11:50:18 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+--+
*/
-/* $Id: exec.c,v 1.84.2.10 2003/08/05 20:16:47 iliaa Exp $ */
+/* $Id: exec.c,v 1.84.2.11 2003/08/07 15:50:18 zeev Exp $ */
#include
#include "php.h"
@@ -523,7 +523,7 @@
/* }}} */
/* {{{ proto string shell_exec(string cmd)
- Use pclose() for FILE* that has been opened via popen() */
+ Execute command via shell and return complete output as string */
PHP_FUNCTION(shell_exec)
{
FILE *in;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/domxml php_domxml.c /ext/snmp snmp.c
zeevThu Aug 7 12:44:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
/php-src/ext/snmp snmp.c
Log:
Remove 'proto' from internal functions
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.27
php-src/ext/domxml/php_domxml.c:1.218.2.28
--- php-src/ext/domxml/php_domxml.c:1.218.2.27 Fri Jul 25 08:45:05 2003
+++ php-src/ext/domxml/php_domxml.c Thu Aug 7 12:44:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.218.2.27 2003/07/25 12:45:05 sniper Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.28 2003/08/07 16:44:11 zeev Exp $ */
/* TODO
* - Support Notation Nodes
@@ -4716,9 +4716,7 @@
/* }}} */
#endif
-/* We don't have a type zval. **attributes is also very unusual. */
-
-/* {{{ proto int node_attributes(zval **attributes, int node)
+/* {{{ int node_attributes(zval **attributes, int node)
Returns list of children nodes */
static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC)
{
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.70.2.10 php-src/ext/snmp/snmp.c:1.70.2.11
--- php-src/ext/snmp/snmp.c:1.70.2.10 Fri Jul 25 03:32:39 2003
+++ php-src/ext/snmp/snmp.c Thu Aug 7 12:44:11 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: snmp.c,v 1.70.2.10 2003/07/25 07:32:39 harrie Exp $ */
+/* $Id: snmp.c,v 1.70.2.11 2003/08/07 16:44:11 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -703,7 +703,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
+/* {{{ int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
Set the security name in the snmpv3 session */
static int netsnmp_session_set_sec_name(struct snmp_session *s, char *name)
{
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
+/* {{{ int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
Set the security level in the snmpv3 session */
static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level
TSRMLS_DC)
{
@@ -737,7 +737,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
+/* {{{ int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
Set the authentication protocol in the snmpv3 session */
static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot
TSRMLS_DC)
{
@@ -758,7 +758,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot)
+/* {{{ int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot)
Set the security protocol in the snmpv3 session */
static int netsnmp_session_set_sec_protocol(struct snmp_session *s, char *prot
TSRMLS_DC)
{
@@ -789,7 +789,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass)
+/* {{{ int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass)
Make key from pass phrase in the snmpv3 session */
static int netsnmp_session_gen_auth_key(struct snmp_session *s, char *pass TSRMLS_DC)
{
@@ -821,7 +821,7 @@
}
/* }}} */
-/* {{{ proto int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass)
+/* {{{ int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass)
Make key from pass phrase in the snmpv3 session */
static int netsnmp_session_gen_sec_key(struct snmp_session *s, u_char *pass TSRMLS_DC)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ftp php_ftp.c
zeevThu Aug 7 12:02:04 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ftpphp_ftp.c
Log:
Fix prototype
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.74.2.9 php-src/ext/ftp/php_ftp.c:1.74.2.10
--- php-src/ext/ftp/php_ftp.c:1.74.2.9 Fri Jun 27 12:42:50 2003
+++ php-src/ext/ftp/php_ftp.c Thu Aug 7 12:02:04 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.74.2.9 2003/06/27 16:42:50 sniper Exp $ */
+/* $Id: php_ftp.c,v 1.74.2.10 2003/08/07 16:02:04 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -139,7 +139,7 @@
}
-/* {{{ proto resource ftp_connect(string host [, int port [, int timeout)]])
+/* {{{ proto resource ftp_connect(string host [, int port [, int timeout]])
Opens a FTP stream */
PHP_FUNCTION(ftp_connect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ftp php_ftp.c
zeevThu Aug 7 12:03:17 2003 EDT
Modified files:
/php-src/ext/ftpphp_ftp.c
Log:
fix another broken prototype
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.92 php-src/ext/ftp/php_ftp.c:1.93
--- php-src/ext/ftp/php_ftp.c:1.92 Thu Aug 7 12:02:28 2003
+++ php-src/ext/ftp/php_ftp.c Thu Aug 7 12:03:17 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.92 2003/08/07 16:02:28 zeev Exp $ */
+/* $Id: php_ftp.c,v 1.93 2003/08/07 16:03:17 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -181,7 +181,7 @@
/* }}} */
#ifdef HAVE_OPENSSL_EXT
-/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout)]])
+/* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout]])
Opens a FTP-SSL stream */
PHP_FUNCTION(ftp_ssl_connect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ftp php_ftp.c
zeevThu Aug 7 12:02:28 2003 EDT
Modified files:
/php-src/ext/ftpphp_ftp.c
Log:
Fix prototype
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.91 php-src/ext/ftp/php_ftp.c:1.92
--- php-src/ext/ftp/php_ftp.c:1.91 Fri Jun 27 12:41:41 2003
+++ php-src/ext/ftp/php_ftp.c Thu Aug 7 12:02:28 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.91 2003/06/27 16:41:41 sniper Exp $ */
+/* $Id: php_ftp.c,v 1.92 2003/08/07 16:02:28 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -145,7 +145,7 @@
}
-/* {{{ proto resource ftp_connect(string host [, int port [, int timeout)]])
+/* {{{ proto resource ftp_connect(string host [, int port [, int timeout]])
Opens a FTP stream */
PHP_FUNCTION(ftp_connect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
zeevThu Aug 7 11:51:06 2003 EDT
Modified files:
/php-src/ext/standard exec.c
Log:
Fix docline
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.101 php-src/ext/standard/exec.c:1.102
--- php-src/ext/standard/exec.c:1.101 Tue Aug 5 16:15:53 2003
+++ php-src/ext/standard/exec.c Thu Aug 7 11:51:05 2003
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: exec.c,v 1.101 2003/08/05 20:15:53 iliaa Exp $ */
+/* $Id: exec.c,v 1.102 2003/08/07 15:51:05 zeev Exp $ */
#include
#include "php.h"
@@ -382,7 +382,7 @@
/* }}} */
/* {{{ proto string shell_exec(string cmd)
- Use pclose() for FILE* that has been opened via popen() */
+ Execute command via shell and return complete output as string */
PHP_FUNCTION(shell_exec)
{
FILE *in;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
zeevTue Aug 5 04:32:58 2003 EDT Modified files: /php-srcrun-tests.php Log: Remove non-standard vim6 option Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.169 php-src/run-tests.php:1.170 --- php-src/run-tests.php:1.169 Tue Aug 5 04:31:56 2003 +++ php-src/run-tests.php Tue Aug 5 04:32:58 2003 @@ -1039,7 +1039,6 @@ * tab-width: 4 * c-basic-offset: 4 * End: - * vim600: fdm=marker * vim: noet sw=4 ts=4 */ ?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
zeevTue Aug 5 04:39:01 2003 EDT Modified files: /php-srcrun-tests.php Log: Shorten output to prevent messup Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.170 php-src/run-tests.php:1.171 --- php-src/run-tests.php:1.170 Tue Aug 5 04:32:58 2003 +++ php-src/run-tests.php Tue Aug 5 04:39:01 2003 @@ -676,7 +676,7 @@ $shortname = str_replace($cwd.'/', '', $file); $tested = trim($section_text['TEST'])." [$shortname]"; - echo "TEST $tested\r"; + echo "TEST [$shortname]\r"; flush(); $tmp = realpath(dirname($file)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes factory_and_singleton_002.phpt
zeevTue Aug 5 04:49:56 2003 EDT Modified files: /php-src/tests/classes factory_and_singleton_002.phpt Log: Disable prolebmatic test Index: php-src/tests/classes/factory_and_singleton_002.phpt diff -u php-src/tests/classes/factory_and_singleton_002.phpt:1.3 php-src/tests/classes/factory_and_singleton_002.phpt:1.4 --- php-src/tests/classes/factory_and_singleton_002.phpt:1.3Thu Jul 3 03:18:41 2003 +++ php-src/tests/classes/factory_and_singleton_002.phptTue Aug 5 04:49:56 2003 @@ -1,7 +1,7 @@ --TEST-- ZE2 factory and singleton, test 2 --SKIPIF-- - + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevMon Aug 4 04:55:44 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: Fix library linkage Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.127 php-src/win32/php4dllts.dsp:1.128 --- php-src/win32/php4dllts.dsp:1.127 Mon Aug 4 04:54:40 2003 +++ php-src/win32/php4dllts.dsp Mon Aug 4 04:55:44 2003 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevMon Aug 4 04:54:40 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: Add missing library path Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.126 php-src/win32/php4dllts.dsp:1.127 --- php-src/win32/php4dllts.dsp:1.126 Thu Jul 24 09:20:59 2003 +++ php-src/win32/php4dllts.dsp Mon Aug 4 04:54:40 2003 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug24652.phpt
zeevMon Aug 4 04:42:36 2003 EDT
Added files:
/php-src/tests/lang bug24652.phpt
Log:
Add a test
Index: php-src/tests/lang/bug24652.phpt
+++ php-src/tests/lang/bug24652.phpt
--TEST--
Bug #24652 (broken array_flip())
--FILE--
0);
var_dump($f);
var_dump(array_key_exists(7, $f));
var_dump(array_key_exists('7', $f));
print "--\n";
/* This doesn't */
$f = array_flip(array('7'));
var_dump($f);
var_dump(array_key_exists(7, $f));
var_dump(array_key_exists('7', $f));
?>
--EXPECT--
array(1) {
[7]=>
int(0)
}
bool(true)
bool(true)
--
array(1) {
[7]=>
int(0)
}
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c
zeevMon Aug 4 04:38:24 2003 EDT
Modified files:
/php-src/ext/standard array.c
Log:
Fix bug #24652 - Sterling, do you begin to think that maybe it wasn't such
a good idea?
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.236 php-src/ext/standard/array.c:1.237
--- php-src/ext/standard/array.c:1.236 Thu Jul 24 23:03:26 2003
+++ php-src/ext/standard/array.cMon Aug 4 04:38:24 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.236 2003/07/25 03:03:26 iliaa Exp $ */
+/* $Id: array.c,v 1.237 2003/08/04 08:38:24 zeev Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2545,7 +2545,7 @@
if (Z_TYPE_PP(entry) == IS_LONG) {
zend_hash_index_update(Z_ARRVAL_P(return_value),
Z_LVAL_PP(entry), &data, sizeof(data), NULL);
} else if (Z_TYPE_PP(entry) == IS_STRING) {
- zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_PP(entry),
Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
+ zend_symtable_update(Z_ARRVAL_P(return_value),
Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &data, sizeof(data), NULL);
} else {
zval_ptr_dtor(&data); /* will free also zval structure */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can only flip
STRING and INTEGER values!");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/exif exif.c /ext/gmp gmp.c /ext/ldap ldap.c /ext/mbstring mbstring.c /ext/mcve mcve.c /ext/mssql php_mssql.c /ext/mysqli mysqli_fe.c /ext/ncurses ncurses_fe.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/simplexml simplexml.c /ext/sockets sockets.c /ext/sqlite sqlite.c /ext/standard basic_functions.c /ext/sysvmsg sysvmsg.c /ext/xml xml.c /ext/xmlrpc xmlrpc-epi-php.c /ext/yaz php_yaz.c
zeevSun Aug 3 13:44:39 2003 EDT
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/exif exif.c
/php-src/ext/gmpgmp.c
/php-src/ext/ldap ldap.c
/php-src/ext/mbstring mbstring.c
/php-src/ext/mcve mcve.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/mysqli mysqli_fe.c
/php-src/ext/ncursesncurses_fe.c
/php-src/ext/oci8 oci8.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/opensslopenssl.c
/php-src/ext/oracle oracle.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/socketssockets.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard basic_functions.c
/php-src/ext/sysvmsgsysvmsg.c
/php-src/ext/xmlxml.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/yazphp_yaz.c
Log:
Use new infrastructure.
There are bound to be some messups, please report build/runtime bugs!
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.24 php-src/ext/curl/interface.c:1.25
--- php-src/ext/curl/interface.c:1.24 Sat Jun 28 05:55:12 2003
+++ php-src/ext/curl/interface.cSun Aug 3 13:44:35 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.24 2003/06/28 09:55:12 derick Exp $ */
+/* $Id: interface.c,v 1.25 2003/08/03 17:44:35 zeev Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -55,8 +55,6 @@
#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
-static const unsigned char second_args_force_ref[]= { 2, BYREF_NONE, BYREF_FORCE
};
-
/* {{{ curl_functions[]
*/
function_entry curl_functions[] = {
@@ -72,7 +70,7 @@
PHP_FE(curl_multi_add_handle,NULL)
PHP_FE(curl_multi_remove_handle, NULL)
PHP_FE(curl_multi_select,NULL)
- PHP_FE(curl_multi_exec, second_args_force_ref)
+ PHP_FE(curl_multi_exec, second_arg_force_ref)
PHP_FE(curl_multi_getcontent,NULL)
PHP_FE(curl_multi_info_read, NULL)
PHP_FE(curl_multi_close, NULL)
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.152 php-src/ext/exif/exif.c:1.153
--- php-src/ext/exif/exif.c:1.152 Fri Jun 20 14:24:38 2003
+++ php-src/ext/exif/exif.c Sun Aug 3 13:44:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $ */
+/* $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $ */
/* ToDos
*
@@ -93,7 +93,10 @@
#define EFREE_IF(ptr) if (ptr) efree(ptr)
-static unsigned char exif_thumbnail_force_ref[] = {2, BYREF_NONE, BYREF_FORCE_REST};
+static
+ZEND_BEGIN_ARG_INFO(exif_thumbnail_force_ref, 1)
+ZEND_END_ARG_INFO();
+
/* {{{ exif_functions[]
*/
@@ -107,7 +110,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.33 php-src/ext/gmp/gmp.c:1.34
--- php-src/ext/gmp/gmp.c:1.33 Tue Jun 10 16:03:29 2003
+++ php-src/ext/gmp/gmp.c Sun Aug 3 13:44:36 2003
@@ -35,8 +35,6 @@
/* True global resources - no need for thread safety here */
static int le_gmp;
-static unsigned char first_of_two_force_ref[] = { 2, BYREF_FORCE, BYREF_NONE };
-
/* {{{ gmp_functions[]
*/
function_entry gmp_functions[] = {
@@ -73,8 +71,8 @@
ZEND_FE(gmp_or, NULL)
ZEND_FE(gmp_com,NULL)
ZEND_FE(gmp_xor,NULL)
- ZEND_FE(gmp_setbit, first_of_two_force_ref)
- ZEND_FE(gmp_clrbit, first_of_two_force_ref)
+ ZEND_FE(gmp_setbit, first_arg_force_ref)
+ ZEND_FE(gmp_clrbit, first_arg_force_ref)
ZEND_FE(gmp_scan0, NULL)
ZEND_FE(gmp_scan1, NULL)
ZEND_FE(gmp_popcount, NULL)
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.142 php-src/ext/ldap/ldap.c:1.143
--- php-src/ext/ldap/ldap.c:1.142 Fri Jun 13 09:30:46 2003
+++ php-src/ext/ldap/ldap.c Sun Aug 3 13:44:36 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.142 2003/06/13 13:30:46 sniper Exp $ */
+/* $Id: ldap.c,v 1.143 2003/08/03 17:44:36 zeev Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -79,8 +79,15 @@
ZEND_DECLARE_MODULE_GLOBALS(ldap)
-static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE,
BYREF_FORCE };
-static unsigned char arg3to6of6_force_ref[] = { 6, BYREF_NONE, BYREF_NONE,
BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE };
+static
+ ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0)
+
[PHP-CVS] cvs: php-src /main php.h
zeevSun Aug 3 13:42:01 2003 EDT Modified files: /php-src/main php.h Log: Remove unnecessary macro Index: php-src/main/php.h diff -u php-src/main/php.h:1.190 php-src/main/php.h:1.191 --- php-src/main/php.h:1.190Fri Jun 27 03:43:42 2003 +++ php-src/main/php.h Sun Aug 3 13:42:01 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.190 2003/06/27 07:43:42 sas Exp $ */ +/* $Id: php.h,v 1.191 2003/08/03 17:42:01 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -322,7 +322,6 @@ #define PHP_NAMED_FE ZEND_NAMED_FE #define PHP_FE ZEND_FE #define PHP_FALIAS ZEND_FALIAS -#define PHP_STATIC_FE ZEND_STATIC_FE #define PHP_ME ZEND_ME #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevWed Jul 30 12:15:03 2003 EDT
Modified files:
/php-src/main main.c
Log:
Call exec_finished()
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.561 php-src/main/main.c:1.562
--- php-src/main/main.c:1.561 Mon Jul 21 13:41:42 2003
+++ php-src/main/main.c Wed Jul 30 12:15:03 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.561 2003/07/21 17:41:42 zeev Exp $ */
+/* $Id: main.c,v 1.562 2003/07/30 16:15:03 zeev Exp $ */
/* {{{ includes
*/
@@ -1141,8 +1141,13 @@
TSRMLS_FETCH();
/* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
- inside zend_executor callback functions. */
+* inside zend_executor callback functions.
+*/
EG(opline_ptr) = NULL;
+
+ zend_try {
+ zend_exec_finished(TSRMLS_C);
+ } zend_end_try();
zend_try {
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1)
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_4_3) /ext/mysql/libmysql libmysql.c mysql_com.h net.c
zeevMon Jul 28 03:28:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mysql/libmysql libmysql.c mysql_com.h net.c
Log:
Fix nameclash with NSAPI API
Index: php-src/ext/mysql/libmysql/libmysql.c
diff -u php-src/ext/mysql/libmysql/libmysql.c:1.11.2.2
php-src/ext/mysql/libmysql/libmysql.c:1.11.2.3
--- php-src/ext/mysql/libmysql/libmysql.c:1.11.2.2 Sat Jun 7 12:12:09 2003
+++ php-src/ext/mysql/libmysql/libmysql.c Mon Jul 28 03:28:55 2003
@@ -1510,7 +1510,7 @@
/* without encryption? */
if (client_flag & CLIENT_SSL)
{
-if (my_net_write(net,buff,(uint) (2)) || net_flush(net))
+if (my_net_write(net,buff,(uint) (2)) || my_net_flush(net))
goto error;
/* Do the SSL layering. */
DBUG_PRINT("info", ("IO layer change in progress..."));
@@ -1543,7 +1543,7 @@
mysql->db=my_strdup(db,MYF(MY_WME));
db=0;
}
- if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net) ||
+ if (my_net_write(net,buff,(uint) (end-buff)) || my_net_flush(net) ||
net_safe_read(mysql) == packet_error)
goto error;
if (client_flag & CLIENT_COMPRESS) /* We will use compression */
@@ -1808,7 +1808,7 @@
mysql->net.last_errno=EE_FILENOTFOUND;
sprintf(buf,EE(mysql->net.last_errno),tmp_name,errno);
strmake(mysql->net.last_error,buf,sizeof(mysql->net.last_error)-1);
-my_net_write(&mysql->net,"",0); net_flush(&mysql->net);
+my_net_write(&mysql->net,"",0); my_net_flush(&mysql->net);
my_free(tmp_name,MYF(0));
DBUG_RETURN(-1);
}
@@ -1827,7 +1827,7 @@
}
(void) my_close(fd,MYF(0));
/* Send empty packet to mark end of file */
- if (my_net_write(&mysql->net,"",0) || net_flush(&mysql->net))
+ if (my_net_write(&mysql->net,"",0) || my_net_flush(&mysql->net))
{
mysql->net.last_errno=CR_SERVER_LOST;
sprintf(mysql->net.last_error,ER(mysql->net.last_errno),socket_errno);
Index: php-src/ext/mysql/libmysql/mysql_com.h
diff -u php-src/ext/mysql/libmysql/mysql_com.h:1.9
php-src/ext/mysql/libmysql/mysql_com.h:1.9.4.1
--- php-src/ext/mysql/libmysql/mysql_com.h:1.9 Fri Jun 7 11:07:54 2002
+++ php-src/ext/mysql/libmysql/mysql_com.h Mon Jul 28 03:28:55 2003
@@ -146,7 +146,7 @@
intmy_net_init(NET *net, Vio* vio);
void net_end(NET *net);
void net_clear(NET *net);
-intnet_flush(NET *net);
+intmy_net_flush(NET *net);
intmy_net_write(NET *net,const char *packet,unsigned long len);
intnet_write_command(NET *net,unsigned char command,const char *packet,
unsigned long len);
Index: php-src/ext/mysql/libmysql/net.c
diff -u php-src/ext/mysql/libmysql/net.c:1.7 php-src/ext/mysql/libmysql/net.c:1.7.4.1
--- php-src/ext/mysql/libmysql/net.c:1.7Fri Jun 7 11:07:54 2002
+++ php-src/ext/mysql/libmysql/net.cMon Jul 28 03:28:55 2003
@@ -183,10 +183,10 @@
/* Flush write_buffer if not empty. */
-int net_flush(NET *net)
+int my_net_flush(NET *net)
{
int error=0;
- DBUG_ENTER("net_flush");
+ DBUG_ENTER("my_net_flush");
if (net->buff != net->write_pos)
{
error=net_real_write(net,(char*) net->buff,
@@ -231,7 +231,7 @@
buff[4]=command;
if (net_write_buff(net,(char*) buff,5))
return 1;
- return test(net_write_buff(net,packet,len) || net_flush(net));
+ return test(net_write_buff(net,packet,len) || my_net_flush(net));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang foreach_with_references_001.phpt
zeevThu Jul 24 09:21:54 2003 EDT
Added files:
/php-src/tests/lang foreach_with_references_001.phpt
Log:
Add foreach() test with references
Index: php-src/tests/lang/foreach_with_references_001.phpt
+++ php-src/tests/lang/foreach_with_references_001.phpt
--TEST--
foreach() with references
--FILE--
"one", 2 => "two", 3 => "three");
foreach($arr as $key => $val) {
$val = $key;
}
print_r($arr);
foreach($arr as $key => &$val) {
$val = $key;
}
print_r($arr);
--EXPECT--
Array
(
[1] => one
[2] => two
[3] => three
)
Array
(
[1] => 1
[2] => 2
[3] => 3
)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang each_binary_safety.phpt
zeevThu Jul 24 09:08:35 2003 EDT
Added files:
/php-src/tests/lang each_binary_safety.phpt
Log:
Add test for binary safety of each()
Index: php-src/tests/lang/each_binary_safety.phpt
+++ php-src/tests/lang/each_binary_safety.phpt
--TEST--
Binary safety of each() for both keys and values
--FILE--
"foo\0bar");
while (list($key, $val) = each($arr)) {
echo strlen($key), ': ';
echo urlencode($key), ' => ', urlencode($val), "\n";
}
?>
--EXPECT--
7: foo%00bar => foo%00bar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard basic_functions.c
zeevThu Jul 24 04:04:21 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard basic_functions.c
Log:
MFH fix for bug #19613
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.19
php-src/ext/standard/basic_functions.c:1.543.2.20
--- php-src/ext/standard/basic_functions.c:1.543.2.19 Fri Jun 27 12:42:51 2003
+++ php-src/ext/standard/basic_functions.c Thu Jul 24 04:04:20 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.543.2.19 2003/06/27 16:42:51 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.20 2003/07/24 08:04:20 zeev Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -937,6 +937,8 @@
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
+# elif defined(PHP_WIN32)
+ SetEnvironmentVariable(pe->key, NULL);
# else
char **env;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
zeevThu Jul 24 04:02:09 2003 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fix bug #19613
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.616
php-src/ext/standard/basic_functions.c:1.617
--- php-src/ext/standard/basic_functions.c:1.616Sat Jun 28 01:38:52 2003
+++ php-src/ext/standard/basic_functions.c Thu Jul 24 04:02:08 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.616 2003/06/28 05:38:52 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.617 2003/07/24 08:02:08 zeev Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -973,6 +973,8 @@
} else {
# if HAVE_UNSETENV
unsetenv(pe->key);
+# elif defined(PHP_WIN32)
+ SetEnvironmentVariable(pe->key, NULL);
# else
char **env;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Jul 23 04:53:23 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix interface
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.52 php-src/ext/simplexml/simplexml.c:1.53
--- php-src/ext/simplexml/simplexml.c:1.52 Mon Jul 7 08:07:02 2003
+++ php-src/ext/simplexml/simplexml.c Wed Jul 23 04:53:23 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.52 2003/07/07 12:07:02 zeev Exp $ */
+/* $Id: simplexml.c,v 1.53 2003/07/23 08:53:23 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -106,7 +106,7 @@
/* {{{ sxe_property_read()
*/
static zval *
-sxe_property_read(zval *object, zval *member TSRMLS_DC)
+sxe_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
{
zval *return_value;
zval *value = NULL;
@@ -272,7 +272,7 @@
property_ptr = emalloc(sizeof(zval **));
- property = sxe_property_read(object, member TSRMLS_CC);
+ property = sxe_property_read(object, member, 0 TSRMLS_CC);
*property_ptr = property;
@@ -1055,7 +1055,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.52 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.53 $");
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c /main php_variables.c
zeevTue Jul 22 12:08:50 2003 EDT
Modified files:
/php-src/ext/standard array.c
/php-src/main php_variables.c
Log:
- Use the new infrastructure of zend_symtable_*() (fixes bug #24565)
- Fix bogus use of get_current_key()
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.234 php-src/ext/standard/array.c:1.235
--- php-src/ext/standard/array.c:1.234 Mon Jun 16 13:35:16 2003
+++ php-src/ext/standard/array.cTue Jul 22 12:08:49 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.234 2003/06/16 17:35:16 iliaa Exp $ */
+/* $Id: array.c,v 1.235 2003/07/22 16:08:49 zeev Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3643,11 +3643,7 @@
switch (Z_TYPE_PP(key)) {
case IS_STRING:
- if (zend_is_numeric_key(*key, &lvalue)) {
- if (zend_hash_index_exists(HASH_OF(*array), lvalue)) {
- RETURN_TRUE;
- }
- } else if (zend_hash_exists(HASH_OF(*array), Z_STRVAL_PP(key),
Z_STRLEN_PP(key)+1)) {
+ if (zend_symtable_exists(HASH_OF(*array), Z_STRVAL_PP(key),
Z_STRLEN_PP(key)+1)) {
RETURN_TRUE;
}
RETURN_FALSE;
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.65 php-src/main/php_variables.c:1.66
--- php-src/main/php_variables.c:1.65 Mon Jul 21 13:42:24 2003
+++ php-src/main/php_variables.cTue Jul 22 12:08:50 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.65 2003/07/21 17:42:24 zeev Exp $ */
+/* $Id: php_variables.c,v 1.66 2003/07/22 16:08:50 zeev Exp $ */
#include
#include "php.h"
@@ -152,11 +152,11 @@
} else {
escaped_index = index;
}
- if (zend_hash_find(symtable1, escaped_index,
index_len+1, (void **) &gpc_element_p)==FAILURE
+ if (zend_symtable_find(symtable1, escaped_index,
index_len+1, (void **) &gpc_element_p)==FAILURE
|| Z_TYPE_PP(gpc_element_p) != IS_ARRAY) {
MAKE_STD_ZVAL(gpc_element);
array_init(gpc_element);
- zend_hash_update(symtable1, escaped_index,
index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
+ zend_symtable_update(symtable1, escaped_index,
index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
}
if (index!=escaped_index) {
efree(escaped_index);
@@ -182,7 +182,7 @@
if (!index) {
zend_hash_next_index_insert(symtable1, &gpc_element,
sizeof(zval *), (void **) &gpc_element_p);
} else {
- zend_hash_update(symtable1, index, index_len+1,
&gpc_element, sizeof(zval *), (void **) &gpc_element_p);
+ zend_symtable_update(symtable1, index, index_len+1,
&gpc_element, sizeof(zval *), (void **) &gpc_element_p);
}
break;
}
@@ -498,20 +498,20 @@
*/
static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC)
{
- zval**src_entry, **dest_entry;
- char *string_key;
- uint string_key_len;
- ulong num_key;
- HashPosition pos;
- int key_type;
+ zval **src_entry, **dest_entry;
+ char *string_key;
+ uint string_key_len;
+ ulong num_key;
+ HashPosition pos;
+ int key_type;
zend_hash_internal_pointer_reset_ex(src, &pos);
while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) ==
SUCCESS) {
key_type = zend_hash_get_current_key_ex(src, &string_key,
&string_key_len, &num_key, 0, &pos);
- if (Z_TYPE_PP(src_entry) != IS_ARRAY ||
- (string_key_len && zend_hash_find(dest, string_key,
string_key_len, (void **)&dest_entry) != SUCCESS) ||
- (!string_key_len && zend_hash_index_find(dest,
num_key, (void **)&dest_entry) != SUCCESS)
- || Z_TYPE_PP(dest_entry) != IS_ARRAY) {
+ if (Z_TYPE_PP(src_entry) != IS_ARRAY
+
[PHP-CVS] cvs: php-src(PHP_4_3) /main main.c
zeevTue Jul 22 11:46:48 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main main.c
Log:
Fix potential crash (zend_hash_get_current_key_ex() doesn't touch the string
arguments if
the key is not a string!)
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.42 php-src/main/main.c:1.512.2.43
--- php-src/main/main.c:1.512.2.42 Fri Jun 20 13:00:16 2003
+++ php-src/main/main.c Tue Jul 22 11:46:48 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.42 2003/06/20 17:00:16 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.43 2003/07/22 15:46:48 zeev Exp $ */
/* {{{ includes
*/
@@ -1337,9 +1337,9 @@
zend_hash_internal_pointer_reset_ex(src, &pos);
while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) ==
SUCCESS) {
key_type = zend_hash_get_current_key_ex(src, &string_key,
&string_key_len, &num_key, 0, &pos);
- if (Z_TYPE_PP(src_entry) != IS_ARRAY ||
- (string_key_len && zend_hash_find(dest, string_key,
string_key_len, (void **)&dest_entry) != SUCCESS) ||
- (!string_key_len && zend_hash_index_find(dest,
num_key, (void **)&dest_entry) != SUCCESS)
+ if (Z_TYPE_PP(src_entry) != IS_ARRAY
+ || (key_type==HASH_KEY_IS_STRING &&
zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) != SUCCESS)
+ || (key_type==HASH_KEY_IS_LONG &&
zend_hash_index_find(dest, num_key, (void **)&dest_entry) != SUCCESS)
|| Z_TYPE_PP(dest_entry) != IS_ARRAY) {
(*src_entry)->refcount++;
if (key_type == HASH_KEY_IS_STRING) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug24436.phpt
zeevTue Jul 22 09:54:46 2003 EDT
Added files:
/php-src/tests/lang bug24436.phpt
Log:
Add test
Index: php-src/tests/lang/bug24436.phpt
+++ php-src/tests/lang/bug24436.phpt
--TEST--
Bug #24436 (isset() and empty() produce errors with non-existent variables in objects)
--FILE--
test[0][0])) { print "test1";}
if (!isset($this->test[0][0])) { print "test2";}
}
}
$test1 = new test();
?>
--EXPECT--
test1test2
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c php_dom.c xml_common.h
zeevTue Jul 22 09:50:00 2003 EDT
Modified files:
/php-src/ext/domdocument.c php_dom.c xml_common.h
Log:
API update
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.15 php-src/ext/dom/document.c:1.16
--- php-src/ext/dom/document.c:1.15 Sat Jul 19 10:59:29 2003
+++ php-src/ext/dom/document.c Tue Jul 22 09:50:00 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.15 2003/07/19 14:59:29 rrichards Exp $ */
+/* $Id: document.c,v 1.16 2003/07/22 13:50:00 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -97,7 +97,7 @@
ZVAL_STRING(member, property, 1);
std_hnd = zend_get_std_object_handlers();
- format = std_hnd->read_property(id, member TSRMLS_CC);
+ format = std_hnd->read_property(id, member, 0 TSRMLS_CC);
if (format->type == IS_BOOL) {
retformat = Z_BVAL_P(format);
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.19 php-src/ext/dom/php_dom.c:1.20
--- php-src/ext/dom/php_dom.c:1.19 Sat Jul 19 10:59:29 2003
+++ php-src/ext/dom/php_dom.c Tue Jul 22 09:50:00 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.19 2003/07/19 14:59:29 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.20 2003/07/22 13:50:00 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -272,7 +272,7 @@
/* }}} */
/* {{{ dom_read_property */
-zval *dom_read_property(zval *object, zval *member TSRMLS_DC)
+zval *dom_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
{
dom_object *obj;
zval tmp_member;
@@ -305,7 +305,7 @@
}
} else {
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, silent TSRMLS_CC);
}
if (member == &tmp_member) {
Index: php-src/ext/dom/xml_common.h
diff -u php-src/ext/dom/xml_common.h:1.10 php-src/ext/dom/xml_common.h:1.11
--- php-src/ext/dom/xml_common.h:1.10 Mon Jul 7 15:37:32 2003
+++ php-src/ext/dom/xml_common.hTue Jul 22 09:50:00 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xml_common.h,v 1.10 2003/07/07 19:37:32 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.11 2003/07/22 13:50:00 zeev Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -61,7 +61,7 @@
#define PHP_DOM_EXPORT(__type) PHPAPI __type
PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval *in,
zval* return_value, dom_object *domobj TSRMLS_DC);
-PHP_DOM_EXPORT(zval *) dom_read_property(zval *object, zval *member TSRMLS_DC);
+PHP_DOM_EXPORT(zval *) dom_read_property(zval *object, zval *member, zend_bool silent
TSRMLS_DC);
PHP_DOM_EXPORT(void) dom_write_property(zval *object, zval *member, zval *value
TSRMLS_DC);
#define DOM_XMLNS_NAMESPACE \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
At 14:56 22/07/2003, Sascha Schumann wrote: > Can you give me a concrete example of when you think this macro doesn't > behave properly? If it's correct, I'll try to fix it. Note that the last > time you had problems with this (and other) macros these were actually bugs > in the session module. That was another instance showing the inherent lack of abstraction in this particular API. Well, it was more of a misunderstanding on your part as to what you may and may not do with zvals which are managed by the engine. Apparently, this is the very same issue right now. What should be a black box is a test of familiarity with implementation details. My English parser stuck on that one... All four zvals are initialized using an undefined variable. During the shutdown phase, this occurs: zval **val; ht = Z_ARRVAL_P(PS(http_session_vars)); zend_hash_find(&EG(symbol_table), "foo", &val); ZEND_SET_SYMBOL_WITH_LENGTH(ht, "foo", *val, (*val)->refcount + 1 , 1); zend_hash_find(&EG(symbol_table), "bar", &val); /* crash in FREE_ZVAL */ ZEND_SET_SYMBOL_WITH_LENGTH(ht, "bar", *val, (*val)->refcount + 1 , 1); From a quick glance it appears to be the very same bug I told you about a few months ago. Here's what I said back then: --- The source of the problem is this: 1. You fetch a value from the symbol table that has is_ref=0, and refcount>1. EG(uninit..) is quite a common example of that, but it's definitely not unique - $foo = $bar = "baz"; will create such a beast too. 2. You tell zend_set_hash_symbol to make this value a reference. That in itself is a bug - you most probably want to attach only to one symbol, and not to other symbols who might be pointing to the same value. 3. Things really turn for the worse when EG(uninit..) becomes is_ref - that may cause all sorts of unexpected problems. What should be done is SEPARATE_ZVAL() on the symbol, prior to calling zend_set_hash_symbol(). As a matter of fact, chances are that we'd want SEPARATE_ZVAL() to be inside zend_set_hash_symbol() - I can't imagine a situation where we'd be in a position to enable/disable the is_ref bit arbitrarily without separating first. --- ZEND_SET_SYMBOL_WITH_LENGTH() was not designed to handle zvals which are already managed by the engine, but to introduce new zvals (you can see that it's being used by the various SET_VAR_*() macros, and was actually introduced to abstract them). It overwrites certain properties, such as the reference count and is_ref without taking into account the values that were in there before. For the record, there's nothing special about uninitialized_zval as far as these macros are concerned, even though doing the wrong thing on uninitialized_zval may have a more noticeable effect. A reference count higher than 1 with is_ref being 0 is perfectly normal, and like I told you last time around - can happen with things as simple as $a=$b="foo"; Changing such a value to is_ref=1 (i.e., calling ZEND_SET_SYMBOL on that value, and providing is_ref=1) is almost definitely NOT what you want to do. The reason this macro argument is there to begin with is, again, because it was designed to introduce new values. The bottom line is that you should simply SEPARATE this zval (probably SEPARATE_IF_NOT_REF) before you send it back into the engine. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
At 13:49 22/07/2003, Sascha Schumann wrote: On Tue, 22 Jul 2003, Zeev Suraski wrote: > At 12:22 22/07/2003, Sascha Schumann wrote: > > If it is not irregular, the engine code should be able to > > deal with it correctly. Right now, it falls over itself > > quickly and dies ungracefully. > > Then ZEND_SET_SYMBOL_WITH_LENGTH should be fixed. I'm not sure who wrote > it, but it wasn't Andi nor me. The engine works with it properly, more > than that, it completely relies on this behavior. Btw, here is the annotated source code. Ok, I guess I was the one who originally wrote it - it was a very long time ago. Can you give me a concrete example of when you think this macro doesn't behave properly? If it's correct, I'll try to fix it. Note that the last time you had problems with this (and other) macros these were actually bugs in the session module. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
At 13:46 22/07/2003, Sascha Schumann wrote: On Tue, 22 Jul 2003, Zeev Suraski wrote: > At 12:22 22/07/2003, Sascha Schumann wrote: > > If it is not irregular, the engine code should be able to > > deal with it correctly. Right now, it falls over itself > > quickly and dies ungracefully. > > Then ZEND_SET_SYMBOL_WITH_LENGTH should be fixed. I'm not sure who wrote > it, but it wasn't Andi nor me. The engine works with it properly, more > than that, it completely relies on this behavior. Where is this case (apparent optimization of undefined variables) documented? In the same place where the internals of your session module are documented. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
At 12:22 22/07/2003, Sascha Schumann wrote: If it is not irregular, the engine code should be able to deal with it correctly. Right now, it falls over itself quickly and dies ungracefully. Then ZEND_SET_SYMBOL_WITH_LENGTH should be fixed. I'm not sure who wrote it, but it wasn't Andi nor me. The engine works with it properly, more than that, it completely relies on this behavior. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/session session.c
At 04:10 22/07/2003, Sascha Schumann wrote: sas Mon Jul 21 21:10:31 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/sessionsession.c Log: Proper fix for #24592 The core issue is that undefined variables are refcounted (refcount != 0) while is_ref is still set to 0. I don't know whether this is a bug in the engine, but is it not the first time this irregularity has caused problems for the session extension. There's nothing irregular about it, the session extension should get used to it :) Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_variables.c
zeevMon Jul 21 13:42:24 2003 EDT
Modified files:
/php-src/main php_variables.c
Log:
Fix register_globals
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.64 php-src/main/php_variables.c:1.65
--- php-src/main/php_variables.c:1.64 Mon Jun 16 15:24:56 2003
+++ php-src/main/php_variables.cMon Jul 21 13:42:24 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.64 2003/06/16 19:24:56 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.65 2003/07/21 17:42:24 zeev Exp $ */
#include
#include "php.h"
@@ -493,6 +493,41 @@
/* }}} */
+
+/* {{{ php_autoglobal_merge
+ */
+static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC)
+{
+ zval**src_entry, **dest_entry;
+ char *string_key;
+ uint string_key_len;
+ ulong num_key;
+ HashPosition pos;
+ int key_type;
+
+ zend_hash_internal_pointer_reset_ex(src, &pos);
+ while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) ==
SUCCESS) {
+ key_type = zend_hash_get_current_key_ex(src, &string_key,
&string_key_len, &num_key, 0, &pos);
+ if (Z_TYPE_PP(src_entry) != IS_ARRAY ||
+ (string_key_len && zend_hash_find(dest, string_key,
string_key_len, (void **)&dest_entry) != SUCCESS) ||
+ (!string_key_len && zend_hash_index_find(dest,
num_key, (void **)&dest_entry) != SUCCESS)
+ || Z_TYPE_PP(dest_entry) != IS_ARRAY) {
+ (*src_entry)->refcount++;
+ if (key_type == HASH_KEY_IS_STRING) {
+ zend_hash_update(dest, string_key,
strlen(string_key)+1, src_entry, sizeof(zval *), NULL);
+ } else {
+ zend_hash_index_update(dest, num_key, src_entry,
sizeof(zval *), NULL);
+ }
+ } else {
+ SEPARATE_ZVAL(dest_entry);
+ php_autoglobal_merge(Z_ARRVAL_PP(dest_entry),
Z_ARRVAL_PP(src_entry) TSRMLS_CC);
+ }
+ zend_hash_move_forward_ex(src, &pos);
+ }
+}
+/* }}} */
+
+
static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS_DC);
static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC);
static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC);
@@ -588,6 +623,14 @@
php_register_server_variables(TSRMLS_C);
}
+ if (PG(register_globals)) {
+ for (i = 0; i < 5; i++) {
+ if (PG(http_globals)[i]) {
+ php_autoglobal_merge(&EG(symbol_table),
Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC);
+ }
+ }
+ }
+
for (i=0; ihttp://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevMon Jul 21 13:41:42 2003 EDT
Modified files:
/php-src/main main.c
Log:
Remove old code
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.560 php-src/main/main.c:1.561
--- php-src/main/main.c:1.560 Tue Jun 17 13:15:02 2003
+++ php-src/main/main.c Mon Jul 21 13:41:42 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.560 2003/06/17 17:15:02 iliaa Exp $ */
+/* $Id: main.c,v 1.561 2003/07/21 17:41:42 zeev Exp $ */
/* {{{ includes
*/
@@ -1478,133 +1478,6 @@
}
}
/* }}} */
-
-
-/* Only _ENV and _SERVER are JIT'd for now */
-#if 0
-static zend_bool php_auto_globals_create_get(TSRMLS_D)
-{
- if (PG(activated_auto_globals)[TRACK_VARS_GET]) {
- return 0;
- }
-
- return 0;
-}
-
-
-static zend_bool php_auto_globals_create_post(TSRMLS_D)
-{
- if (PG(activated_auto_globals)[TRACK_VARS_POST]) {
- return 0;
- }
- if (!SG(headers_sent) && SG(request_info).request_method &&
!strcmp(SG(request_info).request_method, "POST")) {
- sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /*
POST Data */
- _gpc_flags[0]=1;
- }
-
- PG(activated_auto_globals)[TRACK_VARS_POST] = 1;
-
- return 0;
-}
-
-/* {{{ php_autoglobal_merge
- */
-static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC)
-{
- zval**src_entry, **dest_entry;
- char *string_key;
- uint string_key_len;
- ulong num_key;
- HashPosition pos;
- int key_type;
-
- zend_hash_internal_pointer_reset_ex(src, &pos);
- while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) ==
SUCCESS) {
- key_type = zend_hash_get_current_key_ex(src, &string_key,
&string_key_len, &num_key, 0, &pos);
- if (Z_TYPE_PP(src_entry) != IS_ARRAY ||
- (string_key_len && zend_hash_find(dest, string_key,
string_key_len, (void **)&dest_entry) != SUCCESS) ||
- (!string_key_len && zend_hash_index_find(dest,
num_key, (void **)&dest_entry) != SUCCESS)
- || Z_TYPE_PP(dest_entry) != IS_ARRAY) {
- (*src_entry)->refcount++;
- if (key_type == HASH_KEY_IS_STRING) {
- zend_hash_update(dest, string_key,
strlen(string_key)+1, src_entry, sizeof(zval *), NULL);
- } else {
- zend_hash_index_update(dest, num_key, src_entry,
sizeof(zval *), NULL);
- }
- } else {
- SEPARATE_ZVAL(dest_entry);
- php_autoglobal_merge(Z_ARRVAL_PP(dest_entry),
Z_ARRVAL_PP(src_entry) TSRMLS_CC);
- }
- zend_hash_move_forward_ex(src, &pos);
- }
-}
-/* }}} */
-
-static zend_bool php_auto_globals_create_cookie(TSRMLS_D)
-{
- if (PG(activated_auto_globals)[TRACK_VARS_COOKIE]) {
- return 0;
- }
-
- return 0;
-}
-
-
-static zend_bool php_auto_globals_create_request(TSRMLS_D)
-{
- zval *form_variables;
-
- if (PG(activated_auto_globals)[TRACK_VARS_REQUEST]) {
- return 0;
- }
-
- php_auto_globals_create_get(TSRMLS_C);
- php_auto_globals_create_post(TSRMLS_C);
- php_auto_globals_create_cookie(TSRMLS_C);
-
- ALLOC_ZVAL(form_variables);
- array_init(form_variables);
- INIT_PZVAL(form_variables);
-
- for (p=variables_order; p && *p; p++) {
- switch (*p) {
- case 'g':
- case 'G':
- php_autoglobal_merge(Z_ARRVAL_P(form_variables),
Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);
- break;
- case 'p':
- case 'P':
- php_autoglobal_merge(Z_ARRVAL_P(form_variables),
Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
- break;
- case 'c':
- case 'C':
- php_autoglobal_merge(Z_ARRVAL_P(form_variables),
Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
- break;
- }
- }
-
- if (PG(register_globals)) {
- HashPosition pos;
- zval **data;
- char *string_key;
- uint string_key_len;
- ulong num_key;
-
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos);
-
[PHP-CVS] cvs: php-src /tests/lang bug24499.phpt ZendEngine2 zend_object_handlers.c
zeevMon Jul 21 08:13:16 2003 EDT
Added files:
/php-src/tests/lang bug24499.phpt
Modified files:
/ZendEngine2zend_object_handlers.c
Log:
Fix bug #24499
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.59 ZendEngine2/zend_object_handlers.c:1.60
--- ZendEngine2/zend_object_handlers.c:1.59 Mon Jul 7 06:53:27 2003
+++ ZendEngine2/zend_object_handlers.c Mon Jul 21 08:13:16 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_object_handlers.c,v 1.59 2003/07/07 10:53:27 zeev Exp $ */
+/* $Id: zend_object_handlers.c,v 1.60 2003/07/21 12:13:16 zeev Exp $ */
#include "zend.h"
#include "zend_globals.h"
@@ -178,13 +178,25 @@
return 0;
}
+static inline zend_bool is_derived_class(zend_class_entry *child_class,
zend_class_entry *parent_class)
+{
+ child_class = child_class->parent;
+ while (child_class) {
+ if (child_class == parent_class) {
+ return 1;
+ }
+ child_class = child_class->parent;
+ }
+
+ return 0;
+}
+
static inline zend_property_info *zend_get_property_info(zend_object *zobj, zval
*member TSRMLS_DC)
{
zend_property_info *property_info = NULL;
zend_property_info *scope_property_info;
zend_bool denied_access = 0;
-
ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1);
if (zend_hash_quick_find(&zobj->ce->properties_info, Z_STRVAL_P(member),
Z_STRLEN_P(member)+1, h, (void **) &property_info)==SUCCESS) {
if (zend_verify_property_access(property_info, zobj->ce TSRMLS_CC)) {
@@ -203,6 +215,7 @@
}
}
if (EG(scope) != zobj->ce
+ && is_derived_class(zobj->ce, EG(scope))
&& EG(scope)
&& zend_hash_quick_find(&EG(scope)->properties_info,
Z_STRVAL_P(member), Z_STRLEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS
&& scope_property_info->flags & ZEND_ACC_PRIVATE) {
Index: php-src/tests/lang/bug24499.phpt
+++ php-src/tests/lang/bug24499.phpt
--TEST--
Bug #24499 (bogus handling of a public property as a private one)
--FILE--
id = "bar";
}
}
$id = new Id();
@$obj->foo = "bar";
$id->tester($obj);
print_r($obj);
?>
--EXPECT--
stdClass Object
(
[foo] => bar
[id] => bar
)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang 036.phpt 037.phpt
zeevMon Jul 21 07:48:37 2003 EDT
Added files:
/php-src/tests/lang 036.phpt 037.phpt
Log:
Add a couple of tests
Index: php-src/tests/lang/036.phpt
+++ php-src/tests/lang/036.phpt
--TEST--
Child public element should not override parent private element in parent methods
--FILE--
id;
}
};
class chld extends par {
public $id = "bar";
function displayHim()
{
parent::displayMe();
}
};
$obj = new chld();
$obj->displayHim();
?>
--EXPECT--
foo
Index: php-src/tests/lang/037.phpt
+++ php-src/tests/lang/037.phpt
--TEST--
'Static' binding for private variables
--FILE--
displayChild();
}
};
class chld extends par {
private $id = "bar";
function displayChild()
{
print $this->id;
}
};
$obj = new chld();
$obj->displayMe();
?>
--EXPECT--
bar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c php_ircg.h
At 16:31 08/07/2003, Sascha Schumann wrote: On Tue, 8 Jul 2003, Zeev Suraski wrote: > Judging by the complete silence, looks like you have lazy consensus! :) You two would really make for a good pair. :) Nah, not enough contrast. I'd go for you and Jani :) Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c php_ircg.h
Judging by the complete silence, looks like you have lazy consensus! :) Zeev At 17:40 07/07/2003, Derick Rethans wrote: On Mon, 7 Jul 2003, Sascha Schumann wrote: > sas Mon Jul 7 10:39:03 2003 EDT > > Modified files: (Branch: PHP_4_3) > /php-src/ext/ircg ircg.c php_ircg.h > Log: > Add support for who/invite/notice/lusers > Add ircg_names/ircg_invite/ircg_lusers/ircg_oper/ircg_who/ircg_list > > # feature patch applied to PHP_4_3 due to "won't be released status" > # of PHP_4 and HEAD being IRCG 3 incompatible. Isn't it much better off in PECL, where you have full control over your release cycle? regards, Derick -- "Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails." - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevMon Jul 7 08:07:02 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Add missing elements
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.51 php-src/ext/simplexml/simplexml.c:1.52
--- php-src/ext/simplexml/simplexml.c:1.51 Mon Jul 7 07:43:34 2003
+++ php-src/ext/simplexml/simplexml.c Mon Jul 7 08:07:02 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.51 2003/07/07 11:43:34 sniper Exp $ */
+/* $Id: simplexml.c,v 1.52 2003/07/07 12:07:02 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -799,6 +799,8 @@
ZEND_OBJECTS_STORE_HANDLERS,
sxe_property_read,
sxe_property_write,
+ NULL,
+ NULL,
sxe_property_get_ptr,
sxe_property_get_ptr,
sxe_object_get,
@@ -1053,7 +1055,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.51 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.52 $");
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug23922.phpt
zeevWed Jul 2 14:05:45 2003 EDT
Added files:
/php-src/tests/lang bug23922.phpt
Log:
Another test case
Index: php-src/tests/lang/bug23922.phpt
+++ php-src/tests/lang/bug23922.phpt
--TEST--
Bug #23922 (scope doesn't properly propagate into internal functions)
--FILE--
foo == 1'); }
function as_expr()
{ assert($this->foo == 1); }
}
$foo = new foo();
$foo->as_expr();
$foo->as_string();
?>
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug24403.phpt
zeevWed Jul 2 13:51:15 2003 EDT
Added files:
/php-src/tests/lang bug24403.phpt
Log:
Add test case
Index: php-src/tests/lang/bug24403.phpt
+++ php-src/tests/lang/bug24403.phpt
--TEST--
Bug #24403 (scope doesn't properly propagate into internal functions)
--FILE--
a) ? '\'.\$p[\'\\1\'].\'' :
'\'.\$r[\'\\1\'].\'')",
"{a} b {c}");
}
}
new a();
?>
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug22367.phpt
zeevWed Jul 2 11:08:11 2003 EDT
Modified files:
/php-src/tests/lang bug22367.phpt
Log:
Adjust expectations :)
Index: php-src/tests/lang/bug22367.phpt
diff -u php-src/tests/lang/bug22367.phpt:1.1 php-src/tests/lang/bug22367.phpt:1.2
--- php-src/tests/lang/bug22367.phpt:1.1Mon Feb 24 14:37:27 2003
+++ php-src/tests/lang/bug22367.phptWed Jul 2 11:08:11 2003
@@ -48,7 +48,7 @@
$a = new bar(5);
var_dump($a->idx);
[EMAIL PROTECTED]>c();
+$a->c();
$b = $a->b();
var_dump($b);
var_dump($a->test);
@@ -61,58 +61,10 @@
var_dump($a->test);
?>
---EXPECT--
+--EXPECTF--
int(5)
bool(false)
-bool(false)
-array(5) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
- [3]=>
- int(3)
- [4]=>
- int(4)
-}
-array(5) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
- [3]=>
- int(3)
- [4]=>
- int(4)
-}
-int(2)
-bool(true)
-bool(true)
-array(5) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
- [3]=>
- int(3)
- [4]=>
- int(4)
-}
-array(5) {
- [0]=>
- int(0)
- [1]=>
- int(1)
- [2]=>
- int(2)
- [3]=>
- int(3)
- [4]=>
- int(4)
-}
+
+Notice: Undefined offset: %d in %s on line %d
+
+Fatal error: Only variables or references can be returned by reference 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: CVSROOT / modules
At 14:19 01/07/2003, Sascha Schumann wrote: [useless information snipped] Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevTue Jul 1 08:11:12 2003 EDT Modified files: /CVSROOTmodules Log: Touch the modules file again, until Sascha stops his abuse or gets his account revoked, whichever comes first... Index: CVSROOT/modules diff -u CVSROOT/modules:1.64 CVSROOT/modules:1.65 --- CVSROOT/modules:1.64Tue Jul 1 03:51:46 2003 +++ CVSROOT/modules Tue Jul 1 08:11:12 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.64 2003/07/01 07:51:46 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.65 2003/07/01 12:11:12 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -18,7 +18,7 @@ # -l Top-level directory only -- do not recurse. # # And "directory" is a path to a directory relative to $CVSROOT. -# +# # The "-a" option specifies an alias. An alias is interpreted as if # everything on the right of the "-a" had been typed on the command line. # -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / modules
At 13:45 01/07/2003, Sascha Schumann wrote: As amusing your petty repetitive rants are I'm glad to be of service for whatever type of awkward sense of humor you may have. , I have to point out that so far noone stated any reason against removing the php5 alias. The exception is the "ease of use" argument which covers up the basic human dislike of change. In fact, several operations are easier _without_ the php5 alias. I see it's difficult for you to understand that you're not in a position to be the judge and decide whether a given reason is valid or not. Another concept that you appear to be finding difficult to grasp is that some of us around here are actually human. Ease of use is more than enough reason for us. If aliases such as php-src-ze2 give you a kick, you don't see me trying to prove to you that it's ugly as obfuscated Perl code and should be burned in the flames of hell. Likewise, stay away from our human, mortal php5 alias. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / modules
At 13:20 01/07/2003, Sascha Schumann wrote: Zeev, your insistence on having an alias which does not provide any additional functionality is simply irrational. That is why I am ignoring it. Luckily, your satisfaction with my reasoning is not relevant to whether or not you're allowed to remove this alias, since you're in no position to do it without active consensus. If you think you can self proclaim yourself as the judge for what's rational and what isn't, and ignore other opinions because you don't think they're rational, you're wrong. I consider most of what you say about almost any subject as irrational, and unfortunately, in our imperfect world, I can't just ignore it. There are perfectly good reasons for avoiding versioned module names[1]. Reasons which me as well as several other (key) people don't buy into. All problems including Edin's automated builds have been addressed and as such I consider the issue closed. How you consider the issue is really not very interesting to me as long as you don't touch the alias without having an active consensus. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevTue Jul 1 04:19:11 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: Add missing sqlite references Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.123 php-src/win32/php4dllts.dsp:1.124 --- php-src/win32/php4dllts.dsp:1.123 Mon Jun 30 07:43:14 2003 +++ php-src/win32/php4dllts.dsp Tue Jul 1 04:19:11 2003 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\ext\sqlite\Release_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\ext\sqlite\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" @@ -108,7 +108,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.l
[PHP-CVS] cvs: CVSROOT / modules
zeevTue Jul 1 03:51:47 2003 EDT Modified files: /CVSROOTmodules Log: Restore the status before Sascha applied his unagreed-upon patch Index: CVSROOT/modules diff -u CVSROOT/modules:1.63 CVSROOT/modules:1.64 --- CVSROOT/modules:1.63Mon Jun 30 12:14:13 2003 +++ CVSROOT/modules Tue Jul 1 03:51:46 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.63 2003/06/30 16:14:13 sas Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.64 2003/07/01 07:51:46 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -40,6 +40,7 @@ #php-src-ze1 -d php-src php-src &TSRM &Zend php-src-ze2 -d php-src php-src &TSRM &ze2-dir +php5 -d php5 php-src &ze2-dir &TSRM phpweb phpweb pear pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / modules
Sascha, I'm not sure what your definition for 'lazy consensus' is, but in the definition that's common among English speakers, it certainly did not exist here. I'm reverting this patch and until you get an active consensus (because I know of at least a few people that object this move, myself included, so a lazy consensus is simply not possible), don't bother removing it again, because it'll just be restored. Stop this stupidity please. Zeev At 18:28 30/06/2003, Sascha Schumann wrote: sas Mon Jun 30 11:28:36 2003 EDT Modified files: /CVSROOTmodules Log: remove php5 according to lazy consensus Index: CVSROOT/modules diff -u CVSROOT/modules:1.60 CVSROOT/modules:1.61 --- CVSROOT/modules:1.60Mon Jun 30 06:42:44 2003 +++ CVSROOT/modules Mon Jun 30 11:28:36 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.60 2003/06/30 10:42:44 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.61 2003/06/30 15:28:36 sas Exp $" # # Three different line formats are valid: # key -aaliases... @@ -38,7 +38,6 @@ php-src php-src &TSRM &Zend &ZendEngine2 php-src-ze1 -a php-src php-src-ze2 -a php-src -php5 -d php5 php-src &ze2-dir &TSRM #php-src-ze1 -d php-src php-src &TSRM &Zend #php-src-ze2 -d php-src php-src &TSRM &ze2-dir -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevMon Jun 30 07:43:14 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: Conform to the sqlite.dsp updates Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.122 php-src/win32/php4dllts.dsp:1.123 --- php-src/win32/php4dllts.dsp:1.122 Sat Jun 28 01:38:52 2003 +++ php-src/win32/php4dllts.dsp Mon Jun 30 07:43:14 2003 @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\ext\sqlite\Release_TS" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\ext\sqlite\Release_TSDbg" !ENDIF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/libsqlite/src libsqlite.dsp
zeevMon Jun 30 07:41:25 2003 EDT Modified files: /php-src/ext/sqlite/libsqlite/src libsqlite.dsp Log: Remove Release_TSinline (it's not necessary) Add Release_TSDbg Change directories to be consistent with our other modules... Index: php-src/ext/sqlite/libsqlite/src/libsqlite.dsp diff -u php-src/ext/sqlite/libsqlite/src/libsqlite.dsp:1.1 php-src/ext/sqlite/libsqlite/src/libsqlite.dsp:1.2 --- php-src/ext/sqlite/libsqlite/src/libsqlite.dsp:1.1 Fri Jun 27 10:14:08 2003 +++ php-src/ext/sqlite/libsqlite/src/libsqlite.dsp Mon Jun 30 07:41:25 2003 @@ -19,7 +19,7 @@ !MESSAGE !MESSAGE "libsqlite - Win32 Debug_TS" (based on "Win32 (x86) Static Library") !MESSAGE "libsqlite - Win32 Release_TS" (based on "Win32 (x86) Static Library") -!MESSAGE "libsqlite - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library") +!MESSAGE "libsqlite - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -38,8 +38,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_TS" -# PROP Intermediate_Dir "Debug_TS" +# PROP Output_Dir "..\..\Debug_TS" +# PROP Intermediate_Dir "..\..\Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /GZ /c @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\win32\Debug_TS\libsqlite.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS" @@ -61,8 +61,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_TS" -# PROP Intermediate_Dir "Release_TS" +# PROP Output_Dir "..\..\Release_TS" +# PROP Intermediate_Dir "..\..\Release_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c @@ -73,30 +73,30 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\..\win32\Release_TS\libsqlite.lib" +# ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS_inline" +!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_TS_inline" -# PROP BASE Intermediate_Dir "Release_TS_inline" +# PROP BASE Output_Dir "libsqlite___Win32_Release_TSDbg" +# PROP BASE Intermediate_Dir "libsqlite___Win32_Release_TSDbg" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_TS_inline" -# PROP Intermediate_Dir "Release_TS_inline" +# PROP Output_Dir "..\..\Release_TSDbg" +# PROP Intermediate_Dir "..\..\Release_TSDbg" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D THREADSAFE=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\Release_TS\libsqlite.lib" -# ADD LIB32 /nologo /out:"..\..\..\..\win32\Release_TS_inline\libsqlite.lib" +# ADD BASE LIB32 /nologo /out:"Release_TS\libsqlite.lib" +# ADD LIB32 /nologo !ENDIF @@ -104,7 +104,7 @@ # Name "libsqlite - Win32 Debug_TS" # Name "libsqlite - Win32 Release_TS" -# Name "libsqlite - Win32 Release_TS_inline" +# Name "libsqlite - Win32 Release_TSDbg" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -258,7 +258,7 @@ # End Custom Build -!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS_inline" +!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" # Begin Custom Build InputDir=. @@ -318,7 +318,7 @@ # End Custom Build -!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TS_inline" +!ELSEIF "$(CFG)" == "libsqlite - Win32 Release_TSDbg" # Begin Custom Build InputDir=. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 EngineSelect.dsp
zeevMon Jun 30 07:27:04 2003 EDT Modified files: /php-src/win32 EngineSelect.dsp Log: Remove unnecessary elements, internationalize Index: php-src/win32/EngineSelect.dsp diff -u php-src/win32/EngineSelect.dsp:1.1 php-src/win32/EngineSelect.dsp:1.2 --- php-src/win32/EngineSelect.dsp:1.1 Thu Jun 26 15:19:44 2003 +++ php-src/win32/EngineSelect.dsp Mon Jun 30 07:27:03 2003 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="EngineSelect" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) External Target" 0x0106 -CFG=EngineSelect - Win32 Debug -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl +CFG=EngineSelect - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "EngineSelect.mak". !MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "EngineSelect.mak" CFG="EngineSelect - Win32 Debug" +!MESSAGE NMAKE /f "EngineSelect.mak" CFG="EngineSelect - Win32 Release" !MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "EngineSelect - Win32 Release" (basierend auf "Win32 (x86) External Target") -!MESSAGE "EngineSelect - Win32 Debug" (basierend auf "Win32 (x86) External Target") +!MESSAGE "EngineSelect - Win32 Release" (based on "Win32 (x86) External Target") +!MESSAGE "EngineSelect - Win32 Debug" (based on "Win32 (x86) External Target") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ !IF "$(CFG)" == "EngineSelect - Win32 Release" -# PROP BASE Use_MFC +# PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" @@ -37,7 +37,7 @@ # PROP BASE Target_File "EngineSelect.exe" # PROP BASE Bsc_Name "EngineSelect.bsc" # PROP BASE Target_Dir "" -# PROP Use_MFC +# PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" @@ -49,7 +49,7 @@ !ELSEIF "$(CFG)" == "EngineSelect - Win32 Debug" -# PROP BASE Use_MFC +# PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" @@ -58,7 +58,7 @@ # PROP BASE Target_File "EngineSelect.exe" # PROP BASE Bsc_Name "EngineSelect.bsc" # PROP BASE Target_Dir "" -# PROP Use_MFC +# PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" @@ -81,17 +81,5 @@ !ENDIF -# Begin Group "Quellcodedateien" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header-Dateien" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Ressourcendateien" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group # End Target # End Project -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevMon Jun 30 06:42:44 2003 EDT Modified files: /CVSROOTmodules Log: Touch again Please do NOT edit this file not through CVS! Index: CVSROOT/modules diff -u CVSROOT/modules:1.59 CVSROOT/modules:1.60 --- CVSROOT/modules:1.59Sun Jun 29 10:43:54 2003 +++ CVSROOT/modules Mon Jun 30 06:42:44 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.59 2003/06/29 14:43:54 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.60 2003/06/30 10:42:44 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -26,6 +26,7 @@ # character to interpose another module into the current module. This # can be useful for creating a module that consists of many directories # spread out over the entire source repository. +# # Convenient aliases #world -a . -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevSun Jun 29 10:43:54 2003 EDT Modified files: /CVSROOTmodules Log: Touch Index: CVSROOT/modules diff -u CVSROOT/modules:1.58 CVSROOT/modules:1.59 --- CVSROOT/modules:1.58Wed Jun 25 10:06:37 2003 +++ CVSROOT/modules Sun Jun 29 10:43:54 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.58 2003/06/25 14:06:37 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.59 2003/06/29 14:43:54 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -26,7 +26,6 @@ # character to interpose another module into the current module. This # can be useful for creating a module that consists of many directories # spread out over the entire source repository. -# # Convenient aliases #world -a . -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main logos.h
zeevThu Jun 26 13:30:41 2003 EDT
Modified files:
/php-src/main logos.h
Log:
New logo (not final yet...)
Index: php-src/main/logos.h
diff -u php-src/main/logos.h:1.10 php-src/main/logos.h:1.11
--- php-src/main/logos.h:1.10 Tue Jun 10 16:03:41 2003
+++ php-src/main/logos.hThu Jun 26 13:30:41 2003
@@ -16,456 +16,226 @@
+--+
*/
-/* $Id: logos.h,v 1.10 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: logos.h,v 1.11 2003/06/26 17:30:41 zeev Exp $ */
#define CONTEXT_TYPE_IMAGE_GIF "Content-Type: image/gif"
unsigned char zend_logo[] = {
-71, 73, 70, 56, 57, 97, 100, 0, 58, 0,
- 247, 255, 0, 255, 255, 255, 8, 8, 8, 24,
-24, 24, 57, 57, 57, 74, 74, 74, 90, 90,
-90, 99, 99, 99, 123, 123, 123, 132, 132, 132,
- 140, 140, 140, 148, 148, 148, 189, 189, 189, 214,
- 214, 214, 231, 231, 231, 239, 239, 239, 90, 99,
-99, 222, 231, 239, 57, 66, 74, 165, 173, 181,
- 0, 8, 16, 214, 222, 231, 57, 66, 82, 16,
-33, 66, 0, 8, 24, 24, 41, 82, 222, 231,
- 255, 57, 66, 90, 198, 206, 231, 181, 189, 214,
-99, 107, 132, 0, 8, 33, 189, 198, 231, 123,
- 132, 165, 148, 165, 231, 123, 140, 206, 123, 148,
- 239, 49, 66, 132, 24, 33, 66, 49, 74, 165,
- 214, 222, 255, 206, 214, 247, 181, 189, 222, 148,
- 156, 189, 123, 132, 173, 156, 173, 247, 132, 148,
- 214, 99, 115, 181, 49, 57, 90, 41, 49, 82,
-90, 107, 181, 82, 99, 173, 24, 33, 74, 57,
-82, 189, 49, 74, 173, 16, 24, 57, 8, 16,
-49, 198, 206, 247, 181, 189, 231, 165, 173, 214,
-99, 107, 148, 74, 82, 123, 140, 156, 239, 66,
-74, 115, 115, 132, 222, 41, 49, 90, 57, 74,
- 165, 49, 66, 148, 49, 66, 156, 41, 57, 140,
-57, 82, 206, 33, 49, 123, 57, 82, 214, 16,
-24, 66, 198, 206, 255, 181, 189, 239, 189, 198,
- 255, 156, 165, 214, 140, 148, 198, 132, 140, 189,
- 115, 123, 173, 90, 99, 148, 132, 148, 247, 123,
- 140, 239, 107, 123, 214, 115, 132, 231, 57, 66,
- 115, 107, 123, 222, 115, 132, 239, 57, 66, 123,
-99, 115, 214, 90, 107, 214, 74, 90, 181, 74,
-90, 189, 66, 82, 173, 57, 74, 173, 49, 66,
- 165, 66, 90, 231, 49, 66, 173, 24, 33, 90,
-41, 57, 156, 33, 49, 140, 8, 16, 66, 181,
- 189, 247, 165, 173, 231, 148, 156, 214, 132, 140,
- 198, 115, 123, 181, 82, 90, 148, 49, 57, 115,
-99, 115, 231, 90, 107, 231, 82, 99, 214, 82,
-99, 222, 74, 90, 206, 82, 99, 231, 66, 82,
- 189, 33, 41, 99, 57, 74, 189, 57, 74, 198,
-57, 74, 206, 49, 66, 181, 41, 57, 165, 24,
-33, 99, 16, 24, 82, 8, 16, 74, 173, 181,
- 247, 173, 181, 255, 165, 173, 247, 140, 148, 214,
- 156, 165, 239, 165, 173, 255, 156, 165, 247, 132,
- 140, 214, 140, 148, 231, 99, 107, 173, 107, 115,
- 189, 115, 123, 206, 123, 132, 222, 99, 107, 189,
-82, 90, 165, 90, 99, 181, 74, 82, 156, 82,
-90, 173, 90, 99, 189, 66, 74, 140, 57, 66,
- 140, 57, 66, 148, 41, 49, 115, 74, 90, 222,
-74, 90, 231, 41, 49, 132, 66, 82, 222, 33,
-41, 115, 33, 41, 123, 24, 33, 107, 24, 33,
- 123, 16, 24, 90, 148, 156, 247, 140, 148, 239,
- 132, 140, 231, 140, 148, 247, 132, 140, 239, 123,
- 132, 231, 107, 115, 206, 123, 132, 239, 123, 132,
- 247, 99, 107, 206, 99, 107, 214, 82, 90, 181,
-90, 99, 206, 49, 57, 148, 41, 49, 148, 33,
-41, 140, 239, 239, 247, 247, 247, 255, 198, 198,
- 206, 214, 214, 222, 173, 173, 181, 189, 189, 198,
- 148, 148, 156, 156, 156, 165, 231, 231, 247, 239,
- 239, 255, 173, 173, 189, 90, 90, 99, 231, 231,
- 255, 222, 222, 247, 140, 140, 156, 66, 66, 74,
- 132, 132, 148, 198, 198, 222, 123, 123, 140, 173,
- 173, 198, 107, 107, 123, 222, 222, 255, 57, 57,
-66, 49, 49, 57, 156, 156, 181, 198, 198, 231,
- 140, 140, 165, 181, 181, 214, 90, 90, 107, 214,
- 214, 255, 165, 165, 198, 82, 82, 99, 123, 123,
- 148, 74, 74, 90, 115, 115, 140, 33, 33, 41,
-99, 99, 123, 156, 156, 198, 90, 90, 115, 132,
- 132, 173, 173, 173, 231, 165, 165, 222, 24, 24,
-33, 82, 82, 115, 156, 156, 222, 115, 115, 165,
-57, 57, 82, 107, 107, 156, 123, 123, 181, 33,
-33, 49, 156, 156, 231, 82, 82, 123, 49, 49,
-74, 107, 107, 165, 74, 74, 115, 148, 148, 231,
-57, 57, 90, 41, 41, 66, 82, 82, 132, 66,
-66, 107, 132, 132, 214, 140, 140, 231, 99, 99,
- 165, 123, 123, 206, 66, 66, 115, 82, 82, 148,
-
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevThu Jun 26 11:31:48 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: libxml work use static libxml library Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.117 php-src/win32/php4dllts.dsp:1.118 --- php-src/win32/php4dllts.dsp:1.117 Thu Jun 26 10:19:42 2003 +++ php-src/win32/php4dllts.dsp Thu Jun 26 11:31:48 2003 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\..\zlib\Release" /libpath:"..\..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" @@ -108,7 +108,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\zlib\Release" /libpath:"..\..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:&q
[PHP-CVS] cvs: php-src /win32 php4dllts.dsp
zeevThu Jun 26 10:19:42 2003 EDT Modified files: /php-src/win32 php4dllts.dsp Log: - Add libxml directory - Add zlib to configurations where it was missing - Remove libmysql linkage Index: php-src/win32/php4dllts.dsp diff -u php-src/win32/php4dllts.dsp:1.116 php-src/win32/php4dllts.dsp:1.117 --- php-src/win32/php4dllts.dsp:1.116 Wed Jun 25 17:37:50 2003 +++ php-src/win32/php4dllts.dsp Thu Jun 26 10:19:42 2003 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\zlib" /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D &qu
[PHP-CVS] cvs: CVSROOT / modules
zeevWed Jun 25 10:06:37 2003 EDT Modified files: /CVSROOTmodules Log: Fix php5 Index: CVSROOT/modules diff -u CVSROOT/modules:1.57 CVSROOT/modules:1.58 --- CVSROOT/modules:1.57Wed Jun 25 09:06:11 2003 +++ CVSROOT/modules Wed Jun 25 10:06:37 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.57 2003/06/25 13:06:11 zeev Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.58 2003/06/25 14:06:37 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -38,7 +38,7 @@ php-src php-src &TSRM &Zend &ZendEngine2 php-src-ze1 -a php-src php-src-ze2 -a php-src -php5 -d php5 php-src &Zend &TSRM +php5 -d php5 php-src &ze2-dir &TSRM #php-src-ze1 -d php-src php-src &TSRM &Zend #php-src-ze2 -d php-src php-src &TSRM &ze2-dir -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / modules
At 16:24 25/06/2003, Sascha Schumann wrote: > The new setup is a good way > to keep things behind the scenes, but there's no reason to prevent people > from easily checking out the latest version. Zeev, it is quite hard to take you serious at times. I think we both feel like that about each other, albeit I'd say that a more accurate way to put it is that every now and then it's feasible to take you seriously :) Why typing "php-src" vs. "php5" should prevent people from easily checking out the PHP source code is really beyond me. Sigh, it's about the name, it's about the ease of having both php4 and php5 around, and it's about not having to mess with what version of the engine needs to be checked out. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / modules
At 16:11 25/06/2003, Sascha Schumann wrote: On Wed, 25 Jun 2003, Zeev Suraski wrote: > zeev Wed Jun 25 09:06:11 2003 EDT > > Modified files: > /CVSROOT modules > Log: > Add missing alias The developers should get used to the one source module idea. Adding an alias which reinforces the idea that each major version lives in its own module is a counterproductive measure. I don't see it as one, nor was it agreed upon. The new setup is a good way to keep things behind the scenes, but there's no reason to prevent people from easily checking out the latest version. It's just behind the scenes - many (my guess - most) people will still use two separate checkouts if they work on both versions, so it won't have any real world meaning. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevWed Jun 25 09:06:11 2003 EDT Modified files: /CVSROOTmodules Log: Add missing alias Index: CVSROOT/modules diff -u CVSROOT/modules:1.56 CVSROOT/modules:1.57 --- CVSROOT/modules:1.56Wed Jun 25 09:03:09 2003 +++ CVSROOT/modules Wed Jun 25 09:06:11 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.56 2003/06/25 13:03:09 sas Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.57 2003/06/25 13:06:11 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -38,6 +38,7 @@ php-src php-src &TSRM &Zend &ZendEngine2 php-src-ze1 -a php-src php-src-ze2 -a php-src +php5 -d php5 php-src &Zend &TSRM #php-src-ze1 -d php-src php-src &TSRM &Zend #php-src-ze2 -d php-src php-src &TSRM &ze2-dir -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevWed Jun 25 08:46:41 2003 EDT Modified files: /CVSROOTmodules Log: Add missing alias Index: CVSROOT/modules diff -u CVSROOT/modules:1.53 CVSROOT/modules:1.54 --- CVSROOT/modules:1.53Wed Jun 25 08:44:18 2003 +++ CVSROOT/modules Wed Jun 25 08:46:41 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.53 2003/06/25 12:44:18 sas Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.54 2003/06/25 12:46:41 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -41,6 +41,7 @@ php-src-ze1 -d php-src php-src &TSRM &Zend php-src-ze2 -d php-src php-src &TSRM &ze2-dir +php5 -d php5 php-src &TSRM &ze2-dir phpweb phpweb pear pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / modules
zeevWed Jun 25 08:10:50 2003 EDT Modified files: /CVSROOTmodules Log: Restore php5 alias Index: CVSROOT/modules diff -u CVSROOT/modules:1.51 CVSROOT/modules:1.52 --- CVSROOT/modules:1.51Mon Jun 23 23:04:13 2003 +++ CVSROOT/modules Wed Jun 25 08:10:49 2003 @@ -1,7 +1,7 @@ # # The CVS Modules File # -#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.51 2003/06/24 03:04:13 sas Exp $" +#ident "@(#)cvs/examples:$Name: $:$Id: modules,v 1.52 2003/06/25 12:10:49 zeev Exp $" # # Three different line formats are valid: # key -aaliases... @@ -41,6 +41,7 @@ php-src-ze1 -d php-src php-src &TSRM &Zend php-src-ze2 -d php-src php-src &TSRM &ze2-dir +php5 -d php5 php-src &ze2-dir &TSRM phpweb phpweb pear pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/xml expat_compat.h
zeevSun Jun 8 14:29:55 2003 EDT Modified files: /php4/ext/xml expat_compat.h Log: XMLless build fix Index: php4/ext/xml/expat_compat.h diff -u php4/ext/xml/expat_compat.h:1.7 php4/ext/xml/expat_compat.h:1.8 --- php4/ext/xml/expat_compat.h:1.7 Wed May 21 23:29:05 2003 +++ php4/ext/xml/expat_compat.h Sun Jun 8 14:29:55 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: expat_compat.h,v 1.7 2003/05/22 03:29:05 sterling Exp $ */ +/* $Id: expat_compat.h,v 1.8 2003/06/08 18:29:55 zeev Exp $ */ #ifndef PHP_EXPAT_COMPAT_H #define PHP_EXPAT_COMPAT_H @@ -135,7 +135,7 @@ const XML_Char *XML_ExpatVersion(void); void XML_ParserFree(XML_Parser); -#else +#elif defined(HAVE_LIBEXPAT) #include #endif /* HAVE_LIBEXPAT */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
