date:20030616

[PHP-CVS-DAILY] cvs: Zend / ChangeLog

2003-06-16 Thread changelog

changelog   Mon Jun 16 20:31:39 2003 EDT

  Modified files:  
/Zend   ChangeLog 
  Log:
  ChangeLog update
  
Index: Zend/ChangeLog
diff -u Zend/ChangeLog:1.134 Zend/ChangeLog:1.135
--- Zend/ChangeLog:1.134Sat Jun 14 20:30:58 2003
+++ Zend/ChangeLog  Mon Jun 16 20:31:38 2003
@@ -1,3 +1,9 @@
+2003-06-16  Stanislav Malyshev  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  zend_builtin_functions.c:
+  MFZE2: fix lambda function static vars (related to #17115)
+
 2003-06-14  Marcus Boerger  [EMAIL PROTECTED]
 
 * (PHP_4_3)
@@ -1278,7 +1284,7 @@
 
 2002-05-13  Sterling Hughes  [EMAIL PROTECTED]
 
-* zend_qsort.c: add $Id: ChangeLog,v 1.134 2003/06/15 00:30:58 changelog Exp $ tag
+* zend_qsort.c: add $Id: ChangeLog,v 1.135 2003/06/17 00:31:38 changelog Exp $ tag
 
 2002-05-13  Derick Rethans  [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / configure.in

2003-06-16 Thread Stanislav Malyshev

stasMon Jun 16 04:32:35 2003 EDT

  Modified files:  
/php4   configure.in 
  Log:
  default_classes belongs to ZE2 part
  
  
Index: php4/configure.in
diff -u php4/configure.in:1.446 php4/configure.in:1.447
--- php4/configure.in:1.446 Sat May 24 08:00:03 2003
+++ php4/configure.in   Mon Jun 16 04:32:35 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.446 2003/05/24 12:00:03 helly Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.447 2003/06/16 08:32:35 stas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1136,10 +1136,10 @@
 zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
 zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
 zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c 
zend_default_classes.c)
+zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c)
 
 if test -r $abs_srcdir/Zend/zend_objects.c; then
-  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c 
zend_mm.c)
+  PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c 
zend_mm.c zend_default_classes.c)
 fi
 
 dnl Selectively disable optimization due to high RAM usage during



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/dba dba.c

2003-06-16 Thread Edin Kadribasic

edink   Mon Jun 16 05:11:31 2003 EDT

  Modified files:  
/php4/ext/dba   dba.c 
  Log:
  Fixed win32 build
  
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.93 php4/ext/dba/dba.c:1.94
--- php4/ext/dba/dba.c:1.93 Fri Jun 13 10:59:01 2003
+++ php4/ext/dba/dba.c  Mon Jun 16 05:11:31 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dba.c,v 1.93 2003/06/13 14:59:01 andrey Exp $ */
+/* $Id: dba.c,v 1.94 2003/06/16 09:11:31 edink Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -37,6 +37,7 @@
 #include php_dba.h
 #include ext/standard/info.h
 #include ext/standard/php_string.h
+#include ext/standard/flock_compat.h
 
 #include php_gdbm.h
 #include php_ndbm.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /tests/lang bug18872.phpt bug23279.phpt bug23384.phpt

2003-06-16 Thread Stanislav Malyshev

stasMon Jun 16 05:20:42 2003 EDT

  Added files: 
/php4/tests/langbug18872.phpt bug23279.phpt bug23384.phpt 
  Log:
  add tests for fixed bugs
  
  

Index: php4/tests/lang/bug18872.phpt
+++ php4/tests/lang/bug18872.phpt
--TEST--
Bug #18872 (class constant used as default parameter)
--FILE--
?php   
class FooBar {   
const BIFF = 3;   
}   
   
function foo($biff = FooBar::BIFF) {   
echo $biff . \n;   
}   
   
foo();   
foo();   
?   
--EXPECT--
3
3

Index: php4/tests/lang/bug23279.phpt
+++ php4/tests/lang/bug23279.phpt
--TEST--
Bug #23279 (exception handler stops after first function call)
--FILE--
?php
ob_start();
set_exception_handler('redirect_on_error');
echo Hello World\n;
throw new Exception;

function redirect_on_error($e) {
ob_end_clean();
echo Goodbye Cruel World\n;
}
?
--EXPECT--
Goodbye Cruel World

Index: php4/tests/lang/bug23384.phpt
+++ php4/tests/lang/bug23384.phpt
--TEST--
Bug #23384 (use of class constants in statics)
--FILE--
?php
define('TEN', 10);
class Foo {
const HUN = 100;
function test($x = Foo::HUN) {
static $arr2 = array(TEN = 'ten');
static $arr = array(Foo::HUN = 'ten');

print_r($arr);
print_r($arr2);
print_r($x);
}
}

Foo::test();   
echo Foo::HUN.\n;
?
--EXPECT--
Array
(
[100] = ten
)
Array
(
[10] = ten
)
100100



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /tests/classes bug23951.phpt

2003-06-16 Thread Stanislav Malyshev

stasMon Jun 16 05:27:33 2003 EDT

  Modified files:  
/php4/tests/classes bug23951.phpt 
  Log:
  fix test so it does not depend on variable order
  
  
Index: php4/tests/classes/bug23951.phpt
diff -u php4/tests/classes/bug23951.phpt:1.1 php4/tests/classes/bug23951.phpt:1.2
--- php4/tests/classes/bug23951.phpt:1.1Mon Jun  2 07:12:25 2003
+++ php4/tests/classes/bug23951.phptMon Jun 16 05:27:33 2003
@@ -22,7 +22,8 @@
 $b = new B;
 
 print_r($a);
-print_r($b);
+print_r($b-a_var);
+print_r($b-b_var);
 
 ?
 --EXPECT--
@@ -35,13 +36,9 @@
 )
 
 )
-b Object
+Array
 (
-[a_var] = Array
-(
-[1] = foo1_value
-[2] = foo2_value
-)
-
-[b_var] = foo
+[1] = foo1_value
+[2] = foo2_value
 )
+foo



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/interbase interbase.c

2003-06-16 Thread Daniela Mariaschi

daniela Mon Jun 16 06:41:42 2003 EDT

  Modified files:  
/php4/ext/interbase interbase.c 
  Log:
  proto fixes ibase_rollback and ibase_commit
  
  
Index: php4/ext/interbase/interbase.c
diff -u php4/ext/interbase/interbase.c:1.110 php4/ext/interbase/interbase.c:1.111
--- php4/ext/interbase/interbase.c:1.110Sun Jun 15 08:10:28 2003
+++ php4/ext/interbase/interbase.c  Mon Jun 16 06:41:42 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: interbase.c,v 1.110 2003/06/15 12:10:28 edink Exp $ */
+/* $Id: interbase.c,v 1.111 2003/06/16 10:41:42 daniela Exp $ */
 
 
 /* TODO: Arrays, roles?
@@ -628,7 +628,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.110 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.111 $);
 #ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, Dynamic Module, yes);
 #endif
@@ -1674,7 +1674,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool ibase_commit([resource link_identifier [, int trans_number]])
+/* {{{ proto bool ibase_commit( resource link_identifier )
Commit transaction */
 PHP_FUNCTION(ibase_commit)
 {
@@ -1682,8 +1682,8 @@
 }
 /* }}} */
 
-/* {{{ proto bool ibase_rollback([resource link_identifier [, int trans_number]])
-   Roolback transaction */
+/* {{{ proto bool ibase_rollback( resource link_identifier )
+   Rollback transaction */
 PHP_FUNCTION(ibase_rollback)
 {
_php_ibase_trans_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, ROLLBACK);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /tests/lang bug21669.phpt

2003-06-16 Thread Stanislav Malyshev

stasMon Jun 16 08:26:07 2003 EDT

  Added files: 
/php4/tests/langbug21669.phpt 
  Log:
  Add test for the bug - will fail for now!
  
  

Index: php4/tests/lang/bug21669.phpt
+++ php4/tests/lang/bug21669.phpt
--TEST--
Bug #21669  $obj = new $this-var; doesn't work
--FILE--
?php
class Test {
function say_hello() {
echo Hello world;
}
}

class Factory {
var $name = Test;
function create() {
$obj = new $this-name; /* Parse error */
return $obj;
}
}
$factory = new Factory;
$test = $factory-create();
$test-say_hello();
?
--EXPECT--
Hello world



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/hyperwave hw.c

2003-06-16 Thread Ilia Alshanetsky

iliaa   Mon Jun 16 08:33:51 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/hyperwave hw.c 
  Log:
  Hopefully fix win32 build
  
  
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.111.2.4 php4/ext/hyperwave/hw.c:1.111.2.5
--- php4/ext/hyperwave/hw.c:1.111.2.4   Sun Jun 15 23:07:07 2003
+++ php4/ext/hyperwave/hw.c Mon Jun 16 08:33:51 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: hw.c,v 1.111.2.4 2003/06/16 03:07:07 iliaa Exp $ */
+/* $Id: hw.c,v 1.111.2.5 2003/06/16 12:33:51 iliaa Exp $ */
 
 #include stdlib.h
 #include errno.h
@@ -34,7 +34,7 @@
 #include SAPI.h
 
 #ifdef PHP_WIN32
-#include winsock.h
+#include winsock2.h
 #endif
 
 #if HYPERWAVE



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/iconv iconv.c

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 09:32:00 2003 EDT

  Modified files:  
