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

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 20:08:05 2004 EDT

  Removed files:   
/php-src/tests/lang bug27395.phpt 
  Log:
  Remove bogus test: see bug #20993
  

-- 
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 bug27395.phpt

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 20:07:32 2004 EDT

  Removed files:   (Branch: PHP_4_3)
/php-src/tests/lang bug27395.phpt 
  Log:
  Remove bogus test: see bug #20993
  

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

[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 19:13:30 2004 EDT

  Modified files:  
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFB: typofix
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.84&r2=1.85&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.84 
php-src/ext/standard/http_fopen_wrapper.c:1.85
--- php-src/ext/standard/http_fopen_wrapper.c:1.84  Wed Feb 25 19:02:27 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 19:13:30 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.84 2004/02/26 00:02:27 iliaa Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.85 2004/02/26 00:13:30 sniper Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -400,7 +400,7 @@
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header), 
&http_response, sizeof(zval *), NULL);
}
} else {
-   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket.!");
+   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket!");
goto out;
}


-- 
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 http_fopen_wrapper.c

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 19:13:04 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  typofix
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.17&r2=1.53.2.18&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17 
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.18
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17 Wed Feb 25 19:03:57 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 19:13:02 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.53.2.17 2004/02/26 00:03:57 iliaa Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.53.2.18 2004/02/26 00:13:02 sniper Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -388,7 +388,7 @@
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header), 
&http_response, sizeof(zval *), NULL);
}
} else {
-   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket.!");
+   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket!");
goto out;
}


-- 
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 http_fopen_wrapper.c

2004-02-25 Thread Ilia Alshanetsky 
iliaa   Wed Feb 25 19:03:58 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: Handle situation where feof() occurs before the HTTP header is 
  retrieved.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.16&r2=1.53.2.17&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16 
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16 Wed Feb 25 08:20:31 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 19:03:57 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.53.2.16 2004/02/25 13:20:31 sniper Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.53.2.17 2004/02/26 00:03:57 iliaa Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -387,6 +387,9 @@
Z_TYPE_P(http_response) = IS_STRING;
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header), 
&http_response, sizeof(zval *), NULL);
}
+   } else {
+   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket.!");
+   goto out;
}

/* read past HTTP headers */

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

[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c

2004-02-25 Thread Ilia Alshanetsky 
iliaa   Wed Feb 25 19:02:29 2004 EDT

  Modified files:  
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  Handle situation where feof() occurs before the HTTP header is retrieved.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.83&r2=1.84&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.83 
php-src/ext/standard/http_fopen_wrapper.c:1.84
--- php-src/ext/standard/http_fopen_wrapper.c:1.83  Wed Feb 25 04:36:46 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 19:02:27 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.83 2004/02/25 09:36:46 sebastian Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.84 2004/02/26 00:02:27 iliaa Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -399,6 +399,9 @@
Z_TYPE_P(http_response) = IS_STRING;
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header), 
&http_response, sizeof(zval *), NULL);
}
+   } else {
+   php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "HTTP request 
failed, unexpected end of socket.!");
+   goto out;
}

/* read past HTTP headers */

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

[PHP-CVS] cvs: php-src /win32/build mkdist.php

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 18:38:04 2004 EDT

  Modified files:  
/php-src/win32/buildmkdist.php 
  Log:
  - Fixed bug #27368 (php.ini-* has lone CR in the end)
  # regex taken from win32/sendmail.c (suggested by Sara)
  # And Andrei invited Wez to his speech on the cruise.. :)
  
  
  
http://cvs.php.net/diff.php/php-src/win32/build/mkdist.php?r1=1.8&r2=1.9&ty=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.8 php-src/win32/build/mkdist.php:1.9
--- php-src/win32/build/mkdist.php:1.8  Thu Feb 12 12:58:52 2004
+++ php-src/win32/build/mkdist.php  Wed Feb 25 18:38:03 2004
@@ -1,4 +1,4 @@
-   "news.txt",
"php.ini-dist" =>   "php.ini-dist",
"php.ini-recommended" => "php.ini-recommended",
+   "win32/install.txt" =>  "install.txt",
 );
 
 foreach ($text_files as $src => $dest) {
@@ -169,7 +170,6 @@
 
 /* general other files */
 $general_files = array(
-   "win32/install.txt" =>  "install.txt",
"php.gif"   =>  "php.gif",
 );
 

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

[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions highlight_heredoc.phpt /tests/strings 004.phpt bug26703.phpt

2004-02-25 Thread Derick Rethans 
derick  Wed Feb 25 17:55:47 2004 EDT

  Modified files:  
/php-src/ext/standard/tests/general_functions   
highlight_heredoc.phpt 
/php-src/tests/strings  004.phpt bug26703.phpt 
  Log:
  - Fix tests after change to highlight_string()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt
diff -u php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt:1.1 
php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt:1.2
--- php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt:1.1 Sat 
Nov 29 14:05:12 2003
+++ php-src/ext/standard/tests/general_functions/highlight_heredoc.phpt Wed Feb 25 
17:55:45 2004
@@ -14,6 +14,6 @@
 highlight_string($str);
 ?>
 --EXPECT--
-
-$x=<<
 --EXPECT--
-
-


+
+


 
-[
-


+[
+


 ]
http://cvs.php.net/diff.php/php-src/tests/strings/bug26703.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/tests/strings/bug26703.phpt
diff -u php-src/tests/strings/bug26703.phpt:1.1 php-src/tests/strings/bug26703.phpt:1.2
--- php-src/tests/strings/bug26703.phpt:1.1 Thu Dec 25 13:57:25 2003
+++ php-src/tests/strings/bug26703.phpt Wed Feb 25 17:55:47 2004
@@ -12,7 +12,7 @@
highlight_string('');
 ?>
 --EXPECT--
-
-
-
+
+
+
 

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

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

2004-02-25 Thread Moriyoshi Koizumi 
With a quick glance at the bug's page, it looks like
the same issue as bug #20993...
HTH

Moriyoshi

On 2004/02/26, at 3:54, Jani Taskinen wrote:

sniper		Wed Feb 25 13:54:15 2004 EDT

  Added files:
/php-src/tests/lang bug27395.phpt
  Log:
  Test for bug #27395
--
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 /ext/sockets sockets.c

2004-02-25 Thread Ilia Alshanetsky 
iliaa   Wed Feb 25 17:12:04 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/socketssockets.c 
  Log:
  MFH:
Fixed bug #21760 (Use of uninitialized pointer inside php_read()).
Fixed 3 possible crashes due to integer overflow or invalid user input
inside the sockets extension.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.578&r2=1.1247.2.579&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.578 php-src/NEWS:1.1247.2.579
--- php-src/NEWS:1.1247.2.578   Wed Feb 25 07:36:23 2004
+++ php-src/NEWSWed Feb 25 17:12:02 2004
@@ -1,6 +1,8 @@
 PHP 4  NEWS
 |||
 ?? Feb 2004, Version 4.3.5
+- Fixed possible crashes inside socket extension, due to missing check inside
+  allocation functions. (Ilia)
 - Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)
 - Fixed bug #27383 (Potential crash inside fopen_wrapper, while parsing
   response code). (Ilia)
@@ -16,6 +18,8 @@
   (Jani, Markus dot Lidel at shadowconnect dot com)
 - Fixed bug #26005 (Random "cannot change the session ini settings" errors).
   (Jani, jsnajdr at kerio dot com)
+- Fixed bug #21760 (Use of uninitialized pointer inside php_read()). (Ilia, 
+  uce at ftc dot gov)
 
 16 Feb 2004, Version 4.3.5RC3
 - Fixed zero bytes memory allocation when no extra ini files are found in the
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.19&r2=1.125.2.20&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.19 
php-src/ext/sockets/sockets.c:1.125.2.20
--- php-src/ext/sockets/sockets.c:1.125.2.19Thu Aug 28 16:01:30 2003
+++ php-src/ext/sockets/sockets.c   Wed Feb 25 17:12:03 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.19 2003/08/28 20:01:30 iliaa Exp $ */
+/* $Id: sockets.c,v 1.125.2.20 2004/02/25 22:12:03 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -294,6 +294,7 @@
 
set_errno(0);
 
+   *t = '\0';
while (*t != '\n' && *t != '\r' && n < maxlen) {
if (m > 0) {
t++;
@@ -808,7 +809,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1, &length, 
&type) == FAILURE)
return;
 
-   if(length<0) RETURN_FALSE;
+   /* overflow check */
+   if((length + 1) < 2) {
+   RETURN_FALSE;
+   }
tmpbuf = emalloc(length + 1);

ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, 
le_socket);
@@ -1372,6 +1376,11 @@
 
ZEND_FETCH_RESOURCE(php_sock, php_socket *, &php_sock_res, -1, le_socket_name, 
le_socket);
 
+   /* overflow check */
+   if ((len + 1) < 2) {
+   RETURN_FALSE;
+   }
+
recv_buf = emalloc(len + 1);
memset(recv_buf, 0, len + 1);
 
@@ -1446,6 +1455,11 @@
 
if(arg3<0) RETURN_FALSE;
 
+   /* overflow check */
+   if ((arg3 + 2) < 3) {
+   RETURN_FALSE;
+   }
+
recv_buf = emalloc(arg3 + 2);
memset(recv_buf, 0, arg3 + 2);


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

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

2004-02-25 Thread Ilia Alshanetsky 
iliaa   Wed Feb 25 17:10:10 2004 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  Fixed bug #21760 (Use of uninitialized pointer inside php_read()).
  Fixed 3 possible crashes due to integer overflow or invalid user input
  inside the sockets extension.
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.158&r2=1.159&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.158 php-src/ext/sockets/sockets.c:1.159
--- php-src/ext/sockets/sockets.c:1.158 Thu Jan  8 03:17:27 2004
+++ php-src/ext/sockets/sockets.c   Wed Feb 25 17:10:09 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.158 2004/01/08 08:17:27 andi Exp $ */
+/* $Id: sockets.c,v 1.159 2004/02/25 22:10:09 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -266,6 +266,7 @@
 
set_errno(0);
 
+   *t = '\0';
while (*t != '\n' && *t != '\r' && n < maxlen) {
if (m > 0) {
t++;
@@ -828,6 +829,11 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1, &length, 
&type) == FAILURE)
return;
 
+   /* overflow check */
+   if ((length + 1) < 2) {
+   RETURN_FALSE;
+   }
+
tmpbuf = emalloc(length + 1);

ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, 
le_socket);
@@ -1225,6 +1231,11 @@
 
ZEND_FETCH_RESOURCE(php_sock, php_socket *, &php_sock_res, -1, le_socket_name, 
le_socket);
 
+   /* overflow check */
+   if ((len + 1) < 2) {
+   RETURN_FALSE;
+   }
+
recv_buf = emalloc(len + 1);
memset(recv_buf, 0, len + 1);
 
@@ -1301,6 +1312,11 @@
 
ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, 
le_socket);
 
+   /* overflow check */
+   if ((arg3 + 2) < 3) {
+   RETURN_FALSE;
+   }
+
recv_buf = emalloc(arg3 + 2);
memset(recv_buf, 0, arg3 + 2);


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

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

2004-02-25 Thread Andi Gutmans 
At 22:41 25/02/2004 +0200, Jani Taskinen wrote:
On Wed, 25 Feb 2004, Zeev Suraski wrote:

>zeev   Wed Feb 25 09:57:43 2004 EDT
>
>  Modified files:
>/php-src/tests/langbug22367.phpt
>  Log:
>  This is no longer valid out of the box PHP 5 code.
>  We tried to enable compatibility mode but the test engine doesn't appear
>  to take the --INI-- section into account in compile time, so it didn't
>  work...
The --INI-- section works just fine. What happens is that the
output is NOT valid anymore. (or is it?) So either there's a bug
somewhere in the compatibility stuff or the expected output is
just wrong..
Weird. It didn't seem to work for us.
In any case, I'm not quite sure why the test doesn't pass (not sure it's 
supposed to).
I'll try and take a look when I have some more time.

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

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

2004-02-25 Thread Jani Taskinen 
On Wed, 25 Feb 2004, Zeev Suraski wrote:

>zeev   Wed Feb 25 09:57:43 2004 EDT
>
>  Modified files:  
>/php-src/tests/langbug22367.phpt 
>  Log:
>  This is no longer valid out of the box PHP 5 code.
>  We tried to enable compatibility mode but the test engine doesn't appear
>  to take the --INI-- section into account in compile time, so it didn't
>  work...

The --INI-- section works just fine. What happens is that the
output is NOT valid anymore. (or is it?) So either there's a bug
somewhere in the compatibility stuff or the expected output is
just wrong..

--Jani

  
>  
>http://cvs.php.net/diff.php/php-src/tests/lang/bug22367.phpt?r1=1.4&r2=1.5&ty=u
>Index: php-src/tests/lang/bug22367.phpt
>diff -u php-src/tests/lang/bug22367.phpt:1.4 php-src/tests/lang/bug22367.phpt:1.5
>--- php-src/tests/lang/bug22367.phpt:1.4   Sun Dec 14 13:25:13 2003
>+++ php-src/tests/lang/bug22367.phpt   Wed Feb 25 09:57:43 2004
>@@ -1,7 +1,10 @@
> --TEST--
> Bug #22367 (weird zval allocation problem)
>+--SKIPIF--
>+=')) echo "skip Overriden 
>method does not match overriding method - incompatible with ZE2\n"; ?>
> --FILE--
> +
> class foo
> {
>   public $test = array(0, 1, 2, 3, 4); 
>
>

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

[PHP-CVS] cvs: php-src /ext/spl/examples directorytreeiterator.inc

2004-02-25 Thread Marcus Boerger 
helly   Wed Feb 25 15:38:57 2004 EDT

  Modified files:  
/php-src/ext/spl/examples   directorytreeiterator.inc 
  Log:
  Temp fix for ctor signature until inheritance fix is complete
  
http://cvs.php.net/diff.php/php-src/ext/spl/examples/directorytreeiterator.inc?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/spl/examples/directorytreeiterator.inc
diff -u php-src/ext/spl/examples/directorytreeiterator.inc:1.8 
php-src/ext/spl/examples/directorytreeiterator.inc:1.9
--- php-src/ext/spl/examples/directorytreeiterator.inc:1.8  Mon Dec  8 03:31:08 
2003
+++ php-src/ext/spl/examples/directorytreeiterator.inc  Wed Feb 25 15:38:56 2004
@@ -2,8 +2,9 @@
 
 class DirectoryTreeIterator extends RecursiveIteratorIterator
 {
-   function __construct($path)
+   function __construct($path, $mode)
{
+   // ignore $mode
parent::__construct(new CachingRecursiveIterator(new 
RecursiveDirectoryIterator($path), CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD), 1);
}


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

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

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 15:37:11 2004 EDT

  Modified files:  
/php-src/tests/lang bug22367.phpt 
  Log:
  Revert and add the compatibility option.
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug22367.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/tests/lang/bug22367.phpt
diff -u php-src/tests/lang/bug22367.phpt:1.5 php-src/tests/lang/bug22367.phpt:1.6
--- php-src/tests/lang/bug22367.phpt:1.5Wed Feb 25 09:57:43 2004
+++ php-src/tests/lang/bug22367.phptWed Feb 25 15:37:11 2004
@@ -1,7 +1,7 @@
 --TEST--
 Bug #22367 (weird zval allocation problem)
---SKIPIF--
-=')) echo "skip Overriden 
method does not match overriding method - incompatible with ZE2\n"; ?>
+--INI--
+zend.ze1_compatibility_mode=1
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / NEWS

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 15:23:16 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  typofix
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1615&r2=1.1616&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1615 php-src/NEWS:1.1616
--- php-src/NEWS:1.1615 Wed Feb 25 14:42:56 2004
+++ php-src/NEWSWed Feb 25 15:23:15 2004
@@ -2,7 +2,7 @@
 |||
 ?? ??? 2004, PHP 5 Release Candidate 1
 - Renamed php.ini option "zend2.implicit_clone" to 
-  "zend.ze2_compatibility_mode" as it doesn't only affect implicit cloning.
+  "zend.ze1_compatibility_mode" as it doesn't only affect implicit cloning.
   (Andi, Zeev)
 - Methods that override parent methods are now subject to prototype checking,
   and have to be compatible with the method they're overriding - this check is 

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

[PHP-CVS] cvs: php-src /ext/bcmath bcmath.c /ext/ftp php_ftp.c /ext/mysqli mysqli_nonapi.c mysqli_report.c /ext/oci8 oci8.c /ext/pgsql pgsql.c /ext/soap soap.c /ext/spl spl_iterators.c /ext/sqlite sqlite.c /ext/standard dir.c file.c streamsfuncs.c string.c sunfuncs.c var.c /ext/w32api w32api.c

2004-02-25 Thread Ard Biesheuvel 
abies   Wed Feb 25 15:16:29 2004 EDT

  Modified files:  
/php-src/ext/bcmath bcmath.c 
/php-src/ext/ftpphp_ftp.c 
/php-src/ext/mysqli mysqli_nonapi.c mysqli_report.c 
/php-src/ext/oci8   oci8.c 
/php-src/ext/soap   soap.c 
/php-src/ext/splspl_iterators.c 
/php-src/ext/sqlite sqlite.c 
/php-src/ext/standard   dir.c file.c streamsfuncs.c string.c 
sunfuncs.c var.c 
/php-src/ext/w32api w32api.c 
/php-src/ext/pgsql  pgsql.c 
  Log:
  Wordsize fixes
  
  http://cvs.php.net/diff.php/php-src/ext/bcmath/bcmath.c?r1=1.58&r2=1.59&ty=u
Index: php-src/ext/bcmath/bcmath.c
diff -u php-src/ext/bcmath/bcmath.c:1.58 php-src/ext/bcmath/bcmath.c:1.59
--- php-src/ext/bcmath/bcmath.c:1.58Thu Jan  8 03:14:16 2004
+++ php-src/ext/bcmath/bcmath.c Wed Feb 25 15:16:15 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: bcmath.c,v 1.58 2004/01/08 08:14:16 andi Exp $ */
+/* $Id: bcmath.c,v 1.59 2004/02/25 20:16:15 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -367,7 +367,7 @@
char *left, *right, *modulous;
int left_len, right_len, modulous_len;
bc_num first, second, mod, result;
-   int scale = BCG(bc_precision);
+   long scale = BCG(bc_precision);
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &left, 
&left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) {
WRONG_PARAM_COUNT;
http://cvs.php.net/diff.php/php-src/ext/ftp/php_ftp.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.99 php-src/ext/ftp/php_ftp.c:1.100
--- php-src/ext/ftp/php_ftp.c:1.99  Thu Jan  8 03:15:27 2004
+++ php-src/ext/ftp/php_ftp.c   Wed Feb 25 15:16:21 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.99 2004/01/08 08:15:27 andi Exp $ */
+/* $Id: php_ftp.c,v 1.100 2004/02/25 20:16:21 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -444,7 +444,7 @@
 {
zval*z_ftp, *zresponse = NULL;
ftpbuf_t*ftp;
-   int size, ret;
+   longsize, ret;
char*response = NULL;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &z_ftp, &size, 
&zresponse) == FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.31 php-src/ext/mysqli/mysqli_nonapi.c:1.32
--- php-src/ext/mysqli/mysqli_nonapi.c:1.31 Mon Feb 23 11:49:18 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c  Wed Feb 25 15:16:22 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli_nonapi.c,v 1.31 2004/02/23 16:49:18 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.32 2004/02/25 20:16:22 abies Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +38,7 @@
zval*object = getThis();
char*hostname = NULL, *username=NULL, 
*passwd=NULL, *dbname=NULL, *socket=NULL;
unsigned inthostname_len, username_len, passwd_len, dbname_len, 
socket_len;
-   unsigned intport=0;
+   longport=0;
 
 
if (getThis() && !ZEND_NUM_ARGS()) {
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_report.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.6 php-src/ext/mysqli/mysqli_report.c:1.7
--- php-src/ext/mysqli/mysqli_report.c:1.6  Wed Jan 28 17:51:54 2004
+++ php-src/ext/mysqli/mysqli_report.c  Wed Feb 25 15:16:22 2004
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>|
   +--+
 
-  $Id: mysqli_report.c,v 1.6 2004/01/28 22:51:54 georg Exp $ 
+  $Id: mysqli_report.c,v 1.7 2004/02/25 20:16:22 abies Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -31,7 +31,7 @@
sets report level */
 PHP_FUNCTION(mysqli_report)
 {
-   int flags;
+   longflags;
 

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.253&r2=1.254&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.253 php-src/ext/oci8/oci8.c:1.254
--- php-src/ext/oci8/oci8.c:1.253   Fri Feb 20 07:47:56 2004
+++ php-src/ext/oci8/oci8.c Wed Feb 25 15:16:23 2004
@@ -22,7 +22,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.253 2004/02/20 12:47:56 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.254 2004/02/25 20:16:23 abies

[PHP-CVS] cvs: php-src / NEWS

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 14:42:57 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  style
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1614&r2=1.1615&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1614 php-src/NEWS:1.1615
--- php-src/NEWS:1.1614 Wed Feb 25 12:48:20 2004
+++ php-src/NEWSWed Feb 25 14:42:56 2004
@@ -1,13 +1,14 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5 Release Candidate 1
-- Fixed crash with foreach and temporary objects($obj->method()->a ...) where
-  method returns a non-referenced object. (Andi, Zeev)
-- Compatibility mode directive has been renamed to zend.ze2_compatibility_mode,
-  as it doesn't only affect implicit cloning. (Andi, Zeev)
+- Renamed php.ini option "zend2.implicit_clone" to 
+  "zend.ze2_compatibility_mode" as it doesn't only affect implicit cloning.
+  (Andi, Zeev)
 - Methods that override parent methods are now subject to prototype checking,
-  and have to be compatible with the method they're overriding - this check
-  is disabled in compatibility mode. (Andi, Zeev)
+  and have to be compatible with the method they're overriding - this check is 
+  disabled in compatibility mode. (Andi, Zeev)
+- Fixed crash with foreach() and temporary objects($obj->method()->a ...) where
+  method returns a non-referenced object. (Andi, Zeev)
 - Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double
   initialization of apache 1.3 was causing problems here. (Marcus, Derick)

-- 
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 bug27395.phpt

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 13:54:34 2004 EDT

  Added files: (Branch: PHP_4_3)
/php-src/tests/lang bug27395.phpt 
  Log:
  MFH: Test for bug #27395
  

http://cvs.php.net/co.php/php-src/tests/lang/bug27395.phpt?r=1.1&p=1
Index: php-src/tests/lang/bug27395.phpt
+++ php-src/tests/lang/bug27395.phpt
--TEST--
Bug #27395 (reference to an array index makes the array to be passed by reference 
always)
--FILE--

--EXPECT--
int(1)
array(1) {
  [0]=>
  &int(1)
}
int(1)
array(1) {
  [0]=>
  &int(1)
}

array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}

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

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

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 13:54:15 2004 EDT

  Added files: 
/php-src/tests/lang bug27395.phpt 
  Log:
  Test for bug #27395
  

http://cvs.php.net/co.php/php-src/tests/lang/bug27395.phpt?r=1.1&p=1
Index: php-src/tests/lang/bug27395.phpt
+++ php-src/tests/lang/bug27395.phpt
--TEST--
Bug #27395 (reference to an array index makes the array to be passed by reference 
always)
--FILE--

--EXPECT--
int(1)
array(1) {
  [0]=>
  &int(1)
}
int(1)
array(1) {
  [0]=>
  &int(1)
}

array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}
array(1) {
  [0]=>
  int(1)
}

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

[PHP-CVS] cvs: php-src / NEWS

2004-02-25 Thread Andi Gutmans 
andiWed Feb 25 12:48:20 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  - More NEWS
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1613&r2=1.1614&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1613 php-src/NEWS:1.1614
--- php-src/NEWS:1.1613 Wed Feb 25 07:45:07 2004
+++ php-src/NEWSWed Feb 25 12:48:20 2004
@@ -1,6 +1,8 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5 Release Candidate 1
+- Fixed crash with foreach and temporary objects($obj->method()->a ...) where
+  method returns a non-referenced object. (Andi, Zeev)
 - Compatibility mode directive has been renamed to zend.ze2_compatibility_mode,
   as it doesn't only affect implicit cloning. (Andi, Zeev)
 - Methods that override parent methods are now subject to prototype checking,

-- 
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_iterators.c

2004-02-25 Thread Zeev Suraski 
zeevWed Feb 25 09:58:48 2004 EDT

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  Fix signature
  Marcus - please make sure that this is ok.  Generally you are no longer
  allowed to override a method and with an incompatible signature
  
  
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.20&r2=1.21&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.20 php-src/ext/spl/spl_iterators.c:1.21
--- php-src/ext/spl/spl_iterators.c:1.20Thu Feb 12 05:43:25 2004
+++ php-src/ext/spl/spl_iterators.c Wed Feb 25 09:58:47 2004
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.20 2004/02/12 10:43:25 zeev Exp $ */
+/* $Id: spl_iterators.c,v 1.21 2004/02/25 14:58:47 zeev Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1164,7 +1164,7 @@
 }
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_caching_rec_it___construct, 0) 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, 
ZEND_RETURN_REFERENCE_AGNOSTIC, 2) 
ZEND_ARG_INFO(0, iterator)
ZEND_ARG_INFO(0, getStrVal)
ZEND_ARG_INFO(0, catch_getChildren)

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

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

2004-02-25 Thread Zeev Suraski 
zeevWed Feb 25 09:57:43 2004 EDT

  Modified files:  
/php-src/tests/lang bug22367.phpt 
  Log:
  This is no longer valid out of the box PHP 5 code.
  We tried to enable compatibility mode but the test engine doesn't appear
  to take the --INI-- section into account in compile time, so it didn't
  work...
  
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug22367.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/tests/lang/bug22367.phpt
diff -u php-src/tests/lang/bug22367.phpt:1.4 php-src/tests/lang/bug22367.phpt:1.5
--- php-src/tests/lang/bug22367.phpt:1.4Sun Dec 14 13:25:13 2003
+++ php-src/tests/lang/bug22367.phptWed Feb 25 09:57:43 2004
@@ -1,7 +1,10 @@
 --TEST--
 Bug #22367 (weird zval allocation problem)
+--SKIPIF--
+=')) echo "skip Overriden 
method does not match overriding method - incompatible with ZE2\n"; ?>
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests server019.phpt server020.phpt

2004-02-25 Thread Dmitry Stogov 
dmitry  Wed Feb 25 09:37:08 2004 EDT

  Added files: 
/php-src/ext/soap/tests server019.phpt server020.phpt 

  Modified files:  
/php-src/ext/soap   soap.c 
  Log:
  HTTP compression (memory leak was fixed)
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.92&r2=1.93&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.92 php-src/ext/soap/soap.c:1.93
--- php-src/ext/soap/soap.c:1.92Wed Feb 25 09:04:41 2004
+++ php-src/ext/soap/soap.c Wed Feb 25 09:37:05 2004
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: soap.c,v 1.92 2004/02/25 14:04:41 dmitry Exp $ */
+/* $Id: soap.c,v 1.93 2004/02/25 14:37:05 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1285,6 +1285,7 @@
if (call_user_function(CG(function_table), 
(zval**)NULL, &func, &retval, 1, params TSRMLS_CC) == SUCCESS &&
Z_TYPE(retval) == IS_STRING) {
doc_request = 
soap_xmlParseMemory(Z_STRVAL(retval),Z_STRLEN(retval));
+   zval_dtor(&retval);
} else {
php_error(E_ERROR,"Can't uncompress compressed 
request");
}

http://cvs.php.net/co.php/php-src/ext/soap/tests/server019.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/server019.phpt
+++ php-src/ext/soap/tests/server019.phpt
--TEST--
SOAP Server 19: compressed request (gzip)
--SKIPIF--

--FILE--
"http://testuri.org";));
$server->addfunction("test");

$HTTP_RAW_POST_DATA = gzencode(<<
http://schemas.xmlsoap.org/soap/encoding/";
  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xmlns:si="http://soapinterop.org/xsd";>
  
http://testuri.org"; />
  

EOF
, 9, FORCE_GZIP);
$_SERVER['HTTP_CONTENT_ENCODING'] = "gzip";
$server->handle();
echo "ok\n";
?>
--EXPECT--

http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://testuri.org"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";>Hello 
World
ok

http://cvs.php.net/co.php/php-src/ext/soap/tests/server020.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/server020.phpt
+++ php-src/ext/soap/tests/server020.phpt
--TEST--
SOAP Server 20: compressed request (deflate)
--SKIPIF--

--FILE--
"http://testuri.org";));
$server->addfunction("test");

$HTTP_RAW_POST_DATA = gzcompress(<<
http://schemas.xmlsoap.org/soap/encoding/";
  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
  xmlns:xsd="http://www.w3.org/2001/XMLSchema";
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xmlns:si="http://soapinterop.org/xsd";>
  
http://testuri.org"; />
  

EOF
, 9);
$_SERVER['HTTP_CONTENT_ENCODING'] = "deflate";
$server->handle();
echo "ok\n";
?>
--EXPECT--

http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:ns1="http://testuri.org"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"; 
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";>Hello 
World
ok

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

[PHP-CVS] cvs: php-src /ext/soap php_encoding.c

2004-02-25 Thread Dmitry Stogov 
dmitry  Wed Feb 25 09:34:51 2004 EDT

  Modified files:  
/php-src/ext/soap   php_encoding.c 
  Log:
  fix: XMLSchema  support was improved to support elements with minOccurs=0
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.63&r2=1.64&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.63 php-src/ext/soap/php_encoding.c:1.64
--- php-src/ext/soap/php_encoding.c:1.63Tue Feb 24 04:02:33 2004
+++ php-src/ext/soap/php_encoding.c Wed Feb 25 09:34:50 2004
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_encoding.c,v 1.63 2004/02/24 09:02:33 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.64 2004/02/25 14:34:50 dmitry Exp $ */
 
 #include 
 
@@ -1056,7 +1056,7 @@
}
return 1;
} else if (model->min_occurs == 0) {
-   return 1;
+   return 2;
} else {
if (strict) {
php_error(E_ERROR, "SOAP-ERROR: Encoding: 
object hasn't '%s' property",model->u.element->name);
@@ -1080,15 +1080,19 @@
}
case XSD_CONTENT_CHOICE: {
sdlContentModelPtr *tmp;
+   int ret = 0;
 
zend_hash_internal_pointer_reset(model->u.content);
while (zend_hash_get_current_data(model->u.content, 
(void**)&tmp) == SUCCESS) {
-   if (model_to_xml_object(node, *tmp, prop, style, 0)) {
+   int tmp_ret = model_to_xml_object(node, *tmp, prop, 
style, 0);
+   if (tmp_ret == 1) {
return 1;
+   } else if (tmp_ret != 0) {
+   ret = 1;
}
zend_hash_move_forward(model->u.content);
}
-   return 0;
+   return ret;
}
case XSD_CONTENT_GROUP: {
return model_to_xml_object(node, model->u.group->model, prop, 
style, model->min_occurs > 0);

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

[PHP-CVS] cvs: php-src /ext/soap TODO php_http.c php_soap.h soap.c

2004-02-25 Thread Dmitry Stogov 
dmitry  Wed Feb 25 09:04:43 2004 EDT

  Modified files:  
/php-src/ext/soap   TODO php_http.c php_soap.h soap.c 
  Log:
  HTTP compression support (gzip and deflate) 
  
  http://cvs.php.net/diff.php/php-src/ext/soap/TODO?r1=1.48&r2=1.49&ty=u
Index: php-src/ext/soap/TODO
diff -u php-src/ext/soap/TODO:1.48 php-src/ext/soap/TODO:1.49
--- php-src/ext/soap/TODO:1.48  Tue Feb 24 10:35:53 2004
+++ php-src/ext/soap/TODO   Wed Feb 25 09:04:41 2004
@@ -88,7 +88,7 @@
 -
 ? HTTP status codes
 ? HTTP chunked Transfer-Encoding
-- support for HTTP compression (gzip,x-gzip,defalte)
+? support for HTTP compression (gzip,x-gzip,defalte)
 - transport abstraction layer???
 
 Interop Testing
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.45&r2=1.46&ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.45 php-src/ext/soap/php_http.c:1.46
--- php-src/ext/soap/php_http.c:1.45Fri Feb 20 10:38:39 2004
+++ php-src/ext/soap/php_http.c Wed Feb 25 09:04:41 2004
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_http.c,v 1.45 2004/02/20 15:38:39 dmitry Exp $ */
+/* $Id: php_http.c,v 1.46 2004/02/25 14:04:41 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -173,9 +173,9 @@
 
 int send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *location, char 
*soapaction, int soap_version TSRMLS_DC)
 {
-   xmlChar *buf;
+   xmlChar *buf, *request;
smart_str soap_headers = {0};
-   int buf_size,err;
+   int buf_size, request_size, err;
php_url *phpurl = NULL;
php_stream *stream;
zval **trace, **tmp;
@@ -305,8 +305,62 @@
smart_str_append_const(&soap_headers, "\"\r\n");
}
}
+
+ request = buf;
+ request_size = buf_size;
+   if (zend_hash_find(Z_OBJPROP_P(this_ptr), "compression", 
sizeof("compression"), (void **)&tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_LONG) {
+   int level = Z_LVAL_PP(tmp) & 0x0f;
+   int kind  = Z_LVAL_PP(tmp) & SOAP_COMPRESSION_DEFLATE;
+
+ if ((Z_LVAL_PP(tmp) & SOAP_COMPRESSION_ACCEPT) != 0) {
+   smart_str_append_const(&soap_headers,"Accept-Encoding: 
gzip, deflate\r\n");
+ }
+ if (level > 0) {
+   zval func;
+   zval retval;
+   zval param1, param2, param3;
+   zval *params[3];
+   int n;
+
+
+   params[0] = ¶m1;
+   INIT_PZVAL(params[0]);
+   params[1] = ¶m2;
+   INIT_PZVAL(params[1]);
+   params[2] = ¶m3;
+   INIT_PZVAL(params[2]);
+   ZVAL_STRINGL(params[0], buf, buf_size, 0);
+   ZVAL_LONG(params[1], level);
+   if (kind == SOAP_COMPRESSION_DEFLATE) {
+   n = 2;
+   ZVAL_STRING(&func, "gzcompress", 0);
+   
smart_str_append_const(&soap_headers,"Content-Encoding: deflate\r\n");
+   } else {
+ n = 3;
+   ZVAL_STRING(&func, "gzencode", 0);
+   
smart_str_append_const(&soap_headers,"Content-Encoding: gzip\r\n");
+   ZVAL_LONG(params[2], 1);
+ /* (SOAP_COMPRESSION_GZIP */
+   }
+   if (call_user_function(CG(function_table), 
(zval**)NULL, &func, &retval, n, params TSRMLS_CC) == SUCCESS &&
+   Z_TYPE(retval) == IS_STRING) {
+   request = Z_STRVAL(retval);
+   request_size = Z_STRLEN(retval);
+   } else {
+   php_url_free(phpurl);
+   if (request != buf) {efree(request);}
+   xmlFree(buf);
+   smart_str_free(&soap_headers);
+   php_stream_close(stream);
+   zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket", 
sizeof("httpsocket"));
+   zend_hash_del(Z_OBJPROP_P(this_ptr), "_use_proxy", 
sizeof("_use_proxy"));
+   add_soap_fault(this_ptr, "HTTP", "Compression Failed", NULL, 
NULL TSRMLS_CC);
+   return FALSE;
+   }
+ }
+   }
smart_str_append_const(&soap_headers,"Content-Length: ");
-

[PHP-CVS] cvs: php-src /ext/mysqli config.w32

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 08:29:32 2004 EDT

  Modified files:  
/php-src/ext/mysqli config.w32 
  Log:
  Do not corrupt mysql build with mysqli build stuff. (should fix #27387)
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.w32?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.1 php-src/ext/mysqli/config.w32:1.2
--- php-src/ext/mysqli/config.w32:1.1   Sat Feb 21 10:05:52 2004
+++ php-src/ext/mysqli/config.w32   Wed Feb 25 08:29:30 2004
@@ -1,12 +1,12 @@
-// $Id: config.w32,v 1.1 2004/02/21 15:05:52 sebastian Exp $
+// $Id: config.w32,v 1.2 2004/02/25 13:29:30 sniper Exp $
 // vim:ft=javascript
 
 ARG_WITH("mysqli", "MySQLi support", "no");
 
 if (PHP_MYSQLI != "no") {
-   if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&
-   CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", 
PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
-   EXTENSION("mysql", "mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c 
mysqli_prop.c mysqli_report.c");
+   if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQL) &&
+   CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", 
PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
+   EXTENSION("mysqli", "mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c 
mysqli_prop.c mysqli_report.c");
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
} else {
WARNING("mysqli not enabled; libraries and headers not found");

-- 
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 http_fopen_wrapper.c

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 08:20:37 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  MFH: ZTS build fix
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.15&r2=1.53.2.16&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.15 
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.15 Tue Feb 24 16:53:56 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 08:20:31 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.53.2.15 2004/02/24 21:53:56 iliaa Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.53.2.16 2004/02/25 13:20:31 sniper Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -343,7 +343,7 @@
size_t tmp_line_len;
/* get response header */
 
-   if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, 
&tmp_line_len) != NULL) {
+   if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, 
&tmp_line_len TSRMLS_CC) != NULL) {
zval *http_response;
int response_code;
 

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

[PHP-CVS] cvs: php-src / NEWS

2004-02-25 Thread Zeev Suraski 
zeevWed Feb 25 07:45:09 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  update
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1612&r2=1.1613&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1612 php-src/NEWS:1.1613
--- php-src/NEWS:1.1612 Mon Feb 16 11:00:15 2004
+++ php-src/NEWSWed Feb 25 07:45:07 2004
@@ -1,6 +1,11 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5 Release Candidate 1
+- Compatibility mode directive has been renamed to zend.ze2_compatibility_mode,
+  as it doesn't only affect implicit cloning. (Andi, Zeev)
+- Methods that override parent methods are now subject to prototype checking,
+  and have to be compatible with the method they're overriding - this check
+  is disabled in compatibility mode. (Andi, Zeev)
 - Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double
   initialization of apache 1.3 was causing problems here. (Marcus, Derick)

-- 
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 /ext/standard pack.c

2004-02-25 Thread Jani Taskinen 
sniper  Wed Feb 25 07:36:25 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
/php-src/ext/standard   pack.c 
  Log:
  MFH: Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.577&r2=1.1247.2.578&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.577 php-src/NEWS:1.1247.2.578
--- php-src/NEWS:1.1247.2.577   Tue Feb 24 16:53:57 2004
+++ php-src/NEWSWed Feb 25 07:36:23 2004
@@ -1,6 +1,7 @@
 PHP 4  NEWS
 |||
 ?? Feb 2004, Version 4.3.5
+- Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)
 - Fixed bug #27383 (Potential crash inside fopen_wrapper, while parsing
   response code). (Ilia)
 - Fixed bug #27341 (HEAD requests fail to return data). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.40.2.4&r2=1.40.2.5&ty=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.40.2.4 php-src/ext/standard/pack.c:1.40.2.5
--- php-src/ext/standard/pack.c:1.40.2.4Mon Apr 21 21:38:36 2003
+++ php-src/ext/standard/pack.c Wed Feb 25 07:36:24 2004
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: pack.c,v 1.40.2.4 2003/04/22 01:38:36 iliaa Exp $ */
+/* $Id: pack.c,v 1.40.2.5 2004/02/25 12:36:24 sniper Exp $ */
 
 #include "php.h"
 
@@ -642,7 +642,7 @@
/* Space for name + number, safe as namelen is ensured <= 200 
*/
char n[256];
 
-   if (arg != 1) {
+   if (arg != 1 || namelen == 0) {
/* Need to add element number to name */
sprintf(n, "%.*s%d", namelen, name, i + 1);
} else {

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c

2004-02-25 Thread Zeev Suraski 
zeevWed Feb 25 05:58:07 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
/php-src/main   main.c 
  Log:
- Rename compatiblity mode to zend.ze2_compatibility_mode (it doesn't   only 
affect auto-clone).
- Perform implementation checks even with simple inheritance (off when
  compatibility mode is enabled).
- Restore default arguments in interfaces and handle it correctly.
- Move registration of internal classes later in the startup sequence
  in order to have INI options available.
  
  http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.206&r2=1.207&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.206 php-src/php.ini-dist:1.207
--- php-src/php.ini-dist:1.206  Mon Feb  9 19:02:37 2004
+++ php-src/php.ini-distWed Feb 25 05:58:05 2004
@@ -67,7 +67,10 @@
 ; Enable the PHP scripting language engine under Apache.
 engine = On
 
-; Allow the  tags are recognized.  
+; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
+zend.ze1_compatibility_mode = Off
+
+; Allow the  tags are recognized.
 ; NOTE: Using short tags should be avoided when developing applications or
 ; libraries that are meant for redistribution, or deployment on PHP
 ; servers which are not under your control, because short tags may not
@@ -99,18 +102,18 @@
 ; Setting any output handler automatically turns on output buffering.
 ; Note: People who wrote portable scripts should not depend on this ini
 ;   directive. Instead, explicitly set the output handler using ob_start().
-;   Using this ini directive may cause problems unless you know what script 
+;   Using this ini directive may cause problems unless you know what script
 ;   is doing.
 ; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-;   and you cannot use both "ob_gzhandler" and "zlib.output_compression". 
+;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
 ;output_handler =
 
 ; Transparent output compression using the zlib library
 ; Valid values for this option are 'off', 'on', or a specific buffer size
 ; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP 
-;   outputs chunks that are few hundreds bytes each as a result of 
-;   compression. If you prefer a larger chunk size for better 
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+;   outputs chunks that are few hundreds bytes each as a result of
+;   compression. If you prefer a larger chunk size for better
 ;   performance, enable output_buffering in addition.
 ; Note: You need to use zlib.output_handler instead of the standard
 ;   output_handler, or otherwise the output will be corrupted.
@@ -133,7 +136,7 @@
 ; which should be instanciated.
 ; A warning appears if the specified function is not defined, or if the
 ; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a 
+; So only set this entry, if you really want to implement such a
 ; callback-function.
 unserialize_callback_func=
 
@@ -166,7 +169,7 @@
 ; including files from this directory and its subdirectories.
 ; (directory must also be in include_path or full path must
 ; be used when including)
-safe_mode_include_dir =   
 
+safe_mode_include_dir =
 
 ; When safe_mode is on, only executables located in the safe_mode_exec_dir
 ; will be allowed to be executed via the exec family of functions.
@@ -297,13 +300,13 @@
 ; line until ignore_repeated_source is set true.
 ignore_repeated_errors = Off
 
-; Ignore source of message when ignoring repeated messages. When this setting 
+; Ignore source of message when ignoring repeated messages. When this setting
 ; is On you will not log errors with repeated messages from different files or
 ; sourcelines.
 ignore_repeated_source = Off
 
 ; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if 
+; stdout or in the log). This has only effect in a debug compile, and if
 ; error reporting includes E_WARNING in the allowed list
 report_memleaks = On
 
@@ -313,17 +316,17 @@
 ; Disable the inclusion of HTML tags in error messages.
 ; Note: Never use this feature for production boxes.
 ;html_errors = Off
-  
-; If html_errors is set On PHP produces clickable error messages that direct 
+
+; If html_errors is set On PHP produces clickable error messages that direct
 ; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php 
+; You can download a copy of the PHP manual from http://www.php.net/docs.php
 ; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being us

[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c

2004-02-25 Thread Sebastian Bergmann 
sebastian   Wed Feb 25 04:36:47 2004 EDT

  Modified files:  
/php-src/ext/standard   http_fopen_wrapper.c 
  Log:
  ZTS fix.
  
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.82&r2=1.83&ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.82 
php-src/ext/standard/http_fopen_wrapper.c:1.83
--- php-src/ext/standard/http_fopen_wrapper.c:1.82  Tue Feb 24 16:52:40 2004
+++ php-src/ext/standard/http_fopen_wrapper.c   Wed Feb 25 04:36:46 2004
@@ -18,7 +18,7 @@
|  Wez Furlong <[EMAIL PROTECTED]>  |
+--+
  */
-/* $Id: http_fopen_wrapper.c,v 1.82 2004/02/24 21:52:40 iliaa Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.83 2004/02/25 09:36:46 sebastian Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -355,7 +355,7 @@
size_t tmp_line_len;
/* get response header */
 
-   if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, 
&tmp_line_len) != NULL) {
+   if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1, 
&tmp_line_len TSRMLS_CC) != NULL) {
zval *http_response;
int response_code;
 

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