date:20040831

[PHP-CVS] cvs: php-src /ext/oci8 oci8.dsw

2004-08-31 Thread Antony Dovgal

tony2001Tue Aug 31 04:31:11 2004 EDT

  Removed files:   
/php-src/ext/oci8   oci8.dsw 
  Log:
  this file shouldn't be in the repository at all
  
  

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/oci8 oci8.dsw

2004-08-31 Thread Antony Dovgal

tony2001Tue Aug 31 04:31:45 2004 EDT

  Removed files:   (Branch: PHP_5_0)
/php-src/ext/oci8   oci8.dsw 
  Log:
  MFH: this file shouldn't be in the repository at all
  
  

-- 
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/oci8 oci8.dsw

2004-08-31 Thread Antony Dovgal

tony2001Tue Aug 31 04:32:25 2004 EDT

  Removed files:   (Branch: PHP_4_3)
/php-src/ext/oci8   oci8.dsw 
  Log:
  MFH: this file shouldn't be in the repository at all
  
  

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

[PHP-CVS] cvs: php-src /tests/lang bug27354.phpt

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 06:23:22 2004 EDT

  Modified files:  
/php-src/tests/lang bug27354.phpt 
  Log:
  Do not rely on behaviour of integers which might be greater than
  LONG_MAX on 32-bit architectures.
  
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/lang/bug27354.phpt
diff -u php-src/tests/lang/bug27354.phpt:1.1 php-src/tests/lang/bug27354.phpt:1.2
--- php-src/tests/lang/bug27354.phpt:1.1Sun Feb 22 15:04:30 2004
+++ php-src/tests/lang/bug27354.phptTue Aug 31 06:23:22 2004
@@ -7,8 +7,8 @@
var_dump(-2147483648 % -1);
var_dump(-2147483648 % -2);
 ?
---EXPECT--
-int(0)
-int(0)
-int(0)
-int(0)
+--EXPECTF--
+int(%i)
+int(%i)
+int(%i)
+int(%i)

-- 
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/tests/time 001.phpt

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 06:34:15 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard/tests/time001.phpt 
  Log:
  MFH: fix gettimeofday() tests to not fail if the same time is
  returned by successive calls.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/001.phpt?r1=1.4.2.2r2=1.4.2.3ty=u
Index: php-src/ext/standard/tests/time/001.phpt
diff -u php-src/ext/standard/tests/time/001.phpt:1.4.2.2 
php-src/ext/standard/tests/time/001.phpt:1.4.2.3
--- php-src/ext/standard/tests/time/001.phpt:1.4.2.2Fri May 23 16:56:33 2003
+++ php-src/ext/standard/tests/time/001.phptTue Aug 31 06:34:15 2004
@@ -17,7 +17,7 @@
 
 for ($i=1;$i=10;$i++) {
list($micro,$time)=explode( ,microtime());
-   if ($time  $last_t || ($time == $last_t  $micro  $last_m)) {
+   if ($time  $last_t || ($time == $last_t  $micro = $last_m)) {
$passed++;
} else if ($failed++ =10) {
$result .= sprintf('%06d', $i).: $time $micro  $last_t $last_m\n;

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

[PHP-CVS] cvs: php-src /main/streams streams.c

2004-08-31 Thread Antony Dovgal

tony2001Tue Aug 31 07:37:02 2004 EDT

  Modified files:  
/php-src/main/streams   streams.c 
  Log:
  fix bug #29723 (file_get_contents() fails with the file:// wrapper under Win32)
  
  
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61r2=1.62ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61 php-src/main/streams/streams.c:1.62
--- php-src/main/streams/streams.c:1.61 Tue Jul 13 12:34:56 2004
+++ php-src/main/streams/streams.c  Tue Aug 31 07:37:02 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.61 2004/07/13 16:34:56 wez Exp $ */
+/* $Id: streams.c,v 1.62 2004/08/31 11:37:02 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1454,7 +1454,11 @@
}
/* TODO: curl based streams probably support file:// properly */
if (!protocol || !strncasecmp(protocol, file, n)) {
+#ifdef PHP_WIN32   
+   if (protocol  path[n+1] == '/'  path[n+2] == '/'  path[n+4] != 
':')   {
+#else
if (protocol  path[n+1] == '/'  path[n+2] == '/'  path[n+3] != 
'/')   {
+#endif
if (options  REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, remote 
host file access not supported, %s, path);
}



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

[PHP-CVS] cvs: php-src(PHP_5_0) /main/streams streams.c

2004-08-31 Thread Antony Dovgal

tony2001Tue Aug 31 07:39:00 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main/streams   streams.c 
  Log:
  MFH: fix bug #29723 (file_get_contents() fails with the file:// wrapper under Win32)
  
  
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61r2=1.61.2.1ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61 php-src/main/streams/streams.c:1.61.2.1
--- php-src/main/streams/streams.c:1.61 Tue Jul 13 12:34:56 2004
+++ php-src/main/streams/streams.c  Tue Aug 31 07:38:59 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.61 2004/07/13 16:34:56 wez Exp $ */
+/* $Id: streams.c,v 1.61.2.1 2004/08/31 11:38:59 tony2001 Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1454,7 +1454,11 @@
}
/* TODO: curl based streams probably support file:// properly */
if (!protocol || !strncasecmp(protocol, file, n)) {
+#ifdef PHP_WIN32
+   if (protocol  path[n+1] == '/'  path[n+2] == '/'  path[n+4] != 
':')   {
+#else
if (protocol  path[n+1] == '/'  path[n+2] == '/'  path[n+3] != 
'/')   {
+#endif
if (options  REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, remote 
host file access not supported, %s, path);
}

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard/tests/time 001.phpt

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 07:49:19 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard/tests/time001.phpt 
  Log:
  MFH: fix gettimeofday() tests to not fail if the same time is
  returned by successive calls.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/001.phpt?r1=1.6r2=1.6.2.1ty=u
Index: php-src/ext/standard/tests/time/001.phpt
diff -u php-src/ext/standard/tests/time/001.phpt:1.6 
php-src/ext/standard/tests/time/001.phpt:1.6.2.1
--- php-src/ext/standard/tests/time/001.phpt:1.6Fri May 23 16:51:49 2003
+++ php-src/ext/standard/tests/time/001.phptTue Aug 31 07:49:19 2004
@@ -17,7 +17,7 @@
 
 for ($i=1;$i=10;$i++) {
list($micro,$time)=explode( ,microtime());
-   if ($time  $last_t || ($time == $last_t  $micro  $last_m)) {
+   if ($time  $last_t || ($time == $last_t  $micro = $last_m)) {
$passed++;
} else if ($failed++ =10) {
$result .= sprintf('%06d', $i).: $time $micro  $last_t $last_m\n;

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

[PHP-CVS] cvs: php-src(PHP_5_0) /tests/lang bug27354.phpt

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 08:11:07 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/tests/lang bug27354.phpt 
  Log:
  MFH: Do not rely on handling of integers which might be outside the
  range of a 32-bit signed long.
  
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1r2=1.1.4.1ty=u
Index: php-src/tests/lang/bug27354.phpt
diff -u php-src/tests/lang/bug27354.phpt:1.1 php-src/tests/lang/bug27354.phpt:1.1.4.1
--- php-src/tests/lang/bug27354.phpt:1.1Sun Feb 22 15:04:30 2004
+++ php-src/tests/lang/bug27354.phptTue Aug 31 08:11:06 2004
@@ -7,8 +7,8 @@
var_dump(-2147483648 % -1);
var_dump(-2147483648 % -2);
 ?
---EXPECT--
-int(0)
-int(0)
-int(0)
-int(0)
+--EXPECTF--
+int(%i)
+int(%i)
+int(%i)
+int(%i)

-- 
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) /tests/lang bug27354.phpt

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 08:13:41 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/tests/lang bug27354.phpt 
  Log:
  MFH: Do not rely on handling of integers which might be outside the
  range of a 32-bit signed long.
  
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug27354.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/tests/lang/bug27354.phpt
diff -u php-src/tests/lang/bug27354.phpt:1.1.2.1 
php-src/tests/lang/bug27354.phpt:1.1.2.2
--- php-src/tests/lang/bug27354.phpt:1.1.2.1Sun Feb 22 15:07:17 2004
+++ php-src/tests/lang/bug27354.phptTue Aug 31 08:13:41 2004
@@ -7,8 +7,8 @@
var_dump(-2147483648 % -1);
var_dump(-2147483648 % -2);
 ?
---EXPECT--
-int(0)
-int(0)
-int(0)
-int(0)
+--EXPECTF--
+int(%i)
+int(%i)
+int(%i)
+int(%i)

-- 
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/standard/tests/time 001.phpt

2004-08-31 Thread Derick Rethans

On Tue, 31 Aug 2004, Joe Orton wrote:

 jortonTue Aug 31 06:34:15 2004 EDT

   Modified files:  (Branch: PHP_4_3)
 /php-src/ext/standard/tests/time  001.phpt
   Log:
   MFH: fix gettimeofday() tests to not fail if the same time is
   returned by successive calls.

Was this committed to HEAD too? I didn't see a commit message for it.

regards,
Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

-- 
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/standard/tests/time 001.phpt

2004-08-31 Thread Joe Orton

On Tue, Aug 31, 2004 at 02:44:34PM +0200, Derick Rethans wrote:
 On Tue, 31 Aug 2004, Joe Orton wrote:
 
  jorton  Tue Aug 31 06:34:15 2004 EDT
 
Modified files:  (Branch: PHP_4_3)
  /php-src/ext/standard/tests/time001.phpt
Log:
MFH: fix gettimeofday() tests to not fail if the same time is
returned by successive calls.
 
 Was this committed to HEAD too? I didn't see a commit message for it.

Yes, Andi committed it to HEAD last month.

joe

-- 
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) / NEWS configure.in /main php_version.h

2004-08-31 Thread Ilia Alshanetsky

iliaa   Tue Aug 31 10:05:30 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in NEWS 
/php-src/main   php_version.h 
  Log:
  4.3.9RC2
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.121r2=1.396.2.122ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.121 php-src/configure.in:1.396.2.122
--- php-src/configure.in:1.396.2.121Wed Aug 11 19:19:44 2004
+++ php-src/configure.inTue Aug 31 10:05:29 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.121 2004/08/11 23:19:44 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.122 2004/08/31 14:05:29 iliaa Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=9
-EXTRA_VERSION=RC2-dev
+EXTRA_VERSION=RC2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.723r2=1.1247.2.724ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.723 php-src/NEWS:1.1247.2.724
--- php-src/NEWS:1.1247.2.723   Sun Aug 29 12:53:32 2004
+++ php-src/NEWSTue Aug 31 10:05:29 2004
@@ -1,6 +1,6 @@
 PHP 4  NEWS
 |||
-?? ??? 2004, Version 4.3.9
+31 Aug 2004, Version 4.3.9RC2
 - Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
   exhaustion. (Andrei)
 - Fixed bug with raw_post_data not getting set (Brian)
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.63r2=1.66.2.64ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.63 php-src/main/php_version.h:1.66.2.64
--- php-src/main/php_version.h:1.66.2.63Wed Aug 11 19:19:44 2004
+++ php-src/main/php_version.h  Tue Aug 31 10:05:30 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 9
-#define PHP_EXTRA_VERSION RC2-dev
-#define PHP_VERSION 4.3.9RC2-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 4.3.9RC2

-- 
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) / configure.in /main php_version.h

2004-08-31 Thread Ilia Alshanetsky

iliaa   Tue Aug 31 10:27:09 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  back to dev.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.122r2=1.396.2.123ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.122 php-src/configure.in:1.396.2.123
--- php-src/configure.in:1.396.2.122Tue Aug 31 10:05:29 2004
+++ php-src/configure.inTue Aug 31 10:27:09 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.122 2004/08/31 14:05:29 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.123 2004/08/31 14:27:09 iliaa Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=9
-EXTRA_VERSION=RC2
+EXTRA_VERSION=RC3-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.64r2=1.66.2.65ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.64 php-src/main/php_version.h:1.66.2.65
--- php-src/main/php_version.h:1.66.2.64Tue Aug 31 10:05:30 2004
+++ php-src/main/php_version.h  Tue Aug 31 10:27:09 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 9
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 4.3.9RC2
+#define PHP_EXTRA_VERSION RC3-dev
+#define PHP_VERSION 4.3.9RC3-dev

-- 
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) /main streams.c

2004-08-31 Thread Stanislav Malyshev

stasTue Aug 31 11:32:09 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/main   streams.c 
  Log:
  if not using Zend's alloc, don't touch _emalloc
  
  
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.92r2=1.125.2.93ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.92 php-src/main/streams.c:1.125.2.93
--- php-src/main/streams.c:1.125.2.92   Sat Jul 10 06:54:27 2004
+++ php-src/main/streams.c  Tue Aug 31 11:32:09 2004
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.125.2.92 2004/07/10 10:54:27 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.93 2004/08/31 15:32:09 stas Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -59,6 +59,7 @@
 
 /* {{{ some macros to help track leaks */
 #if ZEND_DEBUG
+#if USE_ZEND_ALLOC
 #define emalloc_rel_orig(size) \
( __php_stream_call_depth == 0 \
? _emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_RELAY_CC) \
@@ -68,7 +69,10 @@
( __php_stream_call_depth == 0 \
? _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC 
ZEND_FILE_LINE_RELAY_CC) \
: _erealloc((ptr), (size), 0 ZEND_FILE_LINE_CC 
ZEND_FILE_LINE_ORIG_RELAY_CC) )
-
+#else
+#define emalloc_rel_orig(size) emalloc(size)
+#define erealloc_rel_orig(ptr, size) erealloc(ptr, size)
+#endif
 
 #define pemalloc_rel_orig(size, persistent)((persistent) ? malloc((size)) : 
emalloc_rel_orig((size)))
 #define perealloc_rel_orig(ptr, size, persistent)  ((persistent) ? realloc((ptr), 
(size)) : erealloc_rel_orig((ptr), (size)))

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

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdtables.c wbmp.h /main php_compat.h

2004-08-31 Thread Joe Orton

jorton  Tue Aug 31 12:41:29 2004 EDT

  Modified files:  
/php-src/ext/gd/libgd   gd.h gdtables.c wbmp.h 
/php-src/main   php_compat.h 
  Log:
  Move global symbols defined by bundled copy of libgd into private
  php_gd_* namespace, to avoid symbol conflicts with, for instance,
  another Apache module which loads a different copy of libgd.
  
  http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.h?r1=1.24r2=1.25ty=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.24 php-src/ext/gd/libgd/gd.h:1.25
--- php-src/ext/gd/libgd/gd.h:1.24  Thu Jul 22 18:38:59 2004
+++ php-src/ext/gd/libgd/gd.h   Tue Aug 31 12:41:29 2004
@@ -5,6 +5,8 @@
 extern C {
 #endif
 
+#include php_compat.h
+
 #ifndef WIN32
 /* default fontpath for unix systems */
 #define DEFAULT_FONTPATH 
/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:.
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdtables.c?r1=1.1r2=1.2ty=u
Index: php-src/ext/gd/libgd/gdtables.c
diff -u php-src/ext/gd/libgd/gdtables.c:1.1 php-src/ext/gd/libgd/gdtables.c:1.2
--- php-src/ext/gd/libgd/gdtables.c:1.1 Fri Apr 12 22:03:09 2002
+++ php-src/ext/gd/libgd/gdtables.c Tue Aug 31 12:41:29 2004
@@ -1,4 +1,6 @@
 
+#include php_compat.h
+
 int gdCosT[] =
 {
   1024,
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/wbmp.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/gd/libgd/wbmp.h
diff -u php-src/ext/gd/libgd/wbmp.h:1.2 php-src/ext/gd/libgd/wbmp.h:1.3
--- php-src/ext/gd/libgd/wbmp.h:1.2 Sun Dec 28 15:11:08 2003
+++ php-src/ext/gd/libgd/wbmp.h Tue Aug 31 12:41:29 2004
@@ -12,6 +12,7 @@
 #ifndef __WBMP_H
 #define __WBMP_H   1
 
+#include php_compat.h
 
 /* WBMP struct
 ** ---
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.20r2=1.21ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.20 php-src/main/php_compat.h:1.21
--- php-src/main/php_compat.h:1.20  Thu Jan  8 12:33:04 2004
+++ php-src/main/php_compat.h   Tue Aug 31 12:41:29 2004
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.20 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_compat.h,v 1.21 2004/08/31 16:41:29 jorton Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -125,6 +125,203 @@
 #define XML_UseForeignDTD php_XML_UseForeignDTD
 #define XML_GetFeatureList php_XML_GetFeatureList
 #define XML_ParserReset php_XML_ParserReset
+
+#ifdef HAVE_GD_BUNDLED
+#define any2eucjp php_gd_any2eucjp
+#define createwbmp php_gd_createwbmp
+#define empty_output_buffer php_gd_empty_output_buffer
+#define fill_input_buffer php_gd_fill_input_buffer
+#define freewbmp php_gd_freewbmp
+#define gdAlphaBlend php_gd_gdAlphaBlend
+#define gdCompareInt php_gd_gdCompareInt
+#define gdCosT php_gd_gdCosT
+#define gdCtxPrintf php_gd_gdCtxPrintf
+#define gdDPExtractData php_gd_gdDPExtractData
+#define gdFontGetGiant php_gd_gdFontGetGiant
+#define gdFontGetLarge php_gd_gdFontGetLarge
+#define gdFontGetMediumBold php_gd_gdFontGetMediumBold
+#define gdFontGetSmall php_gd_gdFontGetSmall
+#define gdFontGetTiny php_gd_gdFontGetTiny
+#define gdFontGiant php_gd_gdFontGiant
+#define gdFontGiantData php_gd_gdFontGiantData
+#define gdFontGiantRep php_gd_gdFontGiantRep
+#define gdFontLarge php_gd_gdFontLarge
+#define gdFontLargeData php_gd_gdFontLargeData
+#define gdFontLargeRep php_gd_gdFontLargeRep
+#define gdFontMediumBold php_gd_gdFontMediumBold
+#define gdFontMediumBoldData php_gd_gdFontMediumBoldData
+#define gdFontMediumBoldRep php_gd_gdFontMediumBoldRep
+#define gdFontSmall php_gd_gdFontSmall
+#define gdFontSmallData php_gd_gdFontSmallData
+#define gdFontSmallRep php_gd_gdFontSmallRep
+#define gdFontTiny php_gd_gdFontTiny
+#define gdFontTinyData php_gd_gdFontTinyData
+#define gdFontTinyRep php_gd_gdFontTinyRep
+#define gdGetBuf php_gd_gdGetBuf
+#define gdGetByte php_gd_gdGetByte
+#define gdGetC php_gd_gdGetC
+#define _gdGetColors php_gd__gdGetColors
+#define gd_getin php_gd_gd_getin
+#define gdGetInt php_gd_gdGetInt
+#define gdGetWord php_gd_gdGetWord
+#define gdImageAABlend php_gd_gdImageAABlend
+#define gdImageAALine php_gd_gdImageAALine
+#define gdImageAlphaBlending php_gd_gdImageAlphaBlending
+#define gdImageAntialias php_gd_gdImageAntialias
+#define gdImageArc php_gd_gdImageArc
+#define gdImageBrightness php_gd_gdImageBrightness
+#define gdImageChar php_gd_gdImageChar
+#define gdImageCharUp php_gd_gdImageCharUp
+#define gdImageColor php_gd_gdImageColor
+#define gdImageColorAllocate php_gd_gdImageColorAllocate
+#define gdImageColorAllocateAlpha php_gd_gdImageColorAllocateAlpha
+#define gdImageColorClosest php_gd_gdImageColorClosest
+#define gdImageColorClosestAlpha php_gd_gdImageColorClosestAlpha
+#define gdImageColorClosestHWB php_gd_gdImageColorClosestHWB
+#define gdImageColorDeallocate

[PHP-CVS] cvs: php-src /ext/curl streams.c

2004-08-31 Thread Sara Golemon

pollita Tue Aug 31 16:11:19 2004 EDT

  Modified files:  
/php-src/ext/curl   streams.c 
  Log:
  Use user_agent ini setting if it's available.
  
http://cvs.php.net/diff.php/php-src/ext/curl/streams.c?r1=1.12r2=1.13ty=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.12 php-src/ext/curl/streams.c:1.13
--- php-src/ext/curl/streams.c:1.12 Thu Jan  8 03:14:37 2004
+++ php-src/ext/curl/streams.c  Tue Aug 31 16:11:18 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.12 2004/01/08 08:14:37 andi Exp $ */
+/* $Id: streams.c,v 1.13 2004/08/31 20:11:18 pollita Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -299,7 +299,7 @@
curl_easy_setopt(curlstream-curl, CURLOPT_PROGRESSDATA, stream);
curl_easy_setopt(curlstream-curl, CURLOPT_NOPROGRESS, 0);
 
-   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, PHP/ PHP_VERSION);
+   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, FG(user_agent) ? 
FG(user_agent) : PHP/ PHP_VERSION);

/* TODO: read cookies and options from context */
 

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/curl streams.c

2004-08-31 Thread Sara Golemon

pollita Tue Aug 31 16:11:33 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/curl   streams.c 
  Log:
  MFH: Use user_agent ini setting if it's available.
  
http://cvs.php.net/diff.php/php-src/ext/curl/streams.c?r1=1.12r2=1.12.2.1ty=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.12 php-src/ext/curl/streams.c:1.12.2.1
--- php-src/ext/curl/streams.c:1.12 Thu Jan  8 03:14:37 2004
+++ php-src/ext/curl/streams.c  Tue Aug 31 16:11:32 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.12 2004/01/08 08:14:37 andi Exp $ */
+/* $Id: streams.c,v 1.12.2.1 2004/08/31 20:11:32 pollita Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -299,7 +299,7 @@
curl_easy_setopt(curlstream-curl, CURLOPT_PROGRESSDATA, stream);
curl_easy_setopt(curlstream-curl, CURLOPT_NOPROGRESS, 0);
 
-   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, PHP/ PHP_VERSION);
+   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, FG(user_agent) ? 
FG(user_agent) : PHP/ PHP_VERSION);

/* TODO: read cookies and options from context */
 

-- 
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/curl curlstreams.c

2004-08-31 Thread Sara Golemon

pollita Tue Aug 31 16:12:56 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/curl   curlstreams.c 
  Log:
  MFH: Use user_agent ini setting if it's available.
  
http://cvs.php.net/diff.php/php-src/ext/curl/curlstreams.c?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/curl/curlstreams.c
diff -u php-src/ext/curl/curlstreams.c:1.2.2.2 php-src/ext/curl/curlstreams.c:1.2.2.3
--- php-src/ext/curl/curlstreams.c:1.2.2.2  Tue Dec 31 11:34:15 2002
+++ php-src/ext/curl/curlstreams.c  Tue Aug 31 16:12:56 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: curlstreams.c,v 1.2.2.2 2002/12/31 16:34:15 sebastian Exp $ */
+/* $Id: curlstreams.c,v 1.2.2.3 2004/08/31 20:12:56 pollita Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -307,7 +307,7 @@
curl_easy_setopt(curlstream-curl, CURLOPT_PROGRESSDATA, stream);
curl_easy_setopt(curlstream-curl, CURLOPT_NOPROGRESS, 0);
 
-   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, PHP/ PHP_VERSION);
+   curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, FG(user_agent) ? 
FG(user_agent) : PHP/ PHP_VERSION);

/* TODO: read cookies and options from context */
 

-- 
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

2004-08-31 Thread Marcus Boerger

helly   Tue Aug 31 16:54:00 2004 EDT

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  Fix seeking
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49r2=1.50ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.49 php-src/ext/spl/spl_array.c:1.50
--- php-src/ext/spl/spl_array.c:1.49Mon Jun 21 15:15:27 2004
+++ php-src/ext/spl/spl_array.c Tue Aug 31 16:54:00 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.49 2004/06/21 19:15:27 helly Exp $ */
+/* $Id: spl_array.c,v 1.50 2004/08/31 20:54:00 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -716,7 +716,7 @@
 
zend_hash_internal_pointer_reset_ex(aht, intern-pos);

-   while (position--  0  spl_array_next(intern TSRMLS_CC));
+   while (position--  0  spl_array_next(intern TSRMLS_CC) == SUCCESS);
 } /* }}} */
 
 int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
@@ -737,9 +737,8 @@
pos = intern-pos;
*count = 0;
zend_hash_internal_pointer_reset_ex(aht, intern-pos);
-   while(intern-pos) {
+   while(intern-pos  spl_array_next(intern TSRMLS_CC) == SUCCESS) {
(*count)++;
-   spl_array_next(intern TSRMLS_CC);
}
intern-pos = pos;
return SUCCESS;

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

[PHP-CVS] cvs: php-src /ext/spl/tests array_014.phpt

2004-08-31 Thread Marcus Boerger

helly   Tue Aug 31 16:54:31 2004 EDT

  Added files: 
/php-src/ext/spl/tests  array_014.phpt 
  Log:
  Add new test for seeking
  

http://cvs.php.net/co.php/php-src/ext/spl/tests/array_014.phpt?r=1.1p=1
Index: php-src/ext/spl/tests/array_014.phpt
+++ php-src/ext/spl/tests/array_014.phpt
--TEST--
SPL: ArrayIterator::seek()
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--FILE--
?php

$it = new ArrayIterator(range(0,10));
var_dump($it-count());
$it-seek(5);
var_dump($it-current());
$it-seek(4);
var_dump($it-current());
$it-seek(-1);
var_dump($it-current());
$it-seek(12);
var_dump($it-current());

foreach($it as $v)
{
var_dump($v);
}

?
===DONE===
?php exit(0); ?
--EXPECTF--
int(11)
int(5)
int(4)
int(0)
NULL
int(0)
int(1)
int(2)
int(3)
int(4)
int(5)
int(6)
int(7)
int(8)
int(9)
int(10)
===DONE===

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/spl spl_array.c /ext/spl/tests array_014.phpt

2004-08-31 Thread Marcus Boerger

helly   Tue Aug 31 16:56:08 2004 EDT

  Added files: (Branch: PHP_5_0)
/php-src/ext/spl/tests  array_014.phpt 

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  MFH: Fix seeking
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49r2=1.49.2.1ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.49 php-src/ext/spl/spl_array.c:1.49.2.1
--- php-src/ext/spl/spl_array.c:1.49Mon Jun 21 15:15:27 2004
+++ php-src/ext/spl/spl_array.c Tue Aug 31 16:56:08 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.49 2004/06/21 19:15:27 helly Exp $ */
+/* $Id: spl_array.c,v 1.49.2.1 2004/08/31 20:56:08 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -716,7 +716,7 @@
 
zend_hash_internal_pointer_reset_ex(aht, intern-pos);

-   while (position--  0  spl_array_next(intern TSRMLS_CC));
+   while (position--  0  spl_array_next(intern TSRMLS_CC) == SUCCESS);
 } /* }}} */
 
 int spl_array_object_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
@@ -737,9 +737,8 @@
pos = intern-pos;
*count = 0;
zend_hash_internal_pointer_reset_ex(aht, intern-pos);
-   while(intern-pos) {
+   while(intern-pos  spl_array_next(intern TSRMLS_CC) == SUCCESS) {
(*count)++;
-   spl_array_next(intern TSRMLS_CC);
}
intern-pos = pos;
return SUCCESS;

http://cvs.php.net/co.php/php-src/ext/spl/tests/array_014.phpt?r=1.1p=1
Index: php-src/ext/spl/tests/array_014.phpt
+++ php-src/ext/spl/tests/array_014.phpt
--TEST--
SPL: ArrayIterator::seek()
--SKIPIF--
?php if (!extension_loaded(spl)) print skip; ?
--FILE--
?php

$it = new ArrayIterator(range(0,10));
var_dump($it-count());
$it-seek(5);
var_dump($it-current());
$it-seek(4);
var_dump($it-current());
$it-seek(-1);
var_dump($it-current());
$it-seek(12);
var_dump($it-current());

foreach($it as $v)
{
var_dump($v);
}

?
===DONE===
?php exit(0); ?
--EXPECTF--
int(11)
int(5)
int(4)
int(0)
NULL
int(0)
int(1)
int(2)
int(3)
int(4)
int(5)
int(6)
int(7)
int(8)
int(9)
int(10)
===DONE===

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

[PHP-CVS] cvs: php-src /ext/oci8 oci8.dsw

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/oci8 oci8.dsw

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/oci8 oci8.dsw

[PHP-CVS] cvs: php-src /tests/lang bug27354.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time 001.phpt

[PHP-CVS] cvs: php-src /main/streams streams.c

[PHP-CVS] cvs: php-src(PHP_5_0) /main/streams streams.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard/tests/time 001.phpt

[PHP-CVS] cvs: php-src(PHP_5_0) /tests/lang bug27354.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug27354.phpt

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time 001.phpt

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time 001.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS configure.in /main php_version.h

[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in /main php_version.h

[PHP-CVS] cvs: php-src(PHP_4_3) /main streams.c

[PHP-CVS] cvs: php-src /ext/gd/libgd gd.h gdtables.c wbmp.h /main php_compat.h

[PHP-CVS] cvs: php-src /ext/curl streams.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/curl streams.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/curl curlstreams.c

[PHP-CVS] cvs: php-src /ext/spl spl_array.c

[PHP-CVS] cvs: php-src /ext/spl/tests array_014.phpt

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/spl spl_array.c /ext/spl/tests array_014.phpt

22 matches

Site Navigation

Mail list logo

Footer information