/php4/ext/iconv iconv.c 
  Log:
  proto fix
  
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.88 php4/ext/iconv/iconv.c:1.89
--- php4/ext/iconv/iconv.c:1.88 Tue Jun 10 16:03:30 2003
+++ php4/ext/iconv/iconv.c  Mon Jun 16 09:32:00 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: iconv.c,v 1.88 2003/06/10 20:03:30 imajes Exp $ */
+/* $Id: iconv.c,v 1.89 2003/06/16 13:32:00 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1800,7 +1800,7 @@
 }
 /* }}} */
 
-/* {{{ proto array iconv_get_encoding([string type])
+/* {{{ proto mixed iconv_get_encoding([string type])
Get internal encoding and output encoding for ob_iconv_handler() */
 PHP_FUNCTION(iconv_get_encoding)
 {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mcal php_mcal.c

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 10:03:30 2003 EDT

  Modified files:  
/php4/ext/mcal  php_mcal.c 
  Log:
  proto fixes
  
Index: php4/ext/mcal/php_mcal.c
diff -u php4/ext/mcal/php_mcal.c:1.58 php4/ext/mcal/php_mcal.c:1.59
--- php4/ext/mcal/php_mcal.c:1.58   Tue Jun 10 16:03:31 2003
+++ php4/ext/mcal/php_mcal.cMon Jun 16 10:03:30 2003
@@ -338,7 +338,7 @@
}
 }
 
-/* {{{ proto int mcal_close(int stream_id [, int options])
+/* {{{ proto bool mcal_close(int stream_id [, int options])
Close an MCAL stream */
 PHP_FUNCTION(mcal_close)
 {
@@ -384,7 +384,7 @@
php_mcal_do_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
 
-/* {{{ proto int mcal_reopen(int stream_id, string calendar [, int options])
+/* {{{ proto bool mcal_reopen(int stream_id, string calendar [, int options])
Reopen MCAL stream to a new calendar */
 PHP_FUNCTION(mcal_reopen)
 {
@@ -422,7 +422,7 @@
 }
 /* }}} */
 
-/* {{{ proto int mcal_expunge(int stream_id)
+/* {{{ proto bool mcal_expunge(int stream_id)
Delete all events marked for deletion */
 PHP_FUNCTION(mcal_expunge)
 {
@@ -449,7 +449,7 @@
 }
 /* }}} */
 
-/* {{{ proto int mcal_fetch_event(int stream_id, int eventid [, int options])
+/* {{{ proto object mcal_fetch_event(int stream_id, int eventid [, int options])
Fetch an event */
 PHP_FUNCTION(mcal_fetch_event)
 {
@@ -562,7 +562,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_create_calendar(int stream_id, string calendar)
+/* {{{ proto bool mcal_create_calendar(int stream_id, string calendar)
Create a new calendar */
 PHP_FUNCTION(mcal_create_calendar)
 {
@@ -596,7 +596,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_rename_calendar(int stream_id, string src_calendar, string 
dest_calendar)
+/* {{{ proto bool mcal_rename_calendar(int stream_id, string src_calendar, string 
dest_calendar)
Rename a calendar */
 PHP_FUNCTION(mcal_rename_calendar)
 {
@@ -627,7 +627,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool mcal_list_alarms(int stream_id, int year, int month, int day, int 
hour, int min, int sec)
+/* {{{ proto array mcal_list_alarms(int stream_id, int year, int month, int day, int 
hour, int min, int sec)
List alarms for a given time */
 PHP_FUNCTION(mcal_list_alarms)
 {
@@ -676,7 +676,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_delete_calendar(int stream_id, string calendar)
+/* {{{ proto bool mcal_delete_calendar(int stream_id, string calendar)
Delete calendar */
 PHP_FUNCTION(mcal_delete_calendar)
 {
@@ -711,7 +711,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_delete_event(int stream_id, int event_id)
+/* {{{ proto bool mcal_delete_event(int stream_id, int event_id)
Delete an event */
 PHP_FUNCTION(mcal_delete_event)
 {
@@ -742,7 +742,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_append_event(int stream_id)
+/* {{{ proto int mcal_append_event(int stream_id)
Append a new event to the calendar stream */
 PHP_FUNCTION(mcal_append_event)
 {
@@ -773,7 +773,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_store_event(int stream_id)
+/* {{{ proto int mcal_store_event(int stream_id)
Store changes to an event */
 PHP_FUNCTION(mcal_store_event)
 {
@@ -802,7 +802,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_snooze(int stream_id, int uid)
+/* {{{ proto bool mcal_snooze(int stream_id, int uid)
Snooze an alarm */
 PHP_FUNCTION(mcal_snooze)
 {
@@ -834,7 +834,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_event_set_category(int stream_id, string category)
+/* {{{ proto void mcal_event_set_category(int stream_id, string category)
Attach a category to an event */
 PHP_FUNCTION(mcal_event_set_category)
 {
@@ -861,7 +861,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_event_set_title(int stream_id, string title)
+/* {{{ proto void mcal_event_set_title(int stream_id, string title)
Attach a title to an event */
 PHP_FUNCTION(mcal_event_set_title)
 {
@@ -888,7 +888,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_event_set_description(int stream_id, string description)
+/* {{{ proto void mcal_event_set_description(int stream_id, string description)
Attach a description to an event */
 PHP_FUNCTION(mcal_event_set_description)
 {
@@ -915,7 +915,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_event_set_start(int stream_id, int year,int month, int day 
[[[, int hour], int min], int sec])
+/* {{{ proto void mcal_event_set_start(int stream_id, int year,int month, int day 
[[[, int hour], int min], int sec])
Attach a start datetime to an event */
 PHP_FUNCTION(mcal_event_set_start)
 {
@@ -954,7 +954,7 @@
 }
 /* }}} */
 
-/* {{{ proto string mcal_event_set_end(int stream_id, int year,int month, int day 
[[[, int hour], int min], int sec])
+/* {{{ proto void mcal_event_set_end(int stream_id, int year,int month, int day [[[, 
int hour], int min], int sec])
Attach an end datetime to an event */
 PHP_FUNCTION(mcal_event_set_end)
 {
@@ -995,7 +995,7 @@
 }
 /* }}} */
 
-/* {{{ proto int mcal_event_set_alarm(int stream_id, int alarm)
+/* {{{ proto void mcal_event_set_alarm(int

[PHP-CVS] cvs: php4 /ext/mcve mcve.c php_mcve.h

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 10:20:05 2003 EDT

  Modified files:  
/php4/ext/mcve  mcve.c php_mcve.h 
  Log:
  added $Id tag
  
Index: php4/ext/mcve/mcve.c
diff -u php4/ext/mcve/mcve.c:1.18 php4/ext/mcve/mcve.c:1.19
--- php4/ext/mcve/mcve.c:1.18   Tue Jun 10 16:03:31 2003
+++ php4/ext/mcve/mcve.cMon Jun 16 10:20:05 2003
@@ -17,6 +17,8 @@
+--+
 */
 
+/* $Id: mcve.c,v 1.19 2003/06/16 14:20:05 andrey Exp $ */
+
 /* standard php include(s) */
 #include php.h
 #include ext/standard/head.h
Index: php4/ext/mcve/php_mcve.h
diff -u php4/ext/mcve/php_mcve.h:1.9 php4/ext/mcve/php_mcve.h:1.10
--- php4/ext/mcve/php_mcve.h:1.9Tue Jun 10 16:03:31 2003
+++ php4/ext/mcve/php_mcve.hMon Jun 16 10:20:05 2003
@@ -16,6 +16,7 @@
|  Chris Faulhaber [EMAIL PROTECTED]|
+--+
 */
+/* $Id: php_mcve.h,v 1.10 2003/06/16 14:20:05 andrey Exp $ */
 
 #ifndef _PHP_MCVE_H
 #define _PHP_MCVE_H



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mhash mhash.c php_mhash.h

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 10:27:59 2003 EDT

  Modified files:  
/php4/ext/mhash mhash.c php_mhash.h 
  Log:
  $Id tag added. License added tp php_mhash.h
  
Index: php4/ext/mhash/mhash.c
diff -u php4/ext/mhash/mhash.c:1.45 php4/ext/mhash/mhash.c:1.46
--- php4/ext/mhash/mhash.c:1.45 Tue Jun 10 16:03:31 2003
+++ php4/ext/mhash/mhash.c  Mon Jun 16 10:27:59 2003
@@ -16,6 +16,7 @@
|  Nikos Mavroyanopoulos [EMAIL PROTECTED] (HMAC, KEYGEN)   |
+--+
  */
+/* $Id: mhash.c,v 1.46 2003/06/16 14:27:59 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
Index: php4/ext/mhash/php_mhash.h
diff -u php4/ext/mhash/php_mhash.h:1.9 php4/ext/mhash/php_mhash.h:1.10
--- php4/ext/mhash/php_mhash.h:1.9  Sun Feb 23 22:27:00 2003
+++ php4/ext/mhash/php_mhash.h  Mon Jun 16 10:27:59 2003
@@ -1,3 +1,23 @@
+/*
+   +--+
+   | PHP Version 4|
+   +--+
+   | Copyright (c) 1997-2003 The PHP Group|
+   +--+
+   | This source file is subject to version 3.0 of the PHP license,   |
+   | that is bundled with this package in the file LICENSE, and is|
+   | available through the world-wide-web at the following url:   |
+   | http://www.php.net/license/3_0.txt.  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to  |
+   | [EMAIL PROTECTED] so we can mail you a copy immediately.   |
+   +--+
+   | Authors: Sascha Schumann [EMAIL PROTECTED]|
+   |  Nikos Mavroyanopoulos [EMAIL PROTECTED] (HMAC, KEYGEN)   |
+   +--+
+ */
+/* $Id: php_mhash.h,v 1.10 2003/06/16 14:27:59 andrey Exp $ */
+
 #ifndef PHP_MHASH_H
 #define PHP_MHASH_H
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/ming ming.c

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 11:12:55 2003 EDT

  Modified files:  
/php4/ext/ming  ming.c 
  Log:
  load of proto fixes
  Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.45 php4/ext/ming/ming.c:1.46
--- php4/ext/ming/ming.c:1.45   Tue Jun 10 16:03:32 2003
+++ php4/ext/ming/ming.cMon Jun 16 11:12:55 2003
@@ -14,8 +14,12 @@
+--+
| Author: [EMAIL PROTECTED]  |
+--+
+   
+  $Id: ming.c,v 1.46 2003/06/16 15:12:55 andrey Exp $ 
+
 */
 
+
 #include stdio.h
 #include math.h
 
@@ -279,7 +283,7 @@
{ NULL, NULL, NULL }
 };
 
-/* {{{ proto class swfbitmap_init(file [, maskfile])
+/* {{{ proto class swfbitmap_init(mixed file [, mixed maskfile])
Returns a new SWFBitmap object from jpg (with optional mask) or dbl file */
 PHP_FUNCTION(swfbitmap_init)
 {
@@ -346,7 +350,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbitmap_getWidth(void)
+/* {{{ proto float swfbitmap_getWidth(void)
Returns the width of this bitmap */
 PHP_FUNCTION(swfbitmap_getWidth)
 {
@@ -354,7 +358,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbitmap_getHeight(void)
+/* {{{ proto float swfbitmap_getHeight(void)
Returns the height of this bitmap */
 PHP_FUNCTION(swfbitmap_getHeight)
 {
@@ -408,7 +412,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_setHit(SWFCharacter)
+/* {{{ proto void swfbutton_setHit(object SWFCharacter)
Sets the character for this button's hit test state */
 PHP_FUNCTION(swfbutton_setHit)
 {
@@ -426,7 +430,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_setOver(SWFCharacter)
+/* {{{ proto void swfbutton_setOver(object SWFCharacter)
Sets the character for this button's over state */
 PHP_FUNCTION(swfbutton_setOver)
 {
@@ -444,7 +448,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_setUp(SWFCharacter)
+/* {{{ proto void swfbutton_setUp(object SWFCharacter)
Sets the character for this button's up state */
 PHP_FUNCTION(swfbutton_setUp)
 {
@@ -462,7 +466,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_setDown(SWFCharacter)
+/* {{{ proto void swfbutton_setDown(object SWFCharacter)
Sets the character for this button's down state */
 PHP_FUNCTION(swfbutton_setDown)
 {
@@ -480,7 +484,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_addShape(SWFCharacter character, int flags)
+/* {{{ proto void swfbutton_addShape(object SWFCharacter, int flags)
Sets the character to display for the condition described in flags */
 PHP_FUNCTION(swfbutton_addShape)
 {
@@ -499,7 +503,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_setAction(SWFAction)
+/* {{{ proto void swfbutton_setAction(object SWFAction)
Sets the action to perform when button is pressed */
 PHP_FUNCTION(swfbutton_setAction)
 {
@@ -517,7 +521,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfbutton_addAction(SWFAction action, int flags)
+/* {{{ proto void swfbutton_addAction(object SWFAction, int flags)
Sets the action to perform when conditions described in flags is met */
 PHP_FUNCTION(swfbutton_addAction)
 {
@@ -612,7 +616,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfdisplayitem_move(int dx, int dy)
+/* {{{ proto void swfdisplayitem_move(float dx, float dy)
Displaces this SWFDisplayItem by (dx, dy) in movie coordinates */
 PHP_FUNCTION(swfdisplayitem_move)
 {
@@ -886,7 +890,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swfdisplayitem_addAction(SWFAction action, int flags)
+/* {{{ proto void swfdisplayitem_addAction(object SWFAction, int flags)
Adds this SWFAction to the given SWFSprite instance */
 PHP_FUNCTION(swfdisplayitem_addAction)
 {
@@ -947,7 +951,7 @@
 }
 /* }}} */
 
-/* {{{ proto void swffill_moveTo(int x, int y)
+/* {{{ proto void swffill_moveTo(float x, float y)
Moves this SWFFill to shape coordinates (x,y) */
 PHP_FUNCTION(swffill_moveTo)
 {
@@ -1055,7 +1059,7 @@
 }
 /* }}} */
 
-/* {{{ proto class swffont_init(string filename)
+/* {{{ proto object swffont_init(string filename)
Returns a new SWFFont object from given file */
 PHP_FUNCTION(swffont_init)
 {
@@ -1103,7 +1107,7 @@
 }
 /* }}} */
 
-/* {{{ proto int swffont_getWidth(string)
+/* {{{ proto float swffont_getWidth(string str)
Calculates the width of the given string in this font at full height */
 PHP_FUNCTION(swffont_getWidth)
 {
@@ -1119,7 +1123,7 @@
 }
 /* }}} */
 
-/* {{{ proto int swffont_getAscent(void)
+/* {{{ proto float swffont_getAscent(void)
Returns the ascent of the font, or 0 if not available */
 PHP_FUNCTION(swffont_getAscent)
 {
@@ -1127,7 +1131,7 @@
 }
 /* }}} */
 
-/* {{{ proto int swffont_getDescent(void)
+/* {{{ proto float swffont_getDescent(void)
Returns the descent of the font, or 0 if not available */
 PHP_FUNCTION(swffont_getDescent)
 {
@@ -1135,7 +1139,7 @@
 }
 /* }}} */
 
-/* {{{ proto int swffont_getLeading(void)
+/* {{{ proto float swffont_getLeading(void)
Returns the leading of the font, or 0 if not

[PHP-CVS] cvs: php4 /ext/ming php_ming.h

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 11:13:31 2003 EDT

  Modified files:  
/php4/ext/ming  php_ming.h 
  Log:
  $Id tag added
  
Index: php4/ext/ming/php_ming.h
diff -u php4/ext/ming/php_ming.h:1.10 php4/ext/ming/php_ming.h:1.11
--- php4/ext/ming/php_ming.h:1.10   Tue Jun 10 16:03:32 2003
+++ php4/ext/ming/php_ming.hMon Jun 16 11:13:31 2003
@@ -14,6 +14,9 @@
+--+
| Author: [EMAIL PROTECTED]  |
+--+
+
+  $Id: php_ming.h,v 1.11 2003/06/16 15:13:31 andrey Exp $ 
+
 */
 
 #ifndef _PHP_MING_H



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/ming ming.c php_ming.h

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 11:24:59 2003 EDT

  Modified files:  
/php4/ext/ming  ming.c php_ming.h 
  Log:
  updating license to 3.0
  
Index: php4/ext/ming/ming.c
diff -u php4/ext/ming/ming.c:1.46 php4/ext/ming/ming.c:1.47
--- php4/ext/ming/ming.c:1.46   Mon Jun 16 11:12:55 2003
+++ php4/ext/ming/ming.cMon Jun 16 11:24:58 2003
@@ -4,10 +4,10 @@
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
-   | This source file is subject to version 2.01 of the PHP license,  |
+   | This source file is subject to version 3.0 of the PHP license,   |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url:   |
-   | http://www.php.net/license/2_01.txt. |
+   | http://www.php.net/license/3_0.txt.  |
| If you did not receive a copy of the PHP license and are unable to   |
| obtain it through the world-wide-web, please send a note to  |
| [EMAIL PROTECTED] so we can mail you a copy immediately.   |
@@ -15,7 +15,7 @@
| Author: [EMAIL PROTECTED]  |
+--+

-  $Id: ming.c,v 1.46 2003/06/16 15:12:55 andrey Exp $ 
+  $Id: ming.c,v 1.47 2003/06/16 15:24:58 andrey Exp $ 
 
 */
 
Index: php4/ext/ming/php_ming.h
diff -u php4/ext/ming/php_ming.h:1.11 php4/ext/ming/php_ming.h:1.12
--- php4/ext/ming/php_ming.h:1.11   Mon Jun 16 11:13:31 2003
+++ php4/ext/ming/php_ming.hMon Jun 16 11:24:58 2003
@@ -4,10 +4,10 @@
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
-   | This source file is subject to version 2.01 of the PHP license,  |
+   | This source file is subject to version 3.0 of the PHP license,   |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url:   |
-   | http://www.php.net/license/2_01.txt. |
+   | http://www.php.net/license/3_0.txt.  |
| If you did not receive a copy of the PHP license and are unable to   |
| obtain it through the world-wide-web, please send a note to  |
| [EMAIL PROTECTED] so we can mail you a copy immediately.   |
@@ -15,7 +15,7 @@
| Author: [EMAIL PROTECTED]  |
+--+
 
-  $Id: php_ming.h,v 1.11 2003/06/16 15:13:31 andrey Exp $ 
+  $Id: php_ming.h,v 1.12 2003/06/16 15:24:58 andrey Exp $ 
 
 */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/cli php_cli.c

2003-06-16 Thread Stanislav Malyshev

stasMon Jun 16 12:14:38 2003 EDT

  Modified files:  
/php4/sapi/cli  php_cli.c 
  Log:
  flush after banner print
  
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.94 php4/sapi/cli/php_cli.c:1.95
--- php4/sapi/cli/php_cli.c:1.94Tue Jun 10 16:03:45 2003
+++ php4/sapi/cli/php_cli.c Mon Jun 16 12:14:38 2003
@@ -19,7 +19,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.94 2003/06/10 20:03:45 imajes Exp $ */
+/* $Id: php_cli.c,v 1.95 2003/06/16 16:14:38 stas Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -680,6 +680,7 @@
 
case 'a':   /* interactive mode */
printf(Interactive mode enabled\n\n);
+   fflush(stdout);
interactive=1;
break;
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/msql php_msql.c /ext/ncurses ncurses_functions.c /ext/notes php_notes.c /ext/odbc birdstep.c php_odbc.c

2003-06-16 Thread Andrey Hristov

andrey  Mon Jun 16 12:36:41 2003 EDT

  Modified files:  
/php4/ext/msql  php_msql.c 
/php4/ext/ncurses   ncurses_functions.c 
/php4/ext/notes php_notes.c 
/php4/ext/odbc  birdstep.c php_odbc.c 
  Log:
  proto fixes
  #my head hurts now. no more fixes today ;)
  Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.54 php4/ext/msql/php_msql.c:1.55
--- php4/ext/msql/php_msql.c:1.54   Tue Jun 10 16:03:32 2003
+++ php4/ext/msql/php_msql.cMon Jun 16 12:36:41 2003
@@ -16,7 +16,7 @@
+--+
  */
  
-/* $Id: php_msql.c,v 1.54 2003/06/10 20:03:32 imajes Exp $ */
+/* $Id: php_msql.c,v 1.55 2003/06/16 16:36:41 andrey Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -397,7 +397,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_close([int link_identifier])
+/* {{{ proto bool msql_close([resource link_identifier])
Close an mSQL connection */
 PHP_FUNCTION(msql_close)
 {
@@ -436,7 +436,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_select_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_select_db(string database_name [, resource link_identifier])
Select an mSQL database */
 PHP_FUNCTION(msql_select_db)
 {
@@ -475,7 +475,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_create_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_create_db(string database_name [, resource link_identifier])
Create an mSQL database */
 PHP_FUNCTION(msql_create_db)
 {
@@ -512,7 +512,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_drop_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_drop_db(string database_name [, resource link_identifier])
Drop (delete) an mSQL database */
 PHP_FUNCTION(msql_drop_db)
 {
@@ -549,7 +549,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_query(string query [, int link_identifier])
+/* {{{ proto resource msql_query(string query [, resource link_identifier])
Send an SQL query to mSQL */
 PHP_FUNCTION(msql_query)
 {
@@ -586,7 +586,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_db_query(string database_name, string query [, int 
link_identifier])
+/* {{{ proto resource msql_db_query(string database_name, string query [, resource 
link_identifier])
Send an SQL query to mSQL */
 PHP_FUNCTION(msql_db_query)
 {
@@ -628,7 +628,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_list_dbs([int link_identifier])
+/* {{{ proto resource msql_list_dbs([resource link_identifier])
List databases available on an mSQL server */
 PHP_FUNCTION(msql_list_dbs)
 {
@@ -662,7 +662,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_list_tables(string database_name [, int link_identifier])
+/* {{{ proto resource msql_list_tables(string database_name [, resource 
link_identifier])
List tables in an mSQL database */
 PHP_FUNCTION(msql_list_tables)
 {
@@ -703,7 +703,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_list_fields(string database_name, string table_name [, int 
link_identifier])
+/* {{{ proto resource msql_list_fields(string database_name, string table_name [, 
resource link_identifier])
List mSQL result fields */
 PHP_FUNCTION(msql_list_fields)
 {
@@ -745,7 +745,7 @@
 }
 /* }}} */
 
-/* {{{ proto string msql_error([int link_identifier])
+/* {{{ proto string msql_error(void)
Returns the text of the error message from previous mSQL operation */
 PHP_FUNCTION(msql_error)
 {
@@ -756,7 +756,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_result(int query, int row [, mixed field])
+/* {{{ proto string msql_result(int query, int row [, mixed field])
Get result data */
 PHP_FUNCTION(msql_result)
 {
@@ -857,7 +857,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_num_rows(int query)
+/* {{{ proto int msql_num_rows(resource query)
Get number of rows in a result */
 PHP_FUNCTION(msql_num_rows)
 {
@@ -874,7 +874,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_num_fields(int query)
+/* {{{ proto int msql_num_fields(resource query)
Get number of fields in a result */
 PHP_FUNCTION(msql_num_fields)
 {
@@ -966,7 +966,7 @@
 }
 /* }}} */
 
-/* {{{ proto array msql_fetch_row(int query)
+/* {{{ proto array msql_fetch_row(resource query)
Get a result row as an enumerated array */
 PHP_FUNCTION(msql_fetch_row)
 {
@@ -974,7 +974,7 @@
 }
 /* }}} */
 
-/* {{{ proto object msql_fetch_object(int query [, int result_type])
+/* {{{ proto object msql_fetch_object(resource query [, resource result_type])
Fetch a result row as an object */
 PHP_FUNCTION(msql_fetch_object)
 {
@@ -985,7 +985,7 @@
 }
 /* }}} */
 
-/* {{{ proto array msql_fetch_array(int query [, int result_type])
+/* {{{ proto array msql_fetch_array(resource query [, int result_type])
Fetch a result row as an associative array */
 PHP_FUNCTION(msql_fetch_array)
 {
@@ -993,7 +993,7 @@
 }
 /* }}} */
 
-/* {{{ proto int msql_data_seek(int query, int row_number)
+/* {{{ proto bool msql_data_seek(resource query, int row_number)
Move internal result pointer */

[PHP-CVS] cvs: php4 /ext/standard array.c /ext/standard/tests/array bug24198.phpt

2003-06-16 Thread Ilia Alshanetsky

iliaa   Mon Jun 16 13:35:16 2003 EDT

  Added files: 
/php4/ext/standard/tests/array  bug24198.phpt 

  Modified files:  
/php4/ext/standard  array.c 
  Log:
  Fixed bug #24198 (Invalid recursion detection in array_merge_recurcive())
  
  
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.233 php4/ext/standard/array.c:1.234
--- php4/ext/standard/array.c:1.233 Thu Jun 12 11:11:11 2003
+++ php4/ext/standard/array.c   Mon Jun 16 13:35:16 2003
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.233 2003/06/12 15:11:11 andrey Exp $ */
+/* $Id: array.c,v 1.234 2003/06/16 17:35:16 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2141,7 +2141,7 @@
case HASH_KEY_IS_STRING:
if (recursive 
zend_hash_find(dest, string_key, 
string_key_len, (void **)dest_entry) == SUCCESS) {
-   if (*src_entry == *dest_entry) {
+   if (*src_entry == *dest_entry  
((*dest_entry)-refcount % 2)) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, recursion detected);
return 0;
}

Index: php4/ext/standard/tests/array/bug24198.phpt
+++ php4/ext/standard/tests/array/bug24198.phpt
--TEST--n
Bug #24198 (array_merge_recursive() invalid recursion detection)
--FILE--
?php
$c = array('a' = 'aa','b' = 'bb'); 

var_dump(array_merge_recursive($c, $c)); 
?
--EXPECT--
array(2) {
  [a]=
  array(2) {
[0]=
string(2) aa
[1]=
string(2) aa
  }
  [b]=
  array(2) {
[0]=
string(2) bb
[1]=
string(2) bb
  }
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/imap php_imap.c

2003-06-16 Thread Ilia Alshanetsky

iliaa   Mon Jun 16 13:42:04 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/imap  php_imap.c 
  Log:
  MFH: Fixed bug #24150 (crash in imap_fetch_overview() 
  imap_rfc822_write_address())
  
  
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.142.2.15 php4/ext/imap/php_imap.c:1.142.2.16
--- php4/ext/imap/php_imap.c:1.142.2.15 Fri Jun 13 10:56:23 2003
+++ php4/ext/imap/php_imap.cMon Jun 16 13:42:04 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski [EMAIL PROTECTED]   |
+--+
  */
-/* $Id: php_imap.c,v 1.142.2.15 2003/06/13 14:56:23 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.16 2003/06/16 17:42:04 iliaa Exp $ */
 
 #define IMAP41
 
@@ -1955,6 +1955,10 @@
addr-error=NIL;
addr-adl=NIL;
 
+   if (_php_imap_address_size(addr) = MAILTMPLEN) {
+   RETURN_FALSE;
+   }
+
string[0]='\0';
rfc822_write_address(string, addr);
RETVAL_STRING(string, 1);
@@ -2715,13 +2719,13 @@
if (env-subject) {
add_property_string(myoverview, subject, 
env-subject, 1);
}
-   if (env-from) {
+   if (env-from  _php_imap_address_size(env-from) = 
MAILTMPLEN) {
env-from-next=NULL;
address[0] = '\0';
rfc822_write_address(address, env-from);
add_property_string(myoverview, from, 
address, 1);
}
-   if (env-to) {
+   if (env-to  _php_imap_address_size(env-from) = 
MAILTMPLEN) {
env-to-next = NULL;
address[0] = '\0';
rfc822_write_address(address, env-to);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard/tests/math bug24142.phpt

2003-06-16 Thread Derick Rethans

derick  Mon Jun 16 13:50:07 2003 EDT

  Added files: 
/php4/ext/standard/tests/math   bug24142.phpt 
  Log:
  - Added test for bug #24142
  
  

Index: php4/ext/standard/tests/math/bug24142.phpt
+++ php4/ext/standard/tests/math/bug24142.phpt
--TEST--
Bug #24142 (round() problems)
--FILE--
?php // $Id: bug24142.phpt,v 1.1 2003/06/16 17:50:07 derick Exp $ vim600:syn=php
echo round(5.045, 2). \n;
echo round(5.055, 2). \n;
?
--EXPECT--
5.04
5.06



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/math bug24142.phpt

2003-06-16 Thread Derick Rethans

derick  Mon Jun 16 13:50:49 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/ext/standard/tests/math   bug24142.phpt 
  Log:
  - MFH: Added test for bug #24142
  
  

Index: php4/ext/standard/tests/math/bug24142.phpt
+++ php4/ext/standard/tests/math/bug24142.phpt
--TEST--
Bug #24142 (round() problems)
--FILE--
?php // $Id: bug24142.phpt,v 1.1 2003/06/16 17:50:07 derick Exp $ vim600:syn=php
echo round(5.045, 2). \n;
echo round(5.055, 2). \n;
?
--EXPECT--
5.04
5.06



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard streamsfuncs.c /main/streams streams.c

2003-06-16 Thread Sara Golemon

pollita Mon Jun 16 14:19:14 2003 EDT

  Modified files:  
/php4/ext/standard  streamsfuncs.c 
/php4/main/streams  streams.c 
  Log:
  optionvalue is being copied via zval_copy_ctor, there's no need to addref the 
original
  
Index: php4/ext/standard/streamsfuncs.c
diff -u php4/ext/standard/streamsfuncs.c:1.16 php4/ext/standard/streamsfuncs.c:1.17
--- php4/ext/standard/streamsfuncs.c:1.16   Fri Jun 13 17:33:59 2003
+++ php4/ext/standard/streamsfuncs.cMon Jun 16 14:19:14 2003
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: streamsfuncs.c,v 1.16 2003/06/13 21:33:59 pollita Exp $ */
+/* $Id: streamsfuncs.c,v 1.17 2003/06/16 18:19:14 pollita Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -650,7 +650,6 @@
while (SUCCESS == 
zend_hash_get_current_data_ex(Z_ARRVAL_PP(wval), (void**)oval, opos)) {
 
if (HASH_KEY_IS_STRING == 
zend_hash_get_current_key_ex(Z_ARRVAL_PP(wval), okey, okey_len, NULL, 0, opos)) {
-   ZVAL_ADDREF(*oval);
php_stream_context_set_option(context, wkey, 
okey, *oval);
}
zend_hash_move_forward_ex(Z_ARRVAL_PP(wval), opos);
Index: php4/main/streams/streams.c
diff -u php4/main/streams/streams.c:1.26 php4/main/streams/streams.c:1.27
--- php4/main/streams/streams.c:1.26Sat Jun 14 15:30:42 2003
+++ php4/main/streams/streams.c Mon Jun 16 14:19:14 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.26 2003/06/14 19:30:42 helly Exp $ */
+/* $Id: streams.c,v 1.27 2003/06/16 18:19:14 pollita Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1676,7 +1676,6 @@
return FAILURE;
}
 
-   ZVAL_ADDREF(optionvalue);
wrapperhash = category;
}
return zend_hash_update(Z_ARRVAL_PP(wrapperhash), (char*)optionname, 
strlen(optionname)+1, (void**)copied_val, sizeof(zval *), NULL);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/hyperwave hg_comm.c

2003-06-16 Thread Sascha Schumann

sas Mon Jun 16 15:05:36 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/hyperwave hg_comm.c 
  Log:
  Remove cast which hides a bug in the code.
  
  
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.52.8.3 php4/ext/hyperwave/hg_comm.c:1.52.8.4
--- php4/ext/hyperwave/hg_comm.c:1.52.8.3   Sun Jun 15 23:07:07 2003
+++ php4/ext/hyperwave/hg_comm.cMon Jun 16 15:05:35 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: hg_comm.c,v 1.52.8.3 2003/06/16 03:07:07 iliaa Exp $ */
+/* $Id: hg_comm.c,v 1.52.8.4 2003/06/16 19:05:35 sas Exp $ */
 
 /* #define HW_DEBUG */
 
@@ -654,7 +654,7 @@
scriptname = emalloc(5*sizeof(char *));
if (zend_hash_find(EG(symbol_table), SCRIPT_NAME, 
sizeof(SCRIPT_NAME), (void **) script_name)==FAILURE)
for(i=0; i5; i++)
-   scriptname[i] = (char *) emptystring;
+   scriptname[i] = emptystring;
else {
convert_to_string_ex(script_name);
for(i=0; i5; i++)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard/tests/strings bug24208.phpt

2003-06-16 Thread Moriyoshi Koizumi

moriyoshi   Mon Jun 16 15:10:12 2003 EDT

  Added files: 
/php4/ext/standard/tests/stringsbug24208.phpt 
  Log:
  Added test case for bug #24208
  
  

Index: php4/ext/standard/tests/strings/bug24208.phpt
+++ php4/ext/standard/tests/strings/bug24208.phpt
--TEST--
Bug #24208 (parse_str() is not working)
--FILE--
?php
$a = $b = $c = oops;
parse_str(a=1b=2c=3);
var_dump($a, $b, $c);
?
--EXPECT--
string(1) 1
string(1) 2
string(1) 3



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/strings bug24208.phpt

2003-06-16 Thread Moriyoshi Koizumi

moriyoshi   Mon Jun 16 15:10:48 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/ext/standard/tests/stringsbug24208.phpt 
  Log:
  MFH(r-1.1): added test case for bug #24208
  
  

Index: php4/ext/standard/tests/strings/bug24208.phpt
+++ php4/ext/standard/tests/strings/bug24208.phpt
--TEST--
Bug #24208 (parse_str() is not working)
--FILE--
?php
$a = $b = $c = oops;
parse_str(a=1b=2c=3);
var_dump($a, $b, $c);
?
--EXPECT--
string(1) 1
string(1) 2
string(1) 3



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4) /sapi/thttpd thttpd_patch

2003-06-16 Thread Sascha Schumann

sas Mon Jun 16 15:11:26 2003 EDT

  Modified files:  (Branch: PHP_4)
/php4/sapi/thttpd   thttpd_patch 
  Log:
  Simplify/fix logging
  
Index: php4/sapi/thttpd/thttpd_patch
diff -u php4/sapi/thttpd/thttpd_patch:1.31.4.11 php4/sapi/thttpd/thttpd_patch:1.31.4.12
--- php4/sapi/thttpd/thttpd_patch:1.31.4.11 Wed Jun  4 01:30:02 2003
+++ php4/sapi/thttpd/thttpd_patch   Mon Jun 16 15:11:25 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -641,9 +641,9 @@
 -httpd_close_conn( httpd_conn* hc, struct timeval* nowP )
 -{
 -make_log_entry( hc, nowP );
-+httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit )
++httpd_complete_request( httpd_conn* hc, struct timeval* nowP)
 +{
-+  if (logit)
++  if (hc-method != METHOD_UNKNOWN)
 +  make_log_entry( hc, nowP );
  
 -if ( hc-file_address != (char*) 0 )
@@ -964,7 +964,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1019,14 +1019,14 @@
  ** If you don't have a current timeval handy just pass in 0.
  */
  extern void httpd_close_conn( httpd_conn* hc, struct timeval* nowP );
-+void httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit );
++void httpd_complete_request( httpd_conn* hc, struct timeval* nowP);
 +int httpd_request_reset(httpd_conn* hc,int );
  
  /* Call this to de-initialize a connection struct and *really* free the
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1038,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1289,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1392,7 @@
else
 diff -ur

[PHP-CVS] cvs: php4 /sapi/thttpd thttpd_patch

2003-06-16 Thread Sascha Schumann

sas Mon Jun 16 15:11:33 2003 EDT

  Modified files:  
/php4/sapi/thttpd   thttpd_patch 
  Log:
  Simplify/fix logging
  
Index: php4/sapi/thttpd/thttpd_patch
diff -u php4/sapi/thttpd/thttpd_patch:1.42 php4/sapi/thttpd/thttpd_patch:1.43
--- php4/sapi/thttpd/thttpd_patch:1.42  Wed Jun  4 01:28:17 2003
+++ php4/sapi/thttpd/thttpd_patch   Mon Jun 16 15:11:33 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -641,9 +641,9 @@
 -httpd_close_conn( httpd_conn* hc, struct timeval* nowP )
 -{
 -make_log_entry( hc, nowP );
-+httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit )
++httpd_complete_request( httpd_conn* hc, struct timeval* nowP)
 +{
-+  if (logit)
++  if (hc-method != METHOD_UNKNOWN)
 +  make_log_entry( hc, nowP );
  
 -if ( hc-file_address != (char*) 0 )
@@ -964,7 +964,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1019,14 +1019,14 @@
  ** If you don't have a current timeval handy just pass in 0.
  */
  extern void httpd_close_conn( httpd_conn* hc, struct timeval* nowP );
-+void httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit );
++void httpd_complete_request( httpd_conn* hc, struct timeval* nowP);
 +int httpd_request_reset(httpd_conn* hc,int );
  
  /* Call this to de-initialize a connection struct and *really* free the
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1038,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1289,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1392,7 @@
else
 diff -ur thttpd-2.21b/mmc.h thttpd-2.21b-cool/mmc.h

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/thttpd thttpd_patch

2003-06-16 Thread Sascha Schumann

sas Mon Jun 16 15:11:44 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/thttpd   thttpd_patch 
  Log:
  Simplify/fix logging
  
Index: php4/sapi/thttpd/thttpd_patch
diff -u php4/sapi/thttpd/thttpd_patch:1.31.2.11 php4/sapi/thttpd/thttpd_patch:1.31.2.12
--- php4/sapi/thttpd/thttpd_patch:1.31.2.11 Wed Jun  4 01:28:00 2003
+++ php4/sapi/thttpd/thttpd_patch   Mon Jun 16 15:11:44 2003
@@ -1,6 +1,6 @@
 diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
 --- thttpd-2.21b/Makefile.in   Thu Mar 29 20:36:21 2001
-+++ thttpd-2.21b-cool/Makefile.in  Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/Makefile.in  Mon Jun 16 21:08:05 2003
 @@ -46,13 +46,15 @@
  
  # You shouldn't need to edit anything below here.
@@ -40,7 +40,7 @@
  
 diff -ur thttpd-2.21b/config.h thttpd-2.21b-cool/config.h
 --- thttpd-2.21b/config.h  Mon Apr  9 23:57:36 2001
-+++ thttpd-2.21b-cool/config.h Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/config.h Mon Jun 16 21:08:05 2003
 @@ -82,6 +82,11 @@
  */
  #define IDLE_READ_TIMELIMIT 60
@@ -64,7 +64,7 @@
  ** index pages for directories that don't have an explicit index file.
 diff -ur thttpd-2.21b/configure thttpd-2.21b-cool/configure
 --- thttpd-2.21b/configure Sat Apr 21 02:07:14 2001
-+++ thttpd-2.21b-cool/configureWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configureMon Jun 16 21:08:05 2003
 @@ -1021,7 +1021,7 @@
  fi
  echo $ac_t$CPP 16
@@ -76,7 +76,7 @@
  echo $ac_n checking for $ac_hdr... $ac_c 16
 diff -ur thttpd-2.21b/configure.in thttpd-2.21b-cool/configure.in
 --- thttpd-2.21b/configure.in  Sat Apr 21 02:06:23 2001
-+++ thttpd-2.21b-cool/configure.in Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/configure.in Mon Jun 16 21:08:05 2003
 @@ -64,7 +64,7 @@
AC_MSG_RESULT(no)   
  fi
@@ -88,7 +88,7 @@
  
 diff -ur thttpd-2.21b/fdwatch.c thttpd-2.21b-cool/fdwatch.c
 --- thttpd-2.21b/fdwatch.c Fri Apr 13 07:36:08 2001
-+++ thttpd-2.21b-cool/fdwatch.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/fdwatch.cMon Jun 16 21:08:05 2003
 @@ -419,6 +419,7 @@
  if ( pollfds == (struct pollfd*) 0 || poll_fdidx == (int*) 0 ||
 poll_rfdidx == (int*) 0 )
@@ -119,7 +119,7 @@
  }
 diff -ur thttpd-2.21b/libhttpd.c thttpd-2.21b-cool/libhttpd.c
 --- thttpd-2.21b/libhttpd.cTue Apr 24 00:42:40 2001
-+++ thttpd-2.21b-cool/libhttpd.c   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.c   Mon Jun 16 21:09:31 2003
 @@ -56,6 +56,10 @@
  #include unistd.h
  #include stdarg.h
@@ -641,9 +641,9 @@
 -httpd_close_conn( httpd_conn* hc, struct timeval* nowP )
 -{
 -make_log_entry( hc, nowP );
-+httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit )
++httpd_complete_request( httpd_conn* hc, struct timeval* nowP)
 +{
-+  if (logit)
++  if (hc-method != METHOD_UNKNOWN)
 +  make_log_entry( hc, nowP );
  
 -if ( hc-file_address != (char*) 0 )
@@ -964,7 +964,7 @@
str[0] = '?';
 diff -ur thttpd-2.21b/libhttpd.h thttpd-2.21b-cool/libhttpd.h
 --- thttpd-2.21b/libhttpd.hTue Apr 24 00:36:50 2001
-+++ thttpd-2.21b-cool/libhttpd.h   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/libhttpd.h   Mon Jun 16 21:09:00 2003
 @@ -69,6 +69,8 @@
  char* server_hostname;
  int port;
@@ -1019,14 +1019,14 @@
  ** If you don't have a current timeval handy just pass in 0.
  */
  extern void httpd_close_conn( httpd_conn* hc, struct timeval* nowP );
-+void httpd_complete_request( httpd_conn* hc, struct timeval* nowP, int logit );
++void httpd_complete_request( httpd_conn* hc, struct timeval* nowP);
 +int httpd_request_reset(httpd_conn* hc,int );
  
  /* Call this to de-initialize a connection struct and *really* free the
  ** mallocced strings.
 diff -ur thttpd-2.21b/mime_encodings.txt thttpd-2.21b-cool/mime_encodings.txt
 --- thttpd-2.21b/mime_encodings.txtWed May 10 03:22:28 2000
-+++ thttpd-2.21b-cool/mime_encodings.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_encodings.txt   Mon Jun 16 21:08:05 2003
 @@ -3,6 +3,6 @@
  # A list of file extensions followed by the corresponding MIME encoding.
  # Extensions not found in the table proceed to the mime_types table.
@@ -1038,7 +1038,7 @@
  uux-uuencode
 diff -ur thttpd-2.21b/mime_types.txt thttpd-2.21b-cool/mime_types.txt
 --- thttpd-2.21b/mime_types.txtSat Apr 14 04:53:30 2001
-+++ thttpd-2.21b-cool/mime_types.txt   Wed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mime_types.txt   Mon Jun 16 21:08:05 2003
 @@ -1,135 +1,138 @@
 -# mime_types.txt
 -#
@@ -1289,7 +1289,7 @@
 +ice   x-conference/x-cooltalk
 diff -ur thttpd-2.21b/mmc.c thttpd-2.21b-cool/mmc.c
 --- thttpd-2.21b/mmc.c Fri Apr 13 23:02:15 2001
-+++ thttpd-2.21b-cool/mmc.cWed Jun  4 07:14:36 2003
 thttpd-2.21b-cool/mmc.cMon Jun 16 21:08:05 2003
 @@ -70,6 +70,9 @@
  unsigned int hash;
  int hash_idx;
@@ -1392,7 +1392,7 @@
else
 diff -ur

[PHP-CVS] cvs: php4 / NEWS /main/streams userspace.c

2003-06-16 Thread Sara Golemon

pollita Mon Jun 16 15:13:39 2003 EDT

  Modified files:  
/php4/main/streams  userspace.c 
/php4   NEWS 
  Log:
  Add context property to userspace streams object.
  
  
Index: php4/main/streams/userspace.c
diff -u php4/main/streams/userspace.c:1.8 php4/main/streams/userspace.c:1.9
--- php4/main/streams/userspace.c:1.8   Tue Jun 10 16:03:42 2003
+++ php4/main/streams/userspace.c   Mon Jun 16 15:13:39 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: userspace.c,v 1.8 2003/06/10 20:03:42 imajes Exp $ */
+/* $Id: userspace.c,v 1.9 2003/06/16 19:13:39 pollita Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -185,6 +185,7 @@
zval **args[4]; 
int call_result;
php_stream *stream = NULL;
+   zval *zcontext = NULL;
 
/* Try to catch bad usage without preventing flexibility */
if (FG(user_stream_current_filename) != NULL  strcmp(filename, 
FG(user_stream_current_filename)) == 0) {
@@ -201,6 +202,17 @@
object_init_ex(us-object, uwrap-ce);
ZVAL_REFCOUNT(us-object) = 1;
PZVAL_IS_REF(us-object) = 1;
+
+   if (context) {
+   MAKE_STD_ZVAL(zcontext);
+   php_stream_context_to_zval(context, zcontext);
+   add_property_zval(us-object, context, zcontext);
+   /* The object property should be the only reference,
+  'get rid' of our local reference. */
+   zval_ptr_dtor(zcontext);
+   } else {
+   add_property_null(us-object, context);
+   }

/* call it's stream_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
Index: php4/NEWS
diff -u php4/NEWS:1.1424 php4/NEWS:1.1425
--- php4/NEWS:1.1424Sat Jun 14 20:31:08 2003
+++ php4/NEWS   Mon Jun 16 15:13:39 2003
@@ -15,6 +15,7 @@
   . mail.force_extra_paramaters. (Derick)
 
 - Improved streams support: (Wez)
+  . Added context property to userspace streams object. (sara)
   . stream_socket_client() - similar to fsockopen(), but more powerful. 
   . stream_socket_server() - Creates a server socket. 
   . stream_socket_accept() - Accept a client connection.



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main php_variables.c

2003-06-16 Thread Ilia Alshanetsky

iliaa   Mon Jun 16 15:24:56 2003 EDT

  Modified files:  
/php4/main  php_variables.c 
  Log:
  Fixed bug #24208
  
  
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.63 php4/main/php_variables.c:1.64
--- php4/main/php_variables.c:1.63  Sat Jun 14 11:08:27 2003
+++ php4/main/php_variables.c   Mon Jun 16 15:24:56 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_variables.c,v 1.63 2003/06/14 15:08:27 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.64 2003/06/16 19:24:56 iliaa Exp $ */
 
 #include stdio.h
 #include php.h
@@ -75,6 +75,8 @@

if (track_vars_array) {
symtable1 = Z_ARRVAL_P(track_vars_array);
+   } else if (PG(register_globals)) {
+   symtable1 = EG(active_symbol_table);
}
if (!symtable1) {
/* Nothing to do */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /main php_variables.c

2003-06-16 Thread Ilia Alshanetsky

iliaa   Mon Jun 16 15:25:06 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/main  php_variables.c 
  Log:
  MFH: Fixed bug #24208
  
  
Index: php4/main/php_variables.c
diff -u php4/main/php_variables.c:1.45.2.4 php4/main/php_variables.c:1.45.2.5
--- php4/main/php_variables.c:1.45.2.4  Sat Jun 14 11:08:37 2003
+++ php4/main/php_variables.c   Mon Jun 16 15:25:06 2003
@@ -16,7 +16,7 @@
|  Zeev Suraski [EMAIL PROTECTED]|
+--+
  */
-/* $Id: php_variables.c,v 1.45.2.4 2003/06/14 15:08:37 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.45.2.5 2003/06/16 19:25:06 iliaa Exp $ */
 
 #include stdio.h
 #include php.h
@@ -71,6 +71,8 @@

if (track_vars_array) {
symtable1 = Z_ARRVAL_P(track_vars_array);
+   } else if (PG(register_globals)) {
+   symtable1 = EG(active_symbol_table);
}
if (!symtable1) {
/* Nothing to do */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 / NEWS

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 15:58:25 2003 EDT

  Modified files:  
/php4   NEWS 
  Log:
  Nothing to see here, move along.
  
Index: php4/NEWS
diff -u php4/NEWS:1.1425 php4/NEWS:1.1426
--- php4/NEWS:1.1425Mon Jun 16 15:13:39 2003
+++ php4/NEWS   Mon Jun 16 15:58:24 2003
@@ -3,10 +3,9 @@
 ? ? ??? 200?, Version 5.0.0
 
 ## Note the changed grouping. Try add your entries to appropriate places
-## to enchance the readability of this file. Using @ is discouraged.
+## to enhance the readability of this file. Using @ is discouraged.
 ## (This file will be cleaned up before release.)
 
-- Mnogosearch extension updated. Now can compile with mnogosearch-3.2.11+
 - Moved extensions to PECL (http://pear.php.net/): (James, Tal)
   . ext/fribidi
 
@@ -14,8 +13,9 @@
   . session.hash_function and session.hash_bits_per_character. (Sascha)
   . mail.force_extra_paramaters. (Derick)
 
-- Improved streams support: (Wez)
-  . Added context property to userspace streams object. (sara)
+- Improved the streams support: (Wez)
+  . Improved performance of readfile(), fpassthru() and some internal streams
+operations under Win32.
   . stream_socket_client() - similar to fsockopen(), but more powerful. 
   . stream_socket_server() - Creates a server socket. 
   . stream_socket_accept() - Accept a client connection.
@@ -23,17 +23,16 @@
   . stream_copy_to_stream()
   . stream_get_line() - Reads either the specified number of bytes or until 
 the ending string is found. (Ilia)
+  . Added context property to userspace streams object. (Sara)
   . Added generic crypto interface for streams.
 (supports dynamic loading of OpenSSL)
-  . Improved performance of readfile(), fpassthru() and some internal streams
-operations under Win32.
   . Added lightweight streaming input abstraction to the Zend Engine scanners
 to provide uniform support for include()'ing data from PHP streams across
 all platforms.
   . Added 'string.base64' stream filter. (Moriyoshi)
   . Renamed stream_register_wrapper() to stream_wrapper_register(). (Derick)
 
-- Improved GD extension: (Pierre-Alain Joye, Ilia)
+- Improved the GD extension: (Pierre-Alain Joye, Ilia)
. imagefilter() - Apply different filters to image.
 (Only available with bundled GD library)
. Antialiased drawing support:
@@ -113,4 +112,3 @@
 ### Add everything that MIGHT get merged to some PHP 4 branch 
 ### (before PHP 5.0.0 is released), below.
 
-- Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia) -- move to 4.3.3 NEWS



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard/tests/math bug24142.phpt

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 15:59:28 2003 EDT

  Modified files:  
/php4/ext/standard/tests/math   bug24142.phpt 
  Log:
  Fixed the expected result
  
Index: php4/ext/standard/tests/math/bug24142.phpt
diff -u php4/ext/standard/tests/math/bug24142.phpt:1.1 
php4/ext/standard/tests/math/bug24142.phpt:1.2
--- php4/ext/standard/tests/math/bug24142.phpt:1.1  Mon Jun 16 13:50:07 2003
+++ php4/ext/standard/tests/math/bug24142.phpt  Mon Jun 16 15:59:27 2003
@@ -1,10 +1,10 @@
 --TEST--
 Bug #24142 (round() problems)
 --FILE--
-?php // $Id: bug24142.phpt,v 1.1 2003/06/16 17:50:07 derick Exp $ vim600:syn=php
+?php // $Id: bug24142.phpt,v 1.2 2003/06/16 19:59:27 sniper Exp $ vim600:syn=php
 echo round(5.045, 2). \n;
 echo round(5.055, 2). \n;
 ?
 --EXPECT--
-5.04
+5.05
 5.06



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard/tests/math bug24142.phpt

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 16:00:11 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard/tests/math   bug24142.phpt 
  Log:
  MFH
  
Index: php4/ext/standard/tests/math/bug24142.phpt
diff -u php4/ext/standard/tests/math/bug24142.phpt:1.1.2.1 
php4/ext/standard/tests/math/bug24142.phpt:1.1.2.2
--- php4/ext/standard/tests/math/bug24142.phpt:1.1.2.1  Mon Jun 16 13:50:49 2003
+++ php4/ext/standard/tests/math/bug24142.phpt  Mon Jun 16 16:00:11 2003
@@ -1,10 +1,10 @@
 --TEST--
 Bug #24142 (round() problems)
 --FILE--
-?php // $Id: bug24142.phpt,v 1.1.2.1 2003/06/16 17:50:49 derick Exp $ vim600:syn=php
+?php // $Id: bug24142.phpt,v 1.1.2.2 2003/06/16 20:00:11 sniper Exp $ vim600:syn=php
 echo round(5.045, 2). \n;
 echo round(5.055, 2). \n;
 ?
 --EXPECT--
-5.04
+5.05
 5.06



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/ncurses config.m4

2003-06-16 Thread Sara Golemon

pollita Mon Jun 16 16:16:06 2003 EDT

  Modified files:  
/php4/ext/ncurses   config.m4 
  Log:
  Bug #24210 : assume misspelled (and thereby not found during configure)
  
Index: php4/ext/ncurses/config.m4
diff -u php4/ext/ncurses/config.m4:1.13 php4/ext/ncurses/config.m4:1.14
--- php4/ext/ncurses/config.m4:1.13 Fri Sep 27 13:03:53 2002
+++ php4/ext/ncurses/config.m4  Mon Jun 16 16:16:06 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.13 2002/09/27 17:03:53 wez Exp $
+dnl $Id: config.m4,v 1.14 2003/06/16 20:16:06 pollita Exp $
 dnl
 
 PHP_ARG_WITH(ncurses, for ncurses support,
@@ -56,7 +56,7 @@
  
AC_CHECK_LIB($LIBNAME, color_set,   [AC_DEFINE(HAVE_NCURSES_COLOR_SET,  1, [ ])])
AC_CHECK_LIB($LIBNAME, slk_color,   [AC_DEFINE(HAVE_NCURSES_SLK_COLOR,  1, [ ])])
-   AC_CHECK_LIB($LIBNAME, asume_default_colors,   
[AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
+   AC_CHECK_LIB($LIBNAME, assume_default_colors,   
[AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
AC_CHECK_LIB($LIBNAME, use_extended_names,   
[AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES,  1, [ ])])
 
PHP_NEW_EXTENSION(ncurses, ncurses.c ncurses_fe.c ncurses_functions.c, 
$ext_shared, cli)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/ncurses config.m4

2003-06-16 Thread Sara Golemon

pollita Mon Jun 16 16:17:13 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/ncurses   config.m4 
  Log:
  MFH (r-1.14) Bug #24210 : assume misspelled (and thereby not found during configure)
  
Index: php4/ext/ncurses/config.m4
diff -u php4/ext/ncurses/config.m4:1.13 php4/ext/ncurses/config.m4:1.13.2.1
--- php4/ext/ncurses/config.m4:1.13 Fri Sep 27 13:03:53 2002
+++ php4/ext/ncurses/config.m4  Mon Jun 16 16:17:13 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.13 2002/09/27 17:03:53 wez Exp $
+dnl $Id: config.m4,v 1.13.2.1 2003/06/16 20:17:13 pollita Exp $
 dnl
 
 PHP_ARG_WITH(ncurses, for ncurses support,
@@ -56,7 +56,7 @@
  
AC_CHECK_LIB($LIBNAME, color_set,   [AC_DEFINE(HAVE_NCURSES_COLOR_SET,  1, [ ])])
AC_CHECK_LIB($LIBNAME, slk_color,   [AC_DEFINE(HAVE_NCURSES_SLK_COLOR,  1, [ ])])
-   AC_CHECK_LIB($LIBNAME, asume_default_colors,   
[AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
+   AC_CHECK_LIB($LIBNAME, assume_default_colors,   
[AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
AC_CHECK_LIB($LIBNAME, use_extended_names,   
[AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES,  1, [ ])])
 
PHP_NEW_EXTENSION(ncurses, ncurses.c ncurses_fe.c ncurses_functions.c, 
$ext_shared, cli)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

2003-06-16 Thread Sara Golemon

pollita Mon Jun 16 16:22:23 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  BFN 24210
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.255 php4/NEWS:1.1247.2.256
--- php4/NEWS:1.1247.2.255  Mon Jun 16 13:43:11 2003
+++ php4/NEWS   Mon Jun 16 16:22:23 2003
@@ -31,6 +31,7 @@
 - Fixed ext/yaz to not log if yaz.log_file php.ini option is not set. (Adam)
 - Fixed a bug in bundled libmysql (mysql bug #564). (Georg)
 - Fixed ext/exif to honor magic_quotes_runtime php.ini option. (Marcus)
+- Fixed bug #24210 (not detecting assume_default_colors - typo). (sara)
 - Fixed bug #24198 (Invalid recursion detection in array_merge_recurcive()).
   (Ilia)
 - Fixed bug #24155 (gdImageRotate270 incorrectly use x parameter for y axis).



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 / NEWS /main/streams userspace.c

2003-06-16 Thread Wez Furlong

zval.refcount != rsrc.refcount

We should probably addref the resource refcount here to avoid pain
somewhere else.

--Wez.

On Mon, 16 Jun 2003, Sara Golemon wrote:

 + MAKE_STD_ZVAL(zcontext);
 + php_stream_context_to_zval(context, zcontext);
 + add_property_zval(us-object, context, zcontext);
 + /* The object property should be the only reference,
 +'get rid' of our local reference. */
 + zval_ptr_dtor(zcontext);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 17:38:08 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  broken caps-lock/shift key
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.256 php4/NEWS:1.1247.2.257
--- php4/NEWS:1.1247.2.256  Mon Jun 16 16:22:23 2003
+++ php4/NEWS   Mon Jun 16 17:38:07 2003
@@ -31,7 +31,7 @@
 - Fixed ext/yaz to not log if yaz.log_file php.ini option is not set. (Adam)
 - Fixed a bug in bundled libmysql (mysql bug #564). (Georg)
 - Fixed ext/exif to honor magic_quotes_runtime php.ini option. (Marcus)
-- Fixed bug #24210 (not detecting assume_default_colors - typo). (sara)
+- Fixed bug #24210 (not detecting assume_default_colors - typo). (Sara)
 - Fixed bug #24198 (Invalid recursion detection in array_merge_recurcive()).
   (Ilia)
 - Fixed bug #24155 (gdImageRotate270 incorrectly use x parameter for y axis).



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /scripts phpize.in

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 17:44:29 2003 EDT

  Modified files:  
/php4/scripts   phpize.in 
  Log:
  Fixed bug #24207: phpize wrong exit code
  
Index: php4/scripts/phpize.in
diff -u php4/scripts/phpize.in:1.2 php4/scripts/phpize.in:1.3
--- php4/scripts/phpize.in:1.2  Sun Jun  8 20:17:03 2003
+++ php4/scripts/phpize.in  Mon Jun 16 17:44:29 2003
@@ -38,10 +38,10 @@
 
 touch install-sh mkinstalldirs missing
 
-aclocal
-autoconf
-autoheader
-libtoolize -f -c
+aclocal || exit 1
+autoconf || exit 1
+autoheader || exit 1
+libtoolize -f -c || exit 1
 
 # dumping API NOs:
 PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /scripts phpize.in

2003-06-16 Thread Jani Taskinen

sniper  Mon Jun 16 17:44:54 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/scripts   phpize.in 
  Log:
  MFH: Fixed bug #24207: phpize wrong exit code
  
Index: php4/scripts/phpize.in
diff -u php4/scripts/phpize.in:1.1.2.1 php4/scripts/phpize.in:1.1.2.2
--- php4/scripts/phpize.in:1.1.2.1  Tue Jan 28 10:02:08 2003
+++ php4/scripts/phpize.in  Mon Jun 16 17:44:54 2003
@@ -38,10 +38,10 @@
 
 touch install-sh mkinstalldirs missing
 
-aclocal
-autoconf
-autoheader
-libtoolize -f -c
+aclocal || exit 1
+autoconf || exit 1
+autoheader || exit 1
+libtoolize -f -c || exit 1
 
 # dumping API NOs:
 PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mysqli mysqli_profiler.h

2003-06-16 Thread Sterling Hughes

sterlingMon Jun 16 20:49:24 2003 EDT

  Modified files:  
/php4/ext/mysqlimysqli_profiler.h 
  Log:
  remove the wierdness that prevented the compileness
  
  
Index: php4/ext/mysqli/mysqli_profiler.h
diff -u php4/ext/mysqli/mysqli_profiler.h:1.3 php4/ext/mysqli/mysqli_profiler.h:1.4
--- php4/ext/mysqli/mysqli_profiler.h:1.3   Tue Jun 10 16:03:33 2003
+++ php4/ext/mysqli/mysqli_profiler.h   Mon Jun 16 20:49:24 2003
@@ -137,8 +137,8 @@
 #define MYSQLI_PR_RESULT   6
 
 /*** PROFILER MACROS ***/
-#define MYSQLI_PROFILER_STARTTIME(ptr) gettimeofday(ptr##-header.starttime, NULL)
-#define MYSQLI_PROFILER_ELAPSEDTIME(ptr) 
php_mysqli_profiler_timediff(ptr##-header.starttime, ptr##-header.elapsedtime)
+#define MYSQLI_PROFILER_STARTTIME(ptr) gettimeofday(ptr-header.starttime, NULL)
+#define MYSQLI_PROFILER_ELAPSEDTIME(ptr) 
php_mysqli_profiler_timediff(ptr-header.starttime, ptr-header.elapsedtime)
 #define MYSQLI_PROFILER_LIFETIME(ptr) php_mysqli_profiler_timediff((ptr)-starttime, 
(ptr)-lifetime)
 #define MYSQLI_PROFILER_NEW(parent, type, time) 
php_mysqli_profiler_new_object((PR_COMMON *)parent, type, time)
 #define MYSQLI_PROFILER_COMMAND_START(cmd,parent)\



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/sockets php_sockets.h sockets.c

2003-06-16 Thread Sterling Hughes

sterlingTue Jun 17 00:44:31 2003 EDT

  Modified files:  
/php4/ext/sockets   php_sockets.h sockets.c 
  Log:
  rename SOCKET to PHP_SOCKET to avoid conflicts with Mono
  
  
Index: php4/ext/sockets/php_sockets.h
diff -u php4/ext/sockets/php_sockets.h:1.31 php4/ext/sockets/php_sockets.h:1.32
--- php4/ext/sockets/php_sockets.h:1.31 Tue Jun 10 16:03:36 2003
+++ php4/ext/sockets/php_sockets.h  Tue Jun 17 00:44:30 2003
@@ -22,7 +22,7 @@
 #ifndef PHP_SOCKETS_H
 #define PHP_SOCKETS_H
 
-/* $Id: php_sockets.h,v 1.31 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: php_sockets.h,v 1.32 2003/06/17 04:44:30 sterling Exp $ */
 
 #if HAVE_SOCKETS
 
@@ -88,11 +88,13 @@
 } php_iovec_t;
 
 #ifndef PHP_WIN32
-typedef int SOCKET;
+typedef int PHP_SOCKET;
+#else
+typedef SOCKET PHP_SOCKET;
 #endif
 
 typedef struct {
-   SOCKET  bsd_socket;
+   PHP_SOCKET bsd_socket;
int type;
int error;
 } php_socket;
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.142 php4/ext/sockets/sockets.c:1.143
--- php4/ext/sockets/sockets.c:1.142Tue Jun 10 16:03:36 2003
+++ php4/ext/sockets/sockets.c  Tue Jun 17 00:44:30 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.142 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: sockets.c,v 1.143 2003/06/17 04:44:30 sterling Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -527,7 +527,7 @@
 }
 /* }}} */
 
-static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd 
TSRMLS_DC)
+static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *max_fd 
TSRMLS_DC)
 {
zval**element;
php_socket  *php_sock;
@@ -593,7 +593,7 @@
struct timeval  tv;
struct timeval *tv_p = NULL;
fd_set  rfds, wfds, efds;
-   SOCKET  max_fd = 0;
+   PHP_SOCKET  max_fd = 0;
int retval, sets = 0;
longusec = 0;
 
@@ -2179,7 +2179,7 @@
 {
zval*retval[2], *fds_array_zval;
php_socket  *php_sock[2];
-   SOCKET  fds_array[2];
+   PHP_SOCKET  fds_array[2];
longdomain, type, protocol;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, lllz, domain, type, 
protocol, fds_array_zval) == FAILURE)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

43 matches

Mail list logo