[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-01-08 Thread changelog 
changelog   Wed Jan  9 01:31:43 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2921r2=1.2922diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2921 php-src/ChangeLog:1.2922
--- php-src/ChangeLog:1.2921Tue Jan  8 01:31:39 2008
+++ php-src/ChangeLog   Wed Jan  9 01:31:43 2008
@@ -1,3 +1,144 @@
+2008-01-08  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/standard/ftp_fopen_wrapper.c:
+  
+  MFB: Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
+  allowed in ASCII mode).
+
+* ext/standard/ftp_fopen_wrapper.c:
+  MFB: Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
+  allowed in ASCII mode).
+
+* (PHP_5_3)
+  ext/standard/ftp_fopen_wrapper.c:
+  Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
+  allowed in ASCII mode).
+
+2008-01-08  Ulf Wendel  [EMAIL PROTECTED]
+
+* ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:
+  Those functions have been deprecated and removed. We'll test them only
+  internally
+  but not bother php.net with it. Unless you really want to have tests for
+  deprecated
+  and removed functionality...
+
+* (PHP_5_3)
+  ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:
+  MySQL 6 compatibility fix.
+
+2008-01-08  Andrey Hristov  [EMAIL PROTECTED]
+
+* ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.h
+  ext/mysqlnd/mysqlnd_debug.h
+  ext/mysqlnd/mysqlnd_enum_n_def.h
+  ext/mysqlnd/mysqlnd_loaddata.c
+  ext/mysqlnd/mysqlnd_loaddata.c
+  ext/mysqlnd/mysqlnd_palloc.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_result.c
+  ext/mysqlnd/mysqlnd_result.h
+  ext/mysqlnd/mysqlnd_result_meta.h
+  ext/mysqlnd/mysqlnd_statistics.h
+  ext/mysqlnd/mysqlnd_structs.h
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.h
+  ext/mysqlnd/php_mysqlnd.h:
+  strncpy-strlcpy
+
+2008-01-08  Ulf Wendel  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/mysqli/tests/002.phpt
+  ext/mysqli/tests/003.phpt
+  ext/mysqli/tests/004.phpt
+  ext/mysqli/tests/005.phpt
+  ext/mysqli/tests/006.phpt
+  ext/mysqli/tests/007.phpt
+  ext/mysqli/tests/008.phpt
+  ext/mysqli/tests/009.phpt
+  ext/mysqli/tests/010.phpt
+  ext/mysqli/tests/011.phpt
+  ext/mysqli/tests/012.phpt
+  ext/mysqli/tests/013.phpt
+  ext/mysqli/tests/014.phpt
+  ext/mysqli/tests/015.phpt
+  ext/mysqli/tests/017.phpt
+  ext/mysqli/tests/019.phpt
+  ext/mysqli/tests/020.phpt
+  ext/mysqli/tests/021.phpt
+  ext/mysqli/tests/022.phpt
+  ext/mysqli/tests/023.phpt
+  ext/mysqli/tests/024.phpt
+  ext/mysqli/tests/025.phpt
+  ext/mysqli/tests/026.phpt
+  ext/mysqli/tests/029.phpt
+  ext/mysqli/tests/030.phpt
+  ext/mysqli/tests/031.phpt
+  ext/mysqli/tests/032.phpt
+  ext/mysqli/tests/036.phpt
+  ext/mysqli/tests/037.phpt
+  ext/mysqli/tests/038.phpt
+  ext/mysqli/tests/039.phpt
+  ext/mysqli/tests/040.phpt
+  ext/mysqli/tests/042.phpt
+  ext/mysqli/tests/043.phpt
+  ext/mysqli/tests/046.phpt
+  ext/mysqli/tests/047.phpt
+  ext/mysqli/tests/048.phpt
+  ext/mysqli/tests/061.phpt:
+  Merge from HEAD: looks more than it is. Whitespace, some SQL formatting
+  changes etc.
+  No real changes.
+
+* ext/mysqli/tests/002.phpt
+  ext/mysqli/tests/003.phpt
+  ext/mysqli/tests/004.phpt
+  ext/mysqli/tests/005.phpt
+  ext/mysqli/tests/006.phpt
+  ext/mysqli/tests/007.phpt
+  ext/mysqli/tests/008.phpt
+  ext/mysqli/tests/009.phpt
+  ext/mysqli/tests/010.phpt
+  ext/mysqli/tests/011.phpt
+  ext/mysqli/tests/012.phpt
+  ext/mysqli/tests/013.phpt
+  ext/mysqli/tests/014.phpt
+  ext/mysqli/tests/015.phpt
+  ext/mysqli/tests/017.phpt
+  ext/mysqli/tests/019.phpt
+  ext/mysqli/tests/020.phpt
+  ext/mysqli/tests/021.phpt
+  ext/mysqli/tests/022.phpt
+  ext/mysqli/tests/023.phpt
+  ext/mysqli/tests/024.phpt
+  ext/mysqli/tests/025.phpt
+  ext/mysqli/tests/026.phpt
+  ext/mysqli/tests/029.phpt
+  ext/mysqli/tests/030.phpt
+  ext/mysqli/tests/031.phpt
+  ext/mysqli/tests/032.phpt
+  ext/mysqli/tests/036.phpt
+  ext/mysqli/tests/037.phpt
+  ext/mysqli/tests/038.phpt
+  ext/mysqli/tests/039.phpt
+  ext/mysqli/tests/040.phpt
+  ext/mysqli/tests/042.phpt
+  ext/mysqli/tests/043.phpt
+  ext/mysqli/tests/046.phpt
+  ext/mysqli/tests/047.phpt
+  ext/mysqli/tests/048.phpt
+  ext/mysqli/tests/061.phpt:
+  Looks more than it is. Its whitespace, adding error handling in a few
+  places,
+

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 017.phpt 019.phpt 020.ph

2008-01-08 Thread Ulf Wendel 
uw  Tue Jan  8 12:49:43 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   002.phpt 003.phpt 004.phpt 005.phpt 
006.phpt 007.phpt 008.phpt 009.phpt 
010.phpt 011.phpt 012.phpt 013.phpt 
014.phpt 015.phpt 017.phpt 019.phpt 
020.phpt 021.phpt 022.phpt 023.phpt 
024.phpt 025.phpt 026.phpt 029.phpt 
030.phpt 031.phpt 032.phpt 036.phpt 
037.phpt 038.phpt 039.phpt 040.phpt 
042.phpt 043.phpt 046.phpt 047.phpt 
048.phpt 061.phpt 
  Log:
  Merge from HEAD: looks more than it is. Whitespace, some SQL formatting 
changes etc.
  No real changes.
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.4.2.1.4.1r2=1.4.2.1.4.2diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.4.2.1.4.1 
php-src/ext/mysqli/tests/002.phpt:1.4.2.1.4.2
--- php-src/ext/mysqli/tests/002.phpt:1.4.2.1.4.1   Wed Oct 10 10:06:53 2007
+++ php-src/ext/mysqli/tests/002.phpt   Tue Jan  8 12:49:42 2008
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_result 1
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
@@ -42,6 +42,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   @mysqli_query($link, DROP TABLE IF EXISTS test_fetch_null);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.5.2.1.4.2r2=1.5.2.1.4.3diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.5.2.1.4.2 
php-src/ext/mysqli/tests/003.phpt:1.5.2.1.4.3
--- php-src/ext/mysqli/tests/003.phpt:1.5.2.1.4.2   Fri Dec 28 15:06:02 2007
+++ php-src/ext/mysqli/tests/003.phpt   Tue Jan  8 12:49:42 2008
@@ -68,6 +68,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_result);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.4.2.1.4.1r2=1.4.2.1.4.2diff_format=u
Index: php-src/ext/mysqli/tests/004.phpt
diff -u php-src/ext/mysqli/tests/004.phpt:1.4.2.1.4.1 
php-src/ext/mysqli/tests/004.phpt:1.4.2.1.4.2
--- php-src/ext/mysqli/tests/004.phpt:1.4.2.1.4.1   Wed Oct 10 10:06:53 2007
+++ php-src/ext/mysqli/tests/004.phpt   Tue Jan  8 12:49:42 2008
@@ -1,8 +1,8 @@
 --TEST--
-mysqli fetch char/text 
+mysqli fetch char/text
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
@@ -16,7 +16,7 @@
 
if (!mysqli_query($link,DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] string\n, mysqli_errno($link), 
mysqli_error($link));
-   
+
if (!mysqli_query($link,CREATE TABLE test_bind_fetch(c1 char(10), c2 
text) ENGINE= . $engine))
printf([002] [%d] string\n, mysqli_errno($link), 
mysqli_error($link));
 
@@ -43,6 +43,7 @@
}
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.4.6.1r2=1.4.6.2diff_format=u
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.4.6.1 
php-src/ext/mysqli/tests/005.phpt:1.4.6.2
--- php-src/ext/mysqli/tests/005.phpt:1.4.6.1   Wed Oct 10 10:06:53 2007
+++ php-src/ext/mysqli/tests/005.phpt   Tue Jan  8 12:49:42 2008
@@ -1,20 +1,20 @@
 --TEST--
-mysqli fetch char/text long 
+mysqli fetch char/text long
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
 ?php
include connect.inc;
-   
+
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
if (!mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] %s\n, mysqli_errno($link), 
mysqli_error($link));
-   
+
if (!mysqli_query($link, CREATE TABLE test_bind_fetch(c1 char(10), c2 
text) ENGINE= . $engine))
printf([002] [%d] %s\n, mysqli_errno($link), 
mysqli_error($link));
 
@@ -33,6 +33,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.4.2.1.4.1r2=1.4.2.1.4.2diff_format=u
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.4.2.1.4.1

[PHP-CVS] cvs: php-src /ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 017.phpt 019.phpt 020.phpt 021.ph

2008-01-08 Thread Ulf Wendel 
uw  Tue Jan  8 12:43:09 2008 UTC

  Modified files:  
/php-src/ext/mysqli/tests   002.phpt 003.phpt 004.phpt 005.phpt 
006.phpt 007.phpt 008.phpt 009.phpt 
010.phpt 011.phpt 012.phpt 013.phpt 
014.phpt 015.phpt 017.phpt 019.phpt 
020.phpt 021.phpt 022.phpt 023.phpt 
024.phpt 025.phpt 026.phpt 029.phpt 
030.phpt 031.phpt 032.phpt 036.phpt 
037.phpt 038.phpt 039.phpt 040.phpt 
042.phpt 043.phpt 046.phpt 047.phpt 
048.phpt 061.phpt 
  Log:
  Looks more than it is. Its whitespace, adding error handling in a few places,
  changing SQL statement formatting etc. No real changes.
  
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.9 
php-src/ext/mysqli/tests/002.phpt:1.10
--- php-src/ext/mysqli/tests/002.phpt:1.9   Thu Aug  9 08:41:11 2007
+++ php-src/ext/mysqli/tests/002.phpt   Tue Jan  8 12:43:08 2008
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_result 1
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
@@ -42,6 +42,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   @mysqli_query($link, DROP TABLE IF EXISTS test_fetch_null);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.10 
php-src/ext/mysqli/tests/003.phpt:1.11
--- php-src/ext/mysqli/tests/003.phpt:1.10  Fri Dec 28 18:19:17 2007
+++ php-src/ext/mysqli/tests/003.phpt   Tue Jan  8 12:43:08 2008
@@ -68,6 +68,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_result);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/mysqli/tests/004.phpt
diff -u php-src/ext/mysqli/tests/004.phpt:1.8 
php-src/ext/mysqli/tests/004.phpt:1.9
--- php-src/ext/mysqli/tests/004.phpt:1.8   Thu Aug  9 08:41:11 2007
+++ php-src/ext/mysqli/tests/004.phpt   Tue Jan  8 12:43:08 2008
@@ -1,8 +1,8 @@
 --TEST--
-mysqli fetch char/text 
+mysqli fetch char/text
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
@@ -16,7 +16,7 @@
 
if (!mysqli_query($link,DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] string\n, mysqli_errno($link), 
mysqli_error($link));
-   
+
if (!mysqli_query($link,CREATE TABLE test_bind_fetch(c1 char(10), c2 
text) ENGINE= . $engine))
printf([002] [%d] string\n, mysqli_errno($link), 
mysqli_error($link));
 
@@ -43,6 +43,7 @@
}
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.7 
php-src/ext/mysqli/tests/005.phpt:1.8
--- php-src/ext/mysqli/tests/005.phpt:1.7   Thu Aug  9 08:41:12 2007
+++ php-src/ext/mysqli/tests/005.phpt   Tue Jan  8 12:43:08 2008
@@ -1,20 +1,20 @@
 --TEST--
-mysqli fetch char/text long 
+mysqli fetch char/text long
 --SKIPIF--
-?php 
-require_once('skipif.inc'); 
+?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?
 --FILE--
 ?php
include connect.inc;
-   
+
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
if (!mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch))
printf([001] [%d] %s\n, mysqli_errno($link), 
mysqli_error($link));
-   
+
if (!mysqli_query($link, CREATE TABLE test_bind_fetch(c1 char(10), c2 
text) ENGINE= . $engine))
printf([002] [%d] %s\n, mysqli_errno($link), 
mysqli_error($link));
 
@@ -33,6 +33,7 @@
var_dump($test);
 
mysqli_stmt_close($stmt);
+   mysqli_query($link, DROP TABLE IF EXISTS test_bind_fetch);
mysqli_close($link);
print done!;
 ?
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.7 
php-src/ext/mysqli/tests/006.phpt:1.8
--- php-src/ext/mysqli/tests/006.phpt:1.7   Thu Aug  9 08:41:12 2007
+++ php-src/ext/mysqli/tests/006.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_loaddata.c mysqlnd_palloc.h mysqlnd_priv.h mysqlnd_result.h mysqlnd_result_meta.h mysqlnd_statistics

2008-01-08 Thread Andrey Hristov 
andrey  Tue Jan  8 13:11:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.c mysqlnd_debug.h mysqlnd_enum_n_def.h 
mysqlnd_loaddata.c mysqlnd_palloc.h 
mysqlnd_priv.h mysqlnd_result.h 
mysqlnd_result_meta.h mysqlnd_statistics.h 
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h 
php_mysqlnd.h 
  Log:
  strncpy-strlcpy
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.6r2=1.5.2.7diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.6 
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.7
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.6   Wed Jan  2 21:14:34 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Tue Jan  8 13:11:55 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.5.2.6 2008/01/02 21:14:34 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.7 2008/01/08 13:11:55 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -676,14 +676,14 @@
} else if (ok_packet.field_count == 0xFF) {
if (ok_packet.sqlstate[0]) {
if (!self_alloced) {
-   strncpy(conn-error_info.sqlstate, 
ok_packet.sqlstate, sizeof(conn-error_info.sqlstate));
+   strlcpy(conn-error_info.sqlstate, 
ok_packet.sqlstate, sizeof(conn-error_info.sqlstate));
}
DBG_ERR_FMT(ERROR:%d [SQLSTATE:%s] %s,
ok_packet.error_no, 
ok_packet.sqlstate, ok_packet.error);
}
if (!self_alloced) {
conn-error_info.error_no = ok_packet.error_no;
-   strncpy(conn-error_info.error, 
ok_packet.error, sizeof(conn-error_info.error));
+   strlcpy(conn-error_info.error, 
ok_packet.error, sizeof(conn-error_info.error));
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.h
diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.4 
php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.5
--- php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.4 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_debug.h Tue Jan  8 13:11:55 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_debug.h,v 1.1.2.4 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.1.2.5 2008/01/08 13:11:55 andrey Exp $ */
 
 #ifndef MYSQLND_DEBUG_H
 #define MYSQLND_DEBUG_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h
diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.3 
php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.3Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.hTue Jan  8 13:11:55 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.3 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $ */
 #ifndef MYSQLND_ENUM_N_DEF_H
 #define MYSQLND_ENUM_N_DEF_H
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.3 
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.3  Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c  Tue Jan  8 13:11:55 2008
@@ -113,7 +113,7 @@
DBG_ENTER(mysqlnd_local_infile_error);
 
if (info) {
-   strncpy(error_buf, info-error_msg, error_buf_len);
+   strlcpy(error_buf, info-error_msg, error_buf_len);
DBG_INF_FMT(have info, %d, info-error_no);
DBG_RETURN(info-error_no);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.h?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.h
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.3 
php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.3Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_palloc.hTue Jan  8 13:11:55 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_palloc.h,v 1.2.2.3 2007/12/31

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_loaddata.c mysqlnd_priv.h mysqlnd_result.c mysqlnd_structs.h mysqlnd_wireprotocol.c

2008-01-08 Thread Andrey Hristov 
andrey  Tue Jan  8 13:13:39 2008 UTC

  Modified files:  
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_loaddata.c 
mysqlnd_priv.h mysqlnd_result.c 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
  Log:
  strncpy-strlcpy
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.9 php-src/ext/mysqlnd/mysqlnd.c:1.10
--- php-src/ext/mysqlnd/mysqlnd.c:1.9   Wed Jan  2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd.c   Tue Jan  8 13:13:39 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.9 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.10 2008/01/08 13:13:39 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -676,14 +676,14 @@
} else if (ok_packet.field_count == 0xFF) {
if (ok_packet.sqlstate[0]) {
if (!self_alloced) {
-   strncpy(conn-error_info.sqlstate, 
ok_packet.sqlstate, sizeof(conn-error_info.sqlstate));
+   strlcpy(conn-error_info.sqlstate, 
ok_packet.sqlstate, sizeof(conn-error_info.sqlstate));
}
DBG_ERR_FMT(ERROR:%d [SQLSTATE:%s] %s,
ok_packet.error_no, 
ok_packet.sqlstate, ok_packet.error);
}
if (!self_alloced) {
conn-error_info.error_no = ok_packet.error_no;
-   strncpy(conn-error_info.error, 
ok_packet.error, sizeof(conn-error_info.error));
+   strlcpy(conn-error_info.error, 
ok_packet.error, sizeof(conn-error_info.error));
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.5 php-src/ext/mysqlnd/mysqlnd.h:1.6
--- php-src/ext/mysqlnd/mysqlnd.h:1.5   Wed Jan  2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd.h   Tue Jan  8 13:13:39 2008
@@ -18,12 +18,12 @@
   +--+
 */
 
-/* $Id: mysqlnd.h,v 1.5 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.6 2008/01/08 13:13:39 andrey Exp $ */
 
 #ifndef MYSQLND_H
 #define MYSQLND_H
 
-#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.5 $
+#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.6 $
 #define MYSQLND_VERSION_ID 50002
 
 /* This forces inlining of some accessor functions */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.3 
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.4
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.3  Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c  Tue Jan  8 13:13:39 2008
@@ -113,7 +113,7 @@
DBG_ENTER(mysqlnd_local_infile_error);
 
if (info) {
-   strncpy(error_buf, info-error_msg, error_buf_len);
+   strlcpy(error_buf, info-error_msg, error_buf_len);
DBG_INF_FMT(have info, %d, info-error_no);
DBG_RETURN(info-error_no);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_priv.h?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.7 
php-src/ext/mysqlnd/mysqlnd_priv.h:1.8
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.7  Wed Jan  2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_priv.h  Tue Jan  8 13:13:39 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_priv.h,v 1.7 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.8 2008/01/08 13:13:39 andrey Exp $ */
 
 #ifndef MYSQLND_PRIV_H
 #define MYSQLND_PRIV_H
@@ -143,7 +143,7 @@
{ \
error_info.error_no = 0; \
error_info.error[0] = '\0'; \
-   strncpy(error_info.sqlstate, 0, sizeof(0) - 1); \
+   strlcpy(error_info.sqlstate, 0, 
sizeof(error_info.sqlstate)); \
}
 
 #define SET_CLIENT_ERROR(error_info, a, b, c) \
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.8 
php-src/ext/mysqlnd/mysqlnd_result.c:1.9
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.8Wed Jan  2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.cTue Jan  8 13:13:39 2008
@@ -18,7 +18,7 @@

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_stmt_send_long_data.phpt

2008-01-08 Thread Ulf Wendel 
uw  Tue Jan  8 13:16:00 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_stmt_send_long_data.phpt 
  Log:
  MySQL 6 compatibility fix.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
diff -u php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.2.2.2 
php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.2.2.3
--- php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.2.2.2Wed Oct 
10 10:18:50 2007
+++ php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phptTue Jan  8 
13:16:00 2008
@@ -49,6 +49,10 @@
 
mysqli_free_result($res);
 
+   if (isset($row['VARIABLE_VALUE'])  !isset($row['Value']))
+   // MySQL 6.0
+   $row['Value'] = $row['VARIABLE_VALUE'];
+
if (0 === ($max_allowed_packet = (int)$row['Value']))
printf([011] Cannot determine max_allowed_packet size and/or 
bogus max_allowed_packet setting used.\n);
 

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

[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_class_mysqli_interface.phpt

2008-01-08 Thread Ulf Wendel 
uw  Tue Jan  8 13:18:46 2008 UTC

  Modified files:  
/php-src/ext/mysqli/tests   mysqli_class_mysqli_interface.phpt 
  Log:
  Those functions have been deprecated and removed. We'll test them only 
internally
  but not bother php.net with it. Unless you really want to have tests for 
deprecated
  and removed functionality...
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.3 
php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt:1.3 Wed Oct 
10 10:49:00 2007
+++ php-src/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt Tue Jan  8 
13:18:46 2008
@@ -62,33 +62,6 @@
$expected_methods['get_connection_stats']   = true;
} else {
// libmysql only
-   if (function_exists('mysqli_disable_reads_from_master'))
-   $expected_methods['disable_reads_from_master']  = true;
-
-   if (function_exists('mysqli_disable_rpl_parse'))
-   $expected_methods['disable_rpl_parse'] = true;
-
-   if (function_exists('mysqli_enable_reads_from_master'))
-   $expected_methods['enable_reads_from_master'] = true;
-
-   if (function_exists('mysqli_enable_rpl_parse'))
-   $expected_methods['enable_rpl_parse'] = true;
-
-   if (function_exists('mysqli_master_query'))
-   $expected_methods['master_query'] = true;
-
-   if (function_exists('mysqli_rpl_parse_enabled'))
-   $expected_methods['rpl_parse_enabled'] = true;
-
-   if (function_exists('mysqli_rpl_probe'))
-   $expected_methods['rpl_probe'] = true;
-
-   if (function_exists('mysqli_rpl_query_type'))
-   $expected_methods['rpl_query_type'] = true;
-
-   if (function_exists('mysqli_slave_query'))
-   $expected_methods['slave_query'] = true;
-
if (function_exists('mysqli_ssl_set'))
$expected_methods['ssl_set'] = true;
$expected_methods['set_local_infile_default']   = true;

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

[PHP-CVS] cvs: CVSROOT / avail

2008-01-08 Thread Rasmus Lerdorf 
rasmus  Tue Jan  8 17:15:24 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  Doc account for sezer
  
  http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1342r2=1.1343diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1342 CVSROOT/avail:1.1343
--- CVSROOT/avail:1.1342Sat Jan  5 10:56:16 2008
+++ CVSROOT/avail   Tue Jan  8 17:15:23 2008
@@ -44,7 +44,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c!
 
hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,!
 abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h
win,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj!
 
,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,gwynne,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit,philippe|p!
 hpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpd
oc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no

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

2008-01-08 Thread Ilia Alshanetsky 
iliaa   Tue Jan  8 19:09:12 2008 UTC

  Modified files:  
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  MFB: Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
  allowed in ASCII mode). 
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.101r2=1.102diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.101 
php-src/ext/standard/ftp_fopen_wrapper.c:1.102
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.101  Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cTue Jan  8 19:09:12 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.101 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.102 2008/01/08 19:09:12 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -775,6 +775,7 @@
ssb-sb.st_mode |= S_IFDIR;
}
 
+   php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {

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

[PHP-CVS] cvs: CVSROOT / avail

2008-01-08 Thread Rasmus Lerdorf 
rasmus  Tue Jan  8 19:23:38 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  doc karma for kalle
  
  http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1343r2=1.1344diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1343 CVSROOT/avail:1.1344
--- CVSROOT/avail:1.1343Tue Jan  8 17:15:23 2008
+++ CVSROOT/avail   Tue Jan  8 19:23:38 2008
@@ -44,7 +44,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c!
 
hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,!
 abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h
win,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj!
 
,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,gwynne,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit,philippe,s!
 ezer|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-e
l,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard ftp_fopen_wrapper.c

2008-01-08 Thread Ilia Alshanetsky 
iliaa   Tue Jan  8 19:08:50 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   ftp_fopen_wrapper.c 
  Log:
  Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
  allowed in ASCII mode).
  # Original patch by crrodriguez at suse dot de
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.4.2.4r2=1.85.2.4.2.4.2.5diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.4 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.5
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4.2.4   Mon Dec 31 
07:17:15 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cTue Jan  8 19:08:50 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.4 2007/12/31 07:17:15 sebastian 
Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4.2.5 2008/01/08 19:08:50 iliaa Exp $ 
*/
 
 #include php.h
 #include php_globals.h
@@ -774,6 +774,7 @@
ssb-sb.st_mode |= S_IFDIR;
}
 
+   php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard ftp_fopen_wrapper.c

2008-01-08 Thread Ilia Alshanetsky 
iliaa   Tue Jan  8 19:10:16 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   ftp_fopen_wrapper.c 
/php-srcNEWS 
  Log:
  
  MFB: Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
  allowed in ASCII mode).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.8r2=1.85.2.4.2.9diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.8 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.9
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.8   Mon Dec 31 
07:20:12 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.cTue Jan  8 19:10:16 2008
@@ -18,7 +18,7 @@
|  Sara Golemon [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.8 2007/12/31 07:20:12 sebastian Exp $ 
*/
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.9 2008/01/08 19:10:16 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -776,6 +776,7 @@
ssb-sb.st_mode |= S_IFDIR;
}
 
+   php_stream_write_string(stream, TYPE I\r\n); /* we need this since 
some servers refuse to accept SIZE command in ASCII mode */
php_stream_printf(stream TSRMLS_CC, SIZE %s\r\n, (resource-path != 
NULL ? resource-path : /));
result = GET_FTP_RESULT(stream);
if (result  200 || result  299) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1047r2=1.2027.2.547.2.1048diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1047 php-src/NEWS:1.2027.2.547.2.1048
--- php-src/NEWS:1.2027.2.547.2.1047Sun Jan  6 17:12:29 2008
+++ php-src/NEWSTue Jan  8 19:10:16 2008
@@ -22,6 +22,8 @@
   Ilia, Tony)
 - Fixed bug #43495 (array_merge_recursive() crashes with recursive arrays).
   (Ilia)
+- Fixed bug #43498 (file_exists() on a proftpd server got SIZE not
+  allowed in ASCII mode). (Ilia, crrodriguez at suse dot de)
 - Fixed bug #43493 (pdo_pgsql does not send username on connect when password
   is not available). (Ilia)
 - Fixed bug #43482 (array_pad() does not warn on very small pad numbers).

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/libgd gdft.c

2008-01-08 Thread Pierre-Alain Joye 
pajoye  Wed Jan  9 01:50:59 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - #43790, fix crash when no family name has been found
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9r2=1.36.4.10diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9 
php-src/ext/gd/libgd/gdft.c:1.36.4.10
--- php-src/ext/gd/libgd/gdft.c:1.36.4.9Mon Apr 23 15:17:47 2007
+++ php-src/ext/gd/libgd/gdft.c Wed Jan  9 01:50:59 2008
@@ -947,7 +947,8 @@
 
 /* EAM DEBUG */
 #if (defined(FREETYPE_MAJOR)  ((FREETYPE_MAJOR == 2  ((FREETYPE_MINOR == 1 
 FREETYPE_PATCH = 3) || FREETYPE_MINOR  1) || FREETYPE_MAJOR  2)))
-   if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL  
strcmp(font-face-family_name, Symbol) == 0) {
+   if (font-face-family_name  font-face-charmap-encoding 
+   font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL 
 strcmp(font-face-family_name, Symbol) == 0) {
/* I do not know the significance of the constant 
0xf000.
 * It was determined by inspection of the character 
codes
 * stored in Microsoft font symbol.

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd/libgd gdft.c

2008-01-08 Thread Pierre-Alain Joye 
pajoye  Wed Jan  9 01:51:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - MFB: #43790, fix crash when no family name has been found
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.36.4.9r2=1.36.4.9.2.1diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.36.4.9 
php-src/ext/gd/libgd/gdft.c:1.36.4.9.2.1
--- php-src/ext/gd/libgd/gdft.c:1.36.4.9Mon Apr 23 15:17:47 2007
+++ php-src/ext/gd/libgd/gdft.c Wed Jan  9 01:51:17 2008
@@ -947,7 +947,8 @@
 
 /* EAM DEBUG */
 #if (defined(FREETYPE_MAJOR)  ((FREETYPE_MAJOR == 2  ((FREETYPE_MINOR == 1 
 FREETYPE_PATCH = 3) || FREETYPE_MINOR  1) || FREETYPE_MAJOR  2)))
-   if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL  
strcmp(font-face-family_name, Symbol) == 0) {
+   if (font-face-family_name  font-face-charmap-encoding 
+   font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL 
 strcmp(font-face-family_name, Symbol) == 0) {
/* I do not know the significance of the constant 
0xf000.
 * It was determined by inspection of the character 
codes
 * stored in Microsoft font symbol.

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

2008-01-08 Thread Pierre-Alain Joye 
pajoye  Wed Jan  9 01:52:03 2008 UTC

  Modified files:  
/php-src/ext/gd/libgd   gdft.c 
  Log:
  - MFB: #43790, fix crash when no family name has been found
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdft.c?r1=1.45r2=1.46diff_format=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.45 php-src/ext/gd/libgd/gdft.c:1.46
--- php-src/ext/gd/libgd/gdft.c:1.45Mon Apr 23 15:06:13 2007
+++ php-src/ext/gd/libgd/gdft.c Wed Jan  9 01:52:03 2008
@@ -947,7 +947,8 @@
 
 /* EAM DEBUG */
 #if (defined(FREETYPE_MAJOR)  ((FREETYPE_MAJOR == 2  ((FREETYPE_MINOR == 1 
 FREETYPE_PATCH = 3) || FREETYPE_MINOR  1) || FREETYPE_MAJOR  2)))
-   if (font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL  
strcmp(font-face-family_name, Symbol) == 0) {
+   if (font-face-family_name  font-face-charmap-encoding 
+   font-face-charmap-encoding == FT_ENCODING_MS_SYMBOL 
 strcmp(font-face-family_name, Symbol) == 0) {
/* I do not know the significance of the constant 
0xf000.
 * It was determined by inspection of the character 
codes
 * stored in Microsoft font symbol.

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

[PHP-CVS] cvs: php-src /ext/zlib zlib_filter.c /ext/zlib/tests zlib_filter_inflate2.phpt

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 06:42:56 2008 UTC

  Added files: 
/php-src/ext/zlib/tests zlib_filter_inflate2.phpt 

  Modified files:  
/php-src/ext/zlib   zlib_filter.c 
  Log:
  fix Bug #43793: zlib filter is unable to auto-detect gzip/zlib file headers
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.16r2=1.17diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.16 php-src/ext/zlib/zlib_filter.c:1.17
--- php-src/ext/zlib/zlib_filter.c:1.16 Mon Dec 31 07:12:18 2007
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 06:42:56 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.16 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: zlib_filter.c,v 1.17 2008/01/09 06:42:56 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -335,7 +335,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Invalid parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/zlib_filter_inflate2.phpt?view=markuprev=1.1
Index: php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
+++ php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
--TEST--
zlib.inflate of gzip-encoded stream
--SKIPIF--
?php if (!extension_loaded(zlib)) print skip; ?
--FILE--
?php /* $Id: zlib_filter_inflate2.phpt,v 1.1 2008/01/09 06:42:56 cellog Exp $ 
*/

$a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w');
fwrite($a, This is quite the thing ain't it\n);
fclose($a);

$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ);
echo fread($fp, 2000);
fclose($fp);
echo 1\n;
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
// zlib format
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+16));
echo 2\n;
echo fread($fp, 2000);
fclose($fp);
// auto-detect
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+32));
echo 3\n;
echo fread($fp, 2000);
fclose($fp);

?
--CLEAN--
?php
@unlink(dirname(__FILE__) . '/test.txt.gz');
?
--EXPECT--
1
2
This is quite the thing ain't it
3
This is quite the thing ain't it

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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/zlib zlib_filter.c /ext/zlib/tests zlib_filter_inflate2.phpt

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 06:45:15 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/zlib/tests zlib_filter_inflate2.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/zlib   zlib_filter.c 
  Log:
  fix Bug #43793: zlib filter is unable to auto-detect gzip/zlib file headers
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1048r2=1.2027.2.547.2.1049diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1048 php-src/NEWS:1.2027.2.547.2.1049
--- php-src/NEWS:1.2027.2.547.2.1048Tue Jan  8 19:10:16 2008
+++ php-src/NEWSWed Jan  9 06:45:15 2008
@@ -5,6 +5,8 @@
 - Fixed a safe_mode bypass in cURL identified by Maksymilian Arciemowicz.
   (Ilia)
 
+- Fixed bug #43793 (zlib filter is unable to auto-detect gzip/zlib file 
headers).
+  (Greg)
 - Fixed bug #43663 (Extending PDO class with a __call() function doesn't 
work). 
   (David Soria Parra)
 - Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.5r2=1.6.2.2.2.6diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.5 
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.6
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.5  Mon Dec 31 07:20:14 2007
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 06:45:15 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.6.2.2.2.5 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.6 2008/01/09 06:45:15 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -323,7 +323,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Invalid parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/zlib_filter_inflate2.phpt?view=markuprev=1.1
Index: php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
+++ php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
--TEST--
zlib.inflate of gzip-encoded stream
--SKIPIF--
?php if (!extension_loaded(zlib)) print skip; ?
--FILE--
?php /* $Id: zlib_filter_inflate2.phpt,v 1.1 2008/01/09 06:42:56 cellog Exp $ 
*/

$a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w');
fwrite($a, This is quite the thing ain't it\n);
fclose($a);

$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ);
echo fread($fp, 2000);
fclose($fp);
echo 1\n;
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
// zlib format
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+16));
echo 2\n;
echo fread($fp, 2000);
fclose($fp);
// auto-detect
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+32));
echo 3\n;
echo fread($fp, 2000);
fclose($fp);

?
--CLEAN--
?php
@unlink(dirname(__FILE__) . '/test.txt.gz');
?
--EXPECT--
1
2
This is quite the thing ain't it
3
This is quite the thing ain't it

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zlib zlib_filter.c /ext/zlib/tests zlib_filter_inflate2.phpt

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 06:45:36 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/zlib/tests zlib_filter_inflate2.phpt 

  Modified files:  
/php-src/ext/zlib   zlib_filter.c 
  Log:
  fix Bug #43793: zlib filter is unable to auto-detect gzip/zlib file headers
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.4.2.1r2=1.6.2.2.2.4.2.2diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.1 
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.2
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.1  Mon Dec 31 07:17:17 2007
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 06:45:36 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.1 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.2 2008/01/09 06:45:36 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -323,7 +323,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  -MAX_WBITS || 
Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL TSRMLS_CC, 
E_WARNING, Invalid parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/zlib_filter_inflate2.phpt?view=markuprev=1.1
Index: php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
+++ php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
--TEST--
zlib.inflate of gzip-encoded stream
--SKIPIF--
?php if (!extension_loaded(zlib)) print skip; ?
--FILE--
?php /* $Id: zlib_filter_inflate2.phpt,v 1.1 2008/01/09 06:42:56 cellog Exp $ 
*/

$a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w');
fwrite($a, This is quite the thing ain't it\n);
fclose($a);

$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ);
echo fread($fp, 2000);
fclose($fp);
echo 1\n;
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
// zlib format
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+16));
echo 2\n;
echo fread($fp, 2000);
fclose($fp);
// auto-detect
$fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ, array('window' = 
15+32));
echo 3\n;
echo fread($fp, 2000);
fclose($fp);

?
--CLEAN--
?php
@unlink(dirname(__FILE__) . '/test.txt.gz');
?
--EXPECT--
1
2
This is quite the thing ain't it
3
This is quite the thing ain't it

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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zlib zlib_filter.c

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 07:03:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/zlib   zlib_filter.c 
  Log:
  apply same fix of bug #43793 to zlib.deflate
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.4.2.2r2=1.6.2.2.2.4.2.3diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.2 
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.3
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.2  Wed Jan  9 06:45:36 2008
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 07:03:28 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.2 2008/01/09 06:45:36 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.3 2008/01/09 07:03:28 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -367,7 +367,7 @@
/* log-2 base of history window 
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Invalid parameter give for window size. (%ld), 
Z_LVAL_PP(tmpzval));
} else {
windowBits = 
Z_LVAL_PP(tmpzval);

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib zlib_filter.c

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 07:03:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/zlib   zlib_filter.c 
  Log:
  apply same fix of bug #43793 to zlib.deflate
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.6r2=1.6.2.2.2.7diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.6 
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.7
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.6  Wed Jan  9 06:45:15 2008
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 07:03:41 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.6.2.2.2.6 2008/01/09 06:45:15 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.7 2008/01/09 07:03:41 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -367,7 +367,7 @@
/* log-2 base of history window 
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Invalid parameter give for window size. (%ld), 
Z_LVAL_PP(tmpzval));
} else {
windowBits = 
Z_LVAL_PP(tmpzval);

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

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

2008-01-08 Thread Greg Beaver 
cellog  Wed Jan  9 07:03:49 2008 UTC

  Modified files:  
/php-src/ext/zlib   zlib_filter.c 
  Log:
  apply same fix of bug #43793 to zlib.deflate
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.17 php-src/ext/zlib/zlib_filter.c:1.18
--- php-src/ext/zlib/zlib_filter.c:1.17 Wed Jan  9 06:42:56 2008
+++ php-src/ext/zlib/zlib_filter.c  Wed Jan  9 07:03:48 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: zlib_filter.c,v 1.17 2008/01/09 06:42:56 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.18 2008/01/09 07:03:48 cellog Exp $ */
 
 #include php.h
 #include php_zlib.h
@@ -379,7 +379,7 @@
/* log-2 base of history window 
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
-   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS) {
+   if (Z_LVAL_PP(tmpzval)  
-MAX_WBITS || Z_LVAL_PP(tmpzval)  MAX_WBITS + 32) {
php_error_docref(NULL 
TSRMLS_CC, E_WARNING, Invalid parameter give for window size. (%ld), 
Z_LVAL_PP(tmpzval));
} else {
windowBits = 
Z_LVAL_PP(tmpzval);

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