date:20060626

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests bug34276.phpt bug35342.phpt dom002.phpt /ext/iconv/tests bug37176.phpt /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Tue Jun 27 00:09:43 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/dom/tests  bug34276.phpt bug35342.phpt dom002.phpt 
/php-src/ext/iconv/testsbug37176.phpt 
/php-src/ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt 
mb_send_mail03.phpt mb_send_mail04.phpt 
mb_send_mail05.phpt mb_send_mail06.phpt 
mb_send_mail07.phpt 
/php-src/ext/mcrypt/tests   bug37595.phpt 
/php-src/ext/mysql/testsskipif.inc 
/php-src/ext/simplexml/testsbug35785.phpt bug36611.phpt 
bug37565.phpt profile12.phpt 
profile13.phpt 
/php-src/ext/spl/tests  array_021.phpt array_022.phpt bug36941.phpt 
bug37457.phpt 
/php-src/ext/wddx/tests bug37569.phpt bug37587.phpt 
/php-src/ext/xmlreader/testsbug36743.phpt 
/php-src/ext/xmlrpc/tests   bug37057.phpt 
  Log:
  MFH: fix/add SKIPIF
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/dom/tests/bug34276.phpt
diff -u php-src/ext/dom/tests/bug34276.phpt:1.1.2.2 
php-src/ext/dom/tests/bug34276.phpt:1.1.2.2.2.1
--- php-src/ext/dom/tests/bug34276.phpt:1.1.2.2 Sun Aug 28 16:23:25 2005
+++ php-src/ext/dom/tests/bug34276.phpt Tue Jun 27 00:09:43 2006
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 34276: setAttributeNS and default namespace
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug35342.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/dom/tests/bug35342.phpt
diff -u php-src/ext/dom/tests/bug35342.phpt:1.1.2.2 
php-src/ext/dom/tests/bug35342.phpt:1.1.2.2.2.1
--- php-src/ext/dom/tests/bug35342.phpt:1.1.2.2 Wed Nov 23 03:12:47 2005
+++ php-src/ext/dom/tests/bug35342.phpt Tue Jun 27 00:09:43 2006
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 35342: isset(DOMNodeList->length) returns false
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/dom/tests/dom002.phpt
diff -u php-src/ext/dom/tests/dom002.phpt:1.1 
php-src/ext/dom/tests/dom002.phpt:1.1.6.1
--- php-src/ext/dom/tests/dom002.phpt:1.1   Tue Oct 21 02:43:24 2003
+++ php-src/ext/dom/tests/dom002.phpt   Tue Jun 27 00:09:43 2006
@@ -1,7 +1,7 @@
 --TEST--
 Test 2: getElementsByTagName() / getElementsByTagNameNS()
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37176.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/iconv/tests/bug37176.phpt
diff -u php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2 
php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2.2.1
--- php-src/ext/iconv/tests/bug37176.phpt:1.1.2.2   Thu Apr 27 00:50:54 2006
+++ php-src/ext/iconv/tests/bug37176.phpt   Tue Jun 27 00:09:43 2006
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
+--SKIPIF--
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail01.phpt?r1=1.6&r2=1.6.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail01.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6 
php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6.6.1
--- php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6  Fri Sep 26 11:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail01.phpt  Tue Jun 27 00:09:43 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 1 (lang=neutral)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail02.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail02.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5.6.1
--- php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail02.phpt  Tue Jun 27 00:09:43 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 2 (lang=Japanese)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail03.phpt?r1=1.6&r2=1.6.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail03.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6 
php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6.6.1
--- php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail03.phpt  Tue Jun 27 00:09:43 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 3 (lang=English)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail04.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail04.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5.6.1
--- php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mai

[PHP-CVS] cvs: php-src /ext/dom/tests bug34276.phpt bug35342.phpt dom002.phpt /ext/iconv/tests bug37176.phpt /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_m

2006-06-26 Thread Hannes Magnusson

bjori   Tue Jun 27 00:09:24 2006 UTC

  Modified files:  
/php-src/ext/dom/tests  bug34276.phpt bug35342.phpt dom002.phpt 
/php-src/ext/iconv/testsbug37176.phpt 
/php-src/ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt 
mb_send_mail03.phpt mb_send_mail04.phpt 
mb_send_mail05.phpt mb_send_mail06.phpt 
mb_send_mail07.phpt 
/php-src/ext/mysql/testsskipif.inc 
/php-src/ext/simplexml/testsbug35785.phpt bug36611.phpt 
bug37565.phpt profile12.phpt 
profile13.phpt 
/php-src/ext/spl/tests  array_021.phpt array_022.phpt bug36941.phpt 
bug37457.phpt 
/php-src/ext/wddx/tests bug37569.phpt bug37587.phpt 
/php-src/ext/xmlreader/testsbug36743.phpt 
/php-src/ext/xmlrpc/tests   bug37057.phpt 
  Log:
  Fix/add SKIPIF
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/bug34276.phpt
diff -u php-src/ext/dom/tests/bug34276.phpt:1.1 
php-src/ext/dom/tests/bug34276.phpt:1.2
--- php-src/ext/dom/tests/bug34276.phpt:1.1 Sun Aug 28 16:22:03 2005
+++ php-src/ext/dom/tests/bug34276.phpt Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 34276: setAttributeNS and default namespace
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug35342.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/bug35342.phpt
diff -u php-src/ext/dom/tests/bug35342.phpt:1.1 
php-src/ext/dom/tests/bug35342.phpt:1.2
--- php-src/ext/dom/tests/bug35342.phpt:1.1 Wed Nov 23 03:10:45 2005
+++ php-src/ext/dom/tests/bug35342.phpt Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
 --TEST--
 Bug # 35342: isset(DOMNodeList->length) returns false
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/dom/tests/dom002.phpt
diff -u php-src/ext/dom/tests/dom002.phpt:1.2 
php-src/ext/dom/tests/dom002.phpt:1.3
--- php-src/ext/dom/tests/dom002.phpt:1.2   Tue Jan 17 12:18:52 2006
+++ php-src/ext/dom/tests/dom002.phpt   Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
 --TEST--
 Test 2: getElementsByTagName() / getElementsByTagNameNS()
 --SKIPIF--
-
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37176.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/iconv/tests/bug37176.phpt
diff -u php-src/ext/iconv/tests/bug37176.phpt:1.1 
php-src/ext/iconv/tests/bug37176.phpt:1.2
--- php-src/ext/iconv/tests/bug37176.phpt:1.1   Thu Apr 27 00:49:17 2006
+++ php-src/ext/iconv/tests/bug37176.phpt   Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
+--SKIPIF--
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail01.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail01.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6 
php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6  Fri Sep 26 11:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail01.phpt  Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 1 (lang=neutral)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail02.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail02.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.6
--- php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail02.phpt  Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 2 (lang=Japanese)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail03.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail03.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6 
php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail03.phpt  Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 3 (lang=English)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail04.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail04.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.6
--- php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5  Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail04.phpt  Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
 mb_send_mail() test 4 (lang=German)
 --SKIPIF--
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail05.phpt?r1=1.6

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre/tests locales.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 23:43:00 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pcre/tests locales.phpt 
  Log:
  MFH: fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/pcre/tests/locales.phpt
diff -u php-src/ext/pcre/tests/locales.phpt:1.1.2.2 
php-src/ext/pcre/tests/locales.phpt:1.1.2.3
--- php-src/ext/pcre/tests/locales.phpt:1.1.2.2 Wed Jun 14 17:37:53 2006
+++ php-src/ext/pcre/tests/locales.phpt Mon Jun 26 23:42:59 2006
@@ -11,7 +11,7 @@
 setlocale(LC_ALL, 'C', 'POSIX');
 var_dump(preg_match('/^\w{6}$/', 'aàáçéè'));
 
-setlocale(LC_ALL, 'pt_PT', 'pt', 'portuguese');
+setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese');
 var_dump(preg_match('/^\w{6}$/', 'aàáçéè'));
 
 setlocale(LC_ALL, 'C', 'POSIX');

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

[PHP-CVS] cvs: php-src /ext/pcre/tests locales.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 23:42:43 2006 UTC

  Modified files:  
/php-src/ext/pcre/tests locales.phpt 
  Log:
  Fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/pcre/tests/locales.phpt
diff -u php-src/ext/pcre/tests/locales.phpt:1.3 
php-src/ext/pcre/tests/locales.phpt:1.4
--- php-src/ext/pcre/tests/locales.phpt:1.3 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/locales.phpt Mon Jun 26 23:42:43 2006
@@ -13,7 +13,7 @@
 setlocale(LC_ALL, 'C', 'POSIX');
 var_dump(preg_match('/^\w{6}$/', 'aàáçéè'));
 
-setlocale(LC_ALL, 'pt_PT', 'pt', 'portuguese');
+setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese');
 var_dump(preg_match('/^\w{6}$/', 'aàáçéè'));
 
 setlocale(LC_ALL, 'C', 'POSIX');

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

[PHP-CVS] cvs: php-src /ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 007.phpt

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 23:41:51 2006 UTC

  Modified files:  
/php-src/ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 
007.phpt 
  Log:
  add new tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zlib/tests/004.phpt
diff -u /dev/null php-src/ext/zlib/tests/004.phpt:1.2
--- /dev/null   Mon Jun 26 23:41:51 2006
+++ php-src/ext/zlib/tests/004.phpt Mon Jun 26 23:41:51 2006
@@ -0,0 +1,87 @@
+--TEST--
+gzfile() with various invalid params
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file 
or directory in %s on line %d
+bool(false)
+
+Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
+NULL
+array(6) {
+  [0]=>
+  string(36) "When you're taught through feelings
+"
+  [1]=>
+  string(26) "Destiny flying high above
+"
+  [2]=>
+  string(38) "all I know is that you can realize it
+"
+  [3]=>
+  string(18) "Destiny who cares
+"
+  [4]=>
+  string(19) "as it turns around
+"
+  [5]=>
+  string(39) "and I know that it descends down on me
+"
+}
+array(6) {
+  [0]=>
+  string(36) "When you're taught through feelings
+"
+  [1]=>
+  string(26) "Destiny flying high above
+"
+  [2]=>
+  string(38) "all I know is that you can realize it
+"
+  [3]=>
+  string(18) "Destiny who cares
+"
+  [4]=>
+  string(19) "as it turns around
+"
+  [5]=>
+  string(39) "and I know that it descends down on me
+"
+}
+array(6) {
+  [0]=>
+  string(36) "When you're taught through feelings
+"
+  [1]=>
+  string(26) "Destiny flying high above
+"
+  [2]=>
+  string(38) "all I know is that you can realize it
+"
+  [3]=>
+  string(18) "Destiny who cares
+"
+  [4]=>
+  string(19) "as it turns around
+"
+  [5]=>
+  string(39) "and I know that it descends down on me
+"
+}
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/004.txt.gz?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zlib/tests/004.txt.gz
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zlib/tests/005.phpt
diff -u /dev/null php-src/ext/zlib/tests/005.phpt:1.2
--- /dev/null   Mon Jun 26 23:41:51 2006
+++ php-src/ext/zlib/tests/005.phpt Mon Jun 26 23:41:51 2006
@@ -0,0 +1,72 @@
+--TEST--
+gzcompress()/gzuncompress() and invalid params 
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+
+Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on 
line %d
+bool(false)
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+
+Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: gzuncompress(): data error in %s on line %d
+bool(false)
+
+Warning: gzuncompress(): length (-1) must be greater or equal zero in %s on 
line %d
+bool(false)
+
+Warning: gzuncompress(): data error in %s on line %d
+bool(false)
+
+Warning: gzuncompress(): data error in %s on line %d
+bool(false)
+string(94) "Answer me, it can't be so hard
+Cry to relieve what's in your heart
+Desolation, grief and agony"
+string(94) "Answer me, it can't be so hard
+Cry to relieve what's in your heart
+Desolation, grief and agony"
+
+Warning: gzuncompress(): data error in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zlib/tests/006.phpt
diff -u /dev/null php-src/ext/zlib/tests/006.phpt:1.2
--- /dev/null   Mon Jun 26 23:41:51 2006
+++ php-src/ext/zlib/tests/006.phpt Mon Jun 26 23:41:51 2006
@@ -0,0 +1,73 @@
+--TEST--
+gzdeflate()/gzinflate() and invalid params 
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+
+Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on 
line %d
+bool(false)
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+string(%d) "%s"
+
+Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+bool(false)
+
+Warning: gzinflate(): data error in %s on line %d
+bool(false)
+
+Warning: gzinflate(): length (-1) must be greater or equal zero in %s on line 
%d
+bool(false)
+
+Warning: gzinflate(): data error in %s on line %d
+bool(false)
+
+Warning: gzinflate(): data error in %s on line %d
+bool(false)
+string(94) "Answer me, it can't be so hard
+Cry to relieve what's in your heart
+Desolation, grief and agony"
+string(94) "Answer me, it can't be so hard
+Cry to relieve what's in your heart
+Desolation, grief and agony"
+
+Warning: gzinflate(): data error in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/007.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zlib/tests/007.phpt
diff -u /dev/null php-s

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 007.phpt

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 23:35:22 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 
007.phpt 
  Log:
  add new tests
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/004.phpt?view=markup&rev=1.1
Index: php-src/ext/zlib/tests/004.phpt
+++ php-src/ext/zlib/tests/004.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/004.txt.gz?view=markup&rev=1.1
Index: php-src/ext/zlib/tests/004.txt.gz
+++ php-src/ext/zlib/tests/004.txt.gz

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/005.phpt?view=markup&rev=1.1
Index: php-src/ext/zlib/tests/005.phpt
+++ php-src/ext/zlib/tests/005.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/006.phpt?view=markup&rev=1.1
Index: php-src/ext/zlib/tests/006.phpt
+++ php-src/ext/zlib/tests/006.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/007.phpt?view=markup&rev=1.1
Index: php-src/ext/zlib/tests/007.phpt
+++ php-src/ext/zlib/tests/007.phpt

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

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 23:22:58 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/zlib   zlib.c 
  Log:
  MFH: zero-terminate strings produced with FORCE_DEFLATE
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.2&r2=1.183.2.6.2.3&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.2 
php-src/ext/zlib/zlib.c:1.183.2.6.2.3
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.2   Mon Jun 26 22:53:10 2006
+++ php-src/ext/zlib/zlib.c Mon Jun 26 23:22:58 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.2 2006/06/26 22:53:10 tony2001 Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.3 2006/06/26 23:22:58 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -820,6 +820,8 @@
trailer[6] = (char) (stream.total_in >> 16) & 0xFF;
trailer[7] = (char) (stream.total_in >> 24) & 0xFF;
trailer[8] = '\0';
+   } else {
+   s2[stream.total_out + GZIP_HEADER_LENGTH + (coding == 
CODING_GZIP ? GZIP_FOOTER_LENGTH : 0)] = '\0'; 
}
RETURN_STRINGL(s2, stream.total_out + GZIP_HEADER_LENGTH + 
(coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0), 0);
} else {

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

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 23:22:45 2006 UTC

  Modified files:  
/php-src/ext/zlib   zlib.c 
  Log:
  zero-terminate strings produced with FORCE_DEFLATE
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.199&r2=1.200&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.199 php-src/ext/zlib/zlib.c:1.200
--- php-src/ext/zlib/zlib.c:1.199   Mon Jun 26 22:53:42 2006
+++ php-src/ext/zlib/zlib.c Mon Jun 26 23:22:45 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.199 2006/06/26 22:53:42 tony2001 Exp $ */
+/* $Id: zlib.c,v 1.200 2006/06/26 23:22:45 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -817,6 +817,8 @@
trailer[6] = (char) (stream.total_in >> 16) & 0xFF;
trailer[7] = (char) (stream.total_in >> 24) & 0xFF;
trailer[8] = '\0';
+   } else {
+   s2[stream.total_out + GZIP_HEADER_LENGTH + (coding == 
CODING_GZIP ? GZIP_FOOTER_LENGTH : 0)] = '\0';
}
RETURN_STRINGL(s2, stream.total_out + GZIP_HEADER_LENGTH + 
(coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0), 0);
} else {

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

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 22:53:10 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/zlib   zlib.c 
  Log:
  don't try to inflate empty strings (and stop segfaulting!)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.1&r2=1.183.2.6.2.2&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.1 
php-src/ext/zlib/zlib.c:1.183.2.6.2.2
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.1   Thu Jun 15 18:33:09 2006
+++ php-src/ext/zlib/zlib.c Mon Jun 26 22:53:10 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.183.2.6.2.1 2006/06/15 18:33:09 dmitry Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.2 2006/06/26 22:53:10 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -531,6 +531,10 @@
return;
}
 
+   if (!data_len) {
+   RETURN_FALSE;
+   }
+
if (limit < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "length (%ld) must 
be greater or equal zero", limit);
RETURN_FALSE;

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

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 22:47:32 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   basic_functions.c 
  Log:
  nuke obsolete arginfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.9&r2=1.725.2.31.2.10&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.9 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.10
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.9   Mon Jun 26 
22:41:22 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 22:47:31 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.9 2006/06/26 22:41:22 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.10 2006/06/26 22:47:31 bjori Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -109,45 +109,6 @@
 
 static zend_class_entry *incomplete_class_entry = NULL;
 
-static
-   ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO(second_and_third_args_force_ref, 0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_END_ARG_INFO()
-
-static 
-   ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(0)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO(first_through_third_args_force_ref, 0)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_ARG_PASS_INFO(1)
-   ZEND_END_ARG_INFO()
-
-static
-   ZEND_BEGIN_ARG_INFO(all_args_prefer_ref, ZEND_SEND_PREFER_REF)
-   ZEND_END_ARG_INFO()
-
 typedef struct _php_shutdown_function_entry {
zval **arguments;
int arg_count;

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

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 22:53:42 2006 UTC

  Modified files:  
/php-src/ext/zlib   zlib.c 
  Log:
  MFB: don't try to inflate empty strings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.198&r2=1.199&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.198 php-src/ext/zlib/zlib.c:1.199
--- php-src/ext/zlib/zlib.c:1.198   Tue Jun 13 13:12:20 2006
+++ php-src/ext/zlib/zlib.c Mon Jun 26 22:53:42 2006
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: zlib.c,v 1.198 2006/06/13 13:12:20 dmitry Exp $ */
+/* $Id: zlib.c,v 1.199 2006/06/26 22:53:42 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -528,6 +528,10 @@
return;
}
 
+   if (!data_len) {
+   RETURN_FALSE;
+   }
+
if (limit < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "length (%ld) must 
be greater or equal zero", limit);
RETURN_FALSE;

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

[PHP-CVS] cvs: php-src /ext/bz2/tests 001.phpt 002.phpt 003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 004_2.txt.bz2 005.phpt

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 22:20:55 2006 UTC

  Modified files:  
/php-src/ext/bz2/tests  003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 
004_2.txt.bz2 005.phpt 001.phpt 002.phpt 
  Log:
  add new tests, improve the old ones
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/003.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/003.phpt
diff -u /dev/null php-src/ext/bz2/tests/003.phpt:1.2
--- /dev/null   Mon Jun 26 22:20:55 2006
+++ php-src/ext/bz2/tests/003.phpt  Mon Jun 26 22:20:55 2006
@@ -0,0 +1,40 @@
+--TEST--
+bzread() tests
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: bzread() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+string(0) ""
+
+Warning: bzread(): length may not be negative in %s on line %d
+bool(false)
+string(1) "R"
+string(2) "is"
+string(251) "ing up from the heart of the desert
+Rising up for Jerusalem
+Rising up from the heat of the desert
+Building up Old Jerusalem
+Rising up from the heart of the desert
+Rising up for Jerusalem
+Rising up from the heat of the desert
+Heading out for Jerusalem
+"
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/003.txt.bz2?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/003.txt.bz2
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/004.phpt
diff -u /dev/null php-src/ext/bz2/tests/004.phpt:1.2
--- /dev/null   Mon Jun 26 22:20:55 2006
+++ php-src/ext/bz2/tests/004.phpt  Mon Jun 26 22:20:55 2006
@@ -0,0 +1,177 @@
+--TEST--
+bzread() tests with invalid files
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+array(2) {
+  ["errno"]=>
+  int(0)
+  ["errstr"]=>
+  string(2) "OK"
+}
+string(2) "OK"
+int(0)
+array(2) {
+  ["errno"]=>
+  int(0)
+  ["errstr"]=>
+  string(2) "OK"
+}
+string(2) "OK"
+int(0)
+string(0) ""
+array(2) {
+  ["errno"]=>
+  int(-5)
+  ["errstr"]=>
+  string(16) "DATA_ERROR_MAGIC"
+}
+string(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+  ["errno"]=>
+  int(-4)
+  ["errstr"]=>
+  string(10) "DATA_ERROR"
+}
+string(10) "DATA_ERROR"
+int(-4)
+string(0) ""
+array(2) {
+  ["errno"]=>
+  int(-5)
+  ["errstr"]=>
+  string(16) "DATA_ERROR_MAGIC"
+}
+string(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+  ["errno"]=>
+  int(-4)
+  ["errstr"]=>
+  string(10) "DATA_ERROR"
+}
+string(10) "DATA_ERROR"
+int(-4)
+
+Warning: bzread(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerror(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrstr(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrno(): %d is not a valid stream resource in %s on line %d
+bool(false)
+Done
+--UEXPECTF--
+array(2) {
+  [u"errno"]=>
+  int(0)
+  [u"errstr"]=>
+  string(2) "OK"
+}
+string(2) "OK"
+int(0)
+array(2) {
+  [u"errno"]=>
+  int(0)
+  [u"errstr"]=>
+  string(2) "OK"
+}
+string(2) "OK"
+int(0)
+string(0) ""
+array(2) {
+  [u"errno"]=>
+  int(-5)
+  [u"errstr"]=>
+  string(16) "DATA_ERROR_MAGIC"
+}
+string(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+  [u"errno"]=>
+  int(-4)
+  [u"errstr"]=>
+  string(10) "DATA_ERROR"
+}
+string(10) "DATA_ERROR"
+int(-4)
+string(0) ""
+array(2) {
+  [u"errno"]=>
+  int(-5)
+  [u"errstr"]=>
+  string(16) "DATA_ERROR_MAGIC"
+}
+string(16) "DATA_ERROR_MAGIC"
+int(-5)
+string(0) ""
+array(2) {
+  [u"errno"]=>
+  int(-4)
+  [u"errstr"]=>
+  string(10) "DATA_ERROR"
+}
+string(10) "DATA_ERROR"
+int(-4)
+
+Warning: bzread(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerror(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrstr(): %d is not a valid stream resource in %s on line %d
+bool(false)
+
+Warning: bzerrno(): %d is not a valid stream resource in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004_1.txt.bz2?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/004_1.txt.bz2
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004_2.txt.bz2?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/004_2.txt.bz2
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/005.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/bz2/tests/005.phpt
diff -u /dev/null php-src/ext/bz2/tests/005.phpt:1.2
--- /dev/null   Mon Jun 26 22:20:55 2006
+++ php-src/ext/bz2/tests/005.phpt  Mon Jun 26 22:20:55 2006
@@ -0,0 +1,71 @@
+--TEST--
+bzcompress()/bzdecompress() tests
+--SKIPIF--
+
+--FILE--
+
+--EXPECTF--
+Warning: Wrong parameter count for bzcompress() in %s on line %d
+NULL
+string(%d) "BZ%s"
+int(-2)
+int(-2)
+int(-2)
+int(-2)
+
+Warning: bzdecompress() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+Warning: bzdecompress() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+int(-5)
+int(-5)
+int

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings bug37244.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 22:20:28 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug37244.phpt 
  Log:
  MFH: test for bug #37244
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug37244.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/strings/bug37244.phpt
+++ php-src/ext/standard/tests/strings/bug37244.phpt
--TEST--
Bug #37244 (base64_decode violates RFC 3548)
--FILE--

--EXPECT--
string(93) "Implementations MUST reject the encoding if it contains characters 
outside the base alphabet."
bool(false)
string(92) 
"Implemem][ÛÈUTÕZXÝH[ÛÙ[ÈY]ÛÛZ[ÈÚ\XÝ\ÈÝ]ÚYHH\ÙH[X]"

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

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

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 22:19:04 2006 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Add arginfo for sys_getloadavg()
  iUpdate arginfo for base64_decode()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.783&r2=1.784&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.783 
php-src/ext/standard/basic_functions.c:1.784
--- php-src/ext/standard/basic_functions.c:1.783Mon Jun 26 20:28:30 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 22:19:04 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.783 2006/06/26 20:28:30 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.784 2006/06/26 22:19:04 bjori Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -932,6 +932,12 @@
ZEND_ARG_INFO(0, types)
ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO()
+
+#ifdef HAVE_GETLOADAVG
+static
+ZEND_BEGIN_ARG_INFO(arginfo_sys_getloadavg, 0)
+ZEND_END_ARG_INFO()
+#endif
 /* }}} */
 /* {{{ assert.c */
 static
@@ -952,8 +958,9 @@
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_base64_decode, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_base64_decode, 0, 0, 1)
ZEND_ARG_INFO(0, str)
+   ZEND_ARG_INFO(0, strict)
 ZEND_END_ARG_INFO()
 
 /* }}} */
@@ -3344,7 +3351,7 @@
PHP_FE(getopt,  
arginfo_getopt)
 #endif
 #ifdef HAVE_GETLOADAVG
-   PHP_FE(sys_getloadavg,  
NULL)
+   PHP_FE(sys_getloadavg,  
arginfo_sys_getloadavg)
 #endif
 #ifdef HAVE_GETTIMEOFDAY
PHP_FE(microtime,   
arginfo_microtime)

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

[PHP-CVS] cvs: php-src /ext/standard base64.c base64.h /ext/standard/tests/strings bug37244.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 22:17:43 2006 UTC

  Added files: 
/php-src/ext/standard/tests/strings bug37244.phpt 

  Modified files:  
/php-src/ext/standard   base64.c base64.h 
  Log:
  MFB: bug #37244 (base64_decode violates RFC 3548)
  -Add test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.47 php-src/ext/standard/base64.c:1.48
--- php-src/ext/standard/base64.c:1.47  Sun May 21 13:25:16 2006
+++ php-src/ext/standard/base64.c   Mon Jun 26 22:17:42 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>  
|
+--+
  */
-/* $Id: base64.c,v 1.47 2006/05/21 13:25:16 helly Exp $ */
+/* $Id: base64.c,v 1.48 2006/06/26 22:17:42 bjori Exp $ */
 
 #include 
 
@@ -34,22 +34,22 @@
 static const char base64_pad = '=';
 
 static const short base64_reverse_table[256] = {
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-   52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-   -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-   15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-   -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-   41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -2, -2, -1, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, 62, -2, -2, -2, 63,
+   52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -2, -2, -2, -2, -2, -2,
+   -2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+   15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -2, -2, -2, -2, -2,
+   -2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+   41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+   -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2
 };
 /* }}} */
 
@@ -135,9 +135,14 @@
 */
 /* }}} */
 
+PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, 
int *ret_length)
+{
+   return php_base64_decode_ex(str, length, ret_length, 0);
+}
+
 /* {{{ php_base64_decode */
 /* as above, but backwards. :) */
-PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, 
int *ret_length)
+PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int 
length, int *ret_length, zend_bool strict)
 {
const unsigned char *current = str;
int ch, i = 0, j = 0, k;
@@ -145,13 +150,18 @@
unsigned char *result;

result = (unsigned char *)safe_emalloc(length, 1, 1);
-
+   
/* run through the whole string, converting as we go */
while ((ch = *current++) != '\0' && length-- > 0) {
if (ch == base64_pad) break;
 
ch = base64_reverse_table[ch];
-   if (ch < 0) continue;
+   if ((!strict && ch < 0) || ch == -1) { /* a space or some other 
separator character, we simply skip over */
+   continue;
+   } else if (ch == -2) {
+   efree(result);
+   return NULL;
+   }
 
switch(i % 4) {
case 0:
@@ -214,18 +224,19 @@
 /* }}} */
 
 
-/* {{{ proto string base64_decode(string str)
+/* {{{ proto string base64_decode(string str[, bool strict])
Decodes string using MIME base64 algorithm */
 PHP_FUNCTION(base64_decode)
 {
char *str;
unsigned char *result;
+   zend_bool strict = 0;

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/bz2/tests 001.phpt 002.phpt 003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 004_2.txt.bz2 005.phpt

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 22:17:18 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/bz2/tests  003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 
004_2.txt.bz2 005.phpt 

  Modified files:  
/php-src/ext/bz2/tests  001.phpt 002.phpt 
  Log:
  add new tests, improve the old ones
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/bz2/tests/001.phpt
diff -u php-src/ext/bz2/tests/001.phpt:1.1.2.2 
php-src/ext/bz2/tests/001.phpt:1.1.2.3
--- php-src/ext/bz2/tests/001.phpt:1.1.2.2  Wed Jun 21 14:38:28 2006
+++ php-src/ext/bz2/tests/001.phpt  Mon Jun 26 22:17:18 2006
@@ -1,5 +1,7 @@
 --TEST--
 bzopen() and invalid parameters
+--SKIPIF--
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/002.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/bz2/tests/002.phpt
diff -u php-src/ext/bz2/tests/002.phpt:1.1.2.2 
php-src/ext/bz2/tests/002.phpt:1.1.2.3
--- php-src/ext/bz2/tests/002.phpt:1.1.2.2  Wed Jun 21 14:38:28 2006
+++ php-src/ext/bz2/tests/002.phpt  Mon Jun 26 22:17:18 2006
@@ -1,5 +1,7 @@
 --TEST--
 bzopen() using fd opened in wrong mode
+--SKIPIF--
+
 --FILE--
 http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/003.phpt?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/003.phpt
+++ php-src/ext/bz2/tests/003.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/003.txt.bz2?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/003.txt.bz2
+++ php-src/ext/bz2/tests/003.txt.bz2

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004.phpt?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/004.phpt
+++ php-src/ext/bz2/tests/004.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004_1.txt.bz2?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/004_1.txt.bz2
+++ php-src/ext/bz2/tests/004_1.txt.bz2

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/004_2.txt.bz2?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/004_2.txt.bz2
+++ php-src/ext/bz2/tests/004_2.txt.bz2

http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/tests/005.phpt?view=markup&rev=1.1
Index: php-src/ext/bz2/tests/005.phpt
+++ php-src/ext/bz2/tests/005.phpt

-- 
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/bz2 bz2.c

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 21:13:46 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/bz2bz2.c 
  Log:
  MFH: detect empty mode string and avoid off-by-one
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.14.2.3.2.4&r2=1.14.2.3.2.5&diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.14.2.3.2.4 php-src/ext/bz2/bz2.c:1.14.2.3.2.5
--- php-src/ext/bz2/bz2.c:1.14.2.3.2.4  Wed Jun 21 14:38:28 2006
+++ php-src/ext/bz2/bz2.c   Mon Jun 26 21:13:46 2006
@@ -16,7 +16,7 @@
   +--+
 */
  
-/* $Id: bz2.c,v 1.14.2.3.2.4 2006/06/21 14:38:28 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.14.2.3.2.5 2006/06/26 21:13:46 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -205,7 +205,7 @@
if (strncasecmp("compress.bzip2://", path, 17) == 0) {
path += 17;
}
-   if (mode[0] != 'w' && mode[0] != 'r' && mode[1] != '\0') {
+   if (mode[0] == '\0' || (mode[0] != 'w' && mode[0] != 'r' && mode[1] != 
'\0')) {
return NULL;
}
 

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

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

2006-06-26 Thread Antony Dovgal

tony2001Mon Jun 26 21:13:22 2006 UTC

  Modified files:  
/php-src/ext/bz2bz2.c 
  Log:
  detect empty mode string and avoid off-by-one
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.23 php-src/ext/bz2/bz2.c:1.24
--- php-src/ext/bz2/bz2.c:1.23  Wed Jun 21 14:38:06 2006
+++ php-src/ext/bz2/bz2.c   Mon Jun 26 21:13:22 2006
@@ -16,7 +16,7 @@
   +--+
 */
  
-/* $Id: bz2.c,v 1.23 2006/06/21 14:38:06 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.24 2006/06/26 21:13:22 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -205,7 +205,7 @@
if (strncasecmp("compress.bzip2://", path, 17) == 0) {
path += 17;
}
-   if (mode[0] != 'w' && mode[0] != 'r' && mode[1] != '\0') {
+   if (mode[0] == '\0' || (mode[0] != 'w' && mode[0] != 'r' && mode[1] != 
'\0')) {
return NULL;
}
 

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

[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c basic_functions.h

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 20:28:31 2006 UTC

  Modified files:  
/php-srcconfigure.in 
/php-src/ext/standard   basic_functions.c basic_functions.h 
  Log:
  MFB: sys_getloadavg()
  
  
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.604&r2=1.605&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.604 php-src/configure.in:1.605
--- php-src/configure.in:1.604  Sat Jun 17 11:14:21 2006
+++ php-src/configure.inMon Jun 26 20:28:30 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.604 2006/06/17 11:14:21 nlopess Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.605 2006/06/26 20:28:30 bjori Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -466,6 +466,7 @@
 funopen \
 gai_strerror \
 gcvt \
+getloadavg \
 getlogin \
 getprotobyname \
 getprotobynumber \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.782&r2=1.783&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.782 
php-src/ext/standard/basic_functions.c:1.783
--- php-src/ext/standard/basic_functions.c:1.782Mon Jun 26 13:10:31 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 20:28:30 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.782 2006/06/26 13:10:31 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.783 2006/06/26 20:28:30 bjori Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -3343,7 +3343,9 @@
 #ifdef HAVE_GETOPT
PHP_FE(getopt,  
arginfo_getopt)
 #endif
-
+#ifdef HAVE_GETLOADAVG
+   PHP_FE(sys_getloadavg,  
NULL)
+#endif
 #ifdef HAVE_GETTIMEOFDAY
PHP_FE(microtime,   
arginfo_microtime)
PHP_FE(gettimeofday,
arginfo_gettimeofday)
@@ -6199,6 +6201,23 @@
 }
 /* }}} */
 
+#ifdef HAVE_GETLOADAVG
+PHP_FUNCTION(sys_getloadavg)
+{
+   double load[3];
+
+   if (getloadavg(load, 3) == -1) {
+   RETURN_FALSE;
+   } else {
+   array_init(return_value);
+   add_index_double(return_value, 0, load[0]);
+   add_index_double(return_value, 1, load[1]);
+   add_index_double(return_value, 2, load[2]);
+   }
+}
+#endif
+
+
 /*
  * Local variables:
  * tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.145 
php-src/ext/standard/basic_functions.h:1.146
--- php-src/ext/standard/basic_functions.h:1.145Wed Mar  8 14:41:45 2006
+++ php-src/ext/standard/basic_functions.h  Mon Jun 26 20:28:30 2006
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: basic_functions.h,v 1.145 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.146 2006/06/26 20:28:30 bjori Exp $ */
 
 #ifndef BASIC_FUNCTIONS_H
 #define BASIC_FUNCTIONS_H
@@ -116,6 +116,9 @@
 
 PHP_FUNCTION(register_tick_function);
 PHP_FUNCTION(unregister_tick_function);
+#ifdef HAVE_GETLOADAVG
+PHP_FUNCTION(sys_getloadavg);
+#endif
 
 PHP_FUNCTION(is_uploaded_file);
 PHP_FUNCTION(move_uploaded_file);

-- 
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/standard array.c formatted_print.c levenshtein.c metaphone.c streamsfuncs.c string.c url.c uuencode.c versioning.c

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 18:48:56 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   array.c formatted_print.c levenshtein.c 
metaphone.c streamsfuncs.c string.c url.c 
uuencode.c versioning.c 
  Log:
  Updated protos & vim folding
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.1&r2=1.308.2.21.2.2&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.1 
php-src/ext/standard/array.c:1.308.2.21.2.2
--- php-src/ext/standard/array.c:1.308.2.21.2.1 Sat Jun  3 18:56:44 2006
+++ php-src/ext/standard/array.cMon Jun 26 18:48:56 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.1 2006/06/03 18:56:44 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.2 2006/06/26 18:48:56 bjori Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -224,7 +224,7 @@
return array_key_compare(a, b TSRMLS_CC) * -1;
 }
 
-/* {{{ proto bool krsort(array array_arg [, int sort_flags])
+/* {{{ proto bool krsort(array &array_arg [, int sort_flags])
Sort an array by key value in reverse order */
 PHP_FUNCTION(krsort)
 {
@@ -246,7 +246,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool ksort(array array_arg [, int sort_flags])
+/* {{{ proto bool ksort(array &array_arg [, int sort_flags])
Sort an array by key */
 PHP_FUNCTION(ksort)
 {
@@ -459,7 +459,7 @@
 }
 
 
-/* {{{ proto void natsort(array array_arg)
+/* {{{ proto void natsort(array &array_arg)
Sort an array using natural sort */
 PHP_FUNCTION(natsort)
 {
@@ -468,7 +468,7 @@
 /* }}} */
 
 
-/* {{{ proto void natcasesort(array array_arg)
+/* {{{ proto void natcasesort(array &array_arg)
Sort an array using case-insensitive natural sort */
 PHP_FUNCTION(natcasesort)
 {
@@ -477,7 +477,7 @@
 /* }}} */
 
 
-/* {{{ proto bool asort(array array_arg [, int sort_flags])
+/* {{{ proto bool asort(array &array_arg [, int sort_flags])
Sort an array and maintain index association */
 PHP_FUNCTION(asort)
 {
@@ -499,7 +499,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool arsort(array array_arg [, int sort_flags])
+/* {{{ proto bool arsort(array &array_arg [, int sort_flags])
Sort an array in reverse order and maintain index association */
 PHP_FUNCTION(arsort)
 {
@@ -521,7 +521,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool sort(array array_arg [, int sort_flags])
+/* {{{ proto bool sort(array &array_arg [, int sort_flags])
Sort an array */
 PHP_FUNCTION(sort)
 {
@@ -543,7 +543,7 @@
 }
 /* }}} */
 
-/* {{{ proto bool rsort(array array_arg [, int sort_flags])
+/* {{{ proto bool rsort(array &array_arg [, int sort_flags])
Sort an array in reverse order */
 PHP_FUNCTION(rsort)
 {
@@ -2151,7 +2151,7 @@
 /* }}} */
 
 
-/* {{{ proto array array_slice(array input, int offset [, int length])
+/* {{{ proto array array_slice(array input, int offset [, int length [, bool 
preserve_keys]])
Returns elements specified by offset and length */
 PHP_FUNCTION(array_slice)
 {
@@ -3179,6 +3179,7 @@
php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY,
INTERSECT_COMP_DATA_INTERNAL, 
INTERSECT_COMP_KEY_INTERNAL);
 }
+/* }}} */
 
 /* {{{ proto array array_intersect_ukey(array arr1, array arr2 [, array ...], 
callback key_compare_func)
Returns the entries of arr1 that have keys which are present in all the 
other arguments. Kind of equivalent to array_diff(array_keys($arr1), 
array_keys($arr2)[,array_keys(...)]). The comparison of the keys is performed 
by a user supplied function. Equivalent of array_intersect_uassoc() but does 
not do compare of the data. */
@@ -3187,7 +3188,7 @@
php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY,
INTERSECT_COMP_DATA_INTERNAL, 
INTERSECT_COMP_KEY_USER);
 }
-
+/* }}} */
 
 /* {{{ proto array array_intersect(array arr1, array arr2 [, array ...])
Returns the entries of arr1 that have values which are present in all the 
other arguments */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1&r2=1.82.2.1.2.1&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.82.2.1 
php-src/ext/standard/formatted_print.c:1.82.2.1.2.1
--- php-src/ext/standard/formatted_print.c:1.82.2.1 Sun Jan  1 12:50:14 2006
+++ php-src/ext/standard/formatted_print.c  Mon Jun 26 18:48:56 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: formatted_print.c,v 1.82.2.1 2006/01/01 12:50:14 sniper Exp $ */
+/* $Id: formatted_print.c,v 1.82.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
 
 #include   /* modf() */
 #include "php.h"
@@ -853,6 +853,7 @@
 
RETURN_LONG(len);
 }
+/* }}} */
 
 /* {{{ proto int vfprintf(resource stream, string format, arr

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard user_filters.c /ext/standard/tests/filters php_user_filter_01.phpt php_user_filter_02.phpt php_user_filter_03.phpt

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 17:23:39 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filters php_user_filter_01.phpt 
php_user_filter_02.phpt 
php_user_filter_03.phpt 

  Modified files:  
/php-src/ext/standard   user_filters.c 
  Log:
  MFH: argument info for php_user_filter
  Add tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4&r2=1.31.2.4.2.1&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4 
php-src/ext/standard/user_filters.c:1.31.2.4.2.1
--- php-src/ext/standard/user_filters.c:1.31.2.4Thu Mar 30 21:10:23 2006
+++ php-src/ext/standard/user_filters.c Mon Jun 26 17:23:38 2006
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: user_filters.c,v 1.31.2.4 2006/03/30 21:10:23 tony2001 Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.1 2006/06/26 17:23:38 bjori Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -54,11 +54,26 @@
 PHP_FUNCTION(user_filter_nop)
 {
 }
+static
+ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_filter, 0)
+   ZEND_ARG_INFO(0, in)
+   ZEND_ARG_INFO(0, out)
+   ZEND_ARG_INFO(1, consumed)
+   ZEND_ARG_INFO(0, closing)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onCreate, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onClose, 0)
+ZEND_END_ARG_INFO()
 
 static zend_function_entry user_filter_class_funcs[] = {
-   PHP_NAMED_FE(filter,PHP_FN(user_filter_nop),NULL)
-   PHP_NAMED_FE(onCreate,  PHP_FN(user_filter_nop),NULL)
-   PHP_NAMED_FE(onClose,   PHP_FN(user_filter_nop),NULL)
+   PHP_NAMED_FE(filter,PHP_FN(user_filter_nop),
arginfo_php_user_filter_filter)
+   PHP_NAMED_FE(onCreate,  PHP_FN(user_filter_nop),
arginfo_php_user_filter_onCreate)
+   PHP_NAMED_FE(onClose,   PHP_FN(user_filter_nop),
arginfo_php_user_filter_onClose)
{ NULL, NULL, NULL }
 };
 
@@ -75,11 +90,14 @@
 
 PHP_MINIT_FUNCTION(user_filters)
 {
+   zend_class_entry *php_user_filter;
/* init the filter class ancestor */
INIT_CLASS_ENTRY(user_filter_class_entry, "php_user_filter", 
user_filter_class_funcs);
-   if (NULL == zend_register_internal_class(&user_filter_class_entry 
TSRMLS_CC)) {
+   if ((php_user_filter = 
zend_register_internal_class(&user_filter_class_entry TSRMLS_CC)) == NULL) {
return FAILURE;
}
+   zend_declare_property_string(php_user_filter, "filtername", 
sizeof("filtername")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
+   zend_declare_property_string(php_user_filter, "params", 
sizeof("params")-1, "", ZEND_ACC_PUBLIC TSRMLS_CC);
 
/* init the filter resource; it has no dtor, as streams will always 
clean it up
 * at the correct time */

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_01.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/php_user_filter_01.phpt
+++ php-src/ext/standard/tests/filters/php_user_filter_01.phpt
--TEST--
class php_user_filter#1
--FILE--

--EXPECTF--
Fatal error: Declaration of bar::filter() must be compatible with that of 
php_user_filter::filter() in %s on line %d

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_02.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/php_user_filter_02.phpt
+++ php-src/ext/standard/tests/filters/php_user_filter_02.phpt
--TEST--
class php_user_filter#2
--FILE--

--EXPECTF--
Fatal error: Declaration of foo::filter() must be compatible with that of 
php_user_filter::filter() in %s on line %d

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_03.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/php_user_filter_03.phpt
+++ php-src/ext/standard/tests/filters/php_user_filter_03.phpt
--TEST--
class php_user_filter#3
--FILE--

--EXPECTF--
Fatal error: Declaration of foo::onCreate() must be compatible with that of 
php_user_filter::onCreate() in %s on line %d

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt mcrypt.c php_mcrypt.h /ext/mysql php_mysql.c /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 16:33:39 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mcrypt mcrypt.c php_mcrypt.h 
/php-src/ext/mysql  php_mysql.c 
/php-src/ext/standard   basic_functions.c streamsfuncs.c 
streamsfuncs.h 
  Log:
  MFH: use the ZEND_ACC_DEPRECATED flag rather than custom warnings
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.4&r2=1.91.2.3.2.5&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.4 
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.4Thu Jun 15 18:33:07 2006
+++ php-src/ext/mcrypt/mcrypt.c Mon Jun 26 16:33:38 2006
@@ -16,7 +16,7 @@
|  Derick Rethans <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: mcrypt.c,v 1.91.2.3.2.4 2006/06/15 18:33:07 dmitry Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.5 2006/06/26 16:33:38 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,7 +63,7 @@
PHP_FE(mcrypt_generic_init, NULL)
PHP_FE(mcrypt_generic, NULL)
PHP_FE(mdecrypt_generic, NULL)
-   PHP_FE(mcrypt_generic_end, NULL)
+   PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, NULL)
PHP_FE(mcrypt_generic_deinit, NULL)
 
PHP_FE(mcrypt_enc_self_test, NULL)
@@ -604,16 +604,6 @@
 /* }}} */
 
 
-/* {{{ proto bool mcrypt_generic_end(resource td)
-   This function terminates encrypt specified by the descriptor td */
-PHP_FUNCTION(mcrypt_generic_end)
-{
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function is 
deprecated, please use mcrypt_generic_deinit()");
-   zif_mcrypt_generic_deinit(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
-
 /* {{{ proto bool mcrypt_generic_deinit(resource td)
This function terminates encrypt specified by the descriptor td */
 PHP_FUNCTION(mcrypt_generic_deinit)
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/php_mcrypt.h?r1=1.26.2.1&r2=1.26.2.1.2.1&diff_format=u
Index: php-src/ext/mcrypt/php_mcrypt.h
diff -u php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1 
php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1.2.1
--- php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1Sun Jan  1 12:50:08 2006
+++ php-src/ext/mcrypt/php_mcrypt.h Mon Jun 26 16:33:38 2006
@@ -16,7 +16,7 @@
|  Derick Rethans <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: php_mcrypt.h,v 1.26.2.1 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: php_mcrypt.h,v 1.26.2.1.2.1 2006/06/26 16:33:38 bjori Exp $ */
 
 #ifndef PHP_MCRYPT_H
 #define PHP_MCRYPT_H
@@ -52,7 +52,6 @@
 PHP_FUNCTION(mcrypt_generic_init);
 PHP_FUNCTION(mcrypt_generic);
 PHP_FUNCTION(mdecrypt_generic);
-PHP_FUNCTION(mcrypt_generic_end);
 PHP_FUNCTION(mcrypt_generic_deinit);
 
 PHP_FUNCTION(mcrypt_enc_self_test);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.3&r2=1.213.2.6.2.4&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.3 
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.4
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.3 Thu Jun 15 18:33:07 2006
+++ php-src/ext/mysql/php_mysql.c   Mon Jun 26 16:33:39 2006
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.3 2006/06/15 18:33:07 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.4 2006/06/26 16:33:39 bjori Exp $ */
 
 /* TODO:
  *
@@ -133,15 +133,15 @@
PHP_FE(mysql_select_db, 
NULL)
 #ifndef NETWARE/* The below two functions not supported on 
NetWare */
 #if MYSQL_VERSION_ID < 4
-   PHP_FE(mysql_create_db, 
NULL)
-   PHP_FE(mysql_drop_db,   
NULL)
+   PHP_DEP_FE(mysql_create_db, 
NULL)
+   PHP_DEP_FE(mysql_drop_db,   
NULL)
 #endif
 #endif /* NETWARE */
PHP_FE(mysql_query, 
NULL)
PHP_FE(mysql_unbuffered_query,  
NULL)
PHP_FE(mysql_db_query,  
NULL)
PHP_FE(mysql_list_dbs,  
NULL)
-   PHP_FE(mysql_list_tables,   
NULL)
+   PHP_DEP_FE(mysql_list_tables,   
NULL)
PHP_FE(mysql_list_fields,   
NULL)
PHP_FE(mysql_list_processes,
NULL)
PHP_FE

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

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 15:36:45 2006 UTC

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFB: saveXML() -> asXML() alias
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.209&r2=1.210&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.209 
php-src/ext/simplexml/simplexml.c:1.210
--- php-src/ext/simplexml/simplexml.c:1.209 Tue May 23 22:22:35 2006
+++ php-src/ext/simplexml/simplexml.c   Mon Jun 26 15:36:45 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.209 2006/05/23 22:22:35 helly Exp $ */
+/* $Id: simplexml.c,v 1.210 2006/06/26 15:36:45 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -48,6 +48,7 @@
 }
 
 #define SXE_ME(func, arg_info, flags) PHP_ME(simplexml_element, func, 
arg_info, flags)
+#define SXE_MALIAS(func, alias, arg_info, flags) PHP_MALIAS(simplexml_element, 
func, alias, arg_info, flags)
 
 #define SXE_METHOD(func) PHP_METHOD(simplexml_element, func)
 
@@ -2207,6 +2208,7 @@
 static zend_function_entry sxe_functions[] = {
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* 
must be called */
SXE_ME(asXML,  NULL, ZEND_ACC_PUBLIC)
+   SXE_MALIAS(saveXML, asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath,  NULL, ZEND_ACC_PUBLIC)
SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
@@ -2262,7 +2264,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.209 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.210 $");
php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
"enabled");

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/gmp gmp.c /ext/libxml libxml.c

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 14:11:18 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c 
/php-src/ext/curl   interface.c 
/php-src/ext/gmpgmp.c 
  Log:
  MFH: Removed obsolete arginfo include
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.3&r2=1.32.2.7.2.4&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.3 
php-src/ext/libxml/libxml.c:1.32.2.7.2.4
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.3Sat Jun 17 13:06:06 2006
+++ php-src/ext/libxml/libxml.c Mon Jun 26 14:11:17 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32.2.7.2.3 2006/06/17 13:06:06 bjori Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.4 2006/06/26 14:11:17 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -68,9 +68,6 @@
 /* {{{ dynamically loadable module stuff */
 #ifdef COMPILE_DL_LIBXML
 ZEND_GET_MODULE(libxml)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif /* COMPILE_DL_LIBXML */
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.3&r2=1.62.2.14.2.4&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.3 
php-src/ext/curl/interface.c:1.62.2.14.2.4
--- php-src/ext/curl/interface.c:1.62.2.14.2.3  Thu Jun 15 15:31:54 2006
+++ php-src/ext/curl/interface.cMon Jun 26 14:11:17 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.62.2.14.2.3 2006/06/15 15:31:54 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.4 2006/06/26 14:11:17 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -325,9 +325,6 @@
 
 #ifdef COMPILE_DL_CURL
 ZEND_GET_MODULE (curl)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif
 
 /* {{{ PHP_MINFO_FUNCTION
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.3&r2=1.49.2.2.2.4&diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.3 php-src/ext/gmp/gmp.c:1.49.2.2.2.4
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.3  Fri Jun 16 00:14:35 2006
+++ php-src/ext/gmp/gmp.c   Mon Jun 26 14:11:17 2006
@@ -333,9 +333,6 @@
 
 #ifdef COMPILE_DL_GMP
 ZEND_GET_MODULE(gmp)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif
 
 static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);

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

[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/gmp gmp.c /ext/libxml libxml.c

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 14:10:57 2006 UTC

  Modified files:  
/php-src/ext/libxml libxml.c 
/php-src/ext/curl   interface.c 
/php-src/ext/gmpgmp.c 
  Log:
  Removed obsolete arg_info include
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.48&r2=1.49&diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.48 php-src/ext/libxml/libxml.c:1.49
--- php-src/ext/libxml/libxml.c:1.48Sat Jun 17 13:15:37 2006
+++ php-src/ext/libxml/libxml.c Mon Jun 26 14:10:57 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.48 2006/06/17 13:15:37 bjori Exp $ */
+/* $Id: libxml.c,v 1.49 2006/06/26 14:10:57 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -68,9 +68,6 @@
 /* {{{ dynamically loadable module stuff */
 #ifdef COMPILE_DL_LIBXML
 ZEND_GET_MODULE(libxml)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif /* COMPILE_DL_LIBXML */
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.83&r2=1.84&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.83 php-src/ext/curl/interface.c:1.84
--- php-src/ext/curl/interface.c:1.83   Thu Jun 15 16:25:12 2006
+++ php-src/ext/curl/interface.cMon Jun 26 14:10:57 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: interface.c,v 1.83 2006/06/15 16:25:12 bjori Exp $ */
+/* $Id: interface.c,v 1.84 2006/06/26 14:10:57 bjori Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -323,9 +323,6 @@
 
 #ifdef COMPILE_DL_CURL
 ZEND_GET_MODULE (curl)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif
 
 /* {{{ PHP_MINFO_FUNCTION
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.54 php-src/ext/gmp/gmp.c:1.55
--- php-src/ext/gmp/gmp.c:1.54  Wed Jun 14 21:29:22 2006
+++ php-src/ext/gmp/gmp.c   Mon Jun 26 14:10:57 2006
@@ -339,9 +339,6 @@
 
 #ifdef COMPILE_DL_GMP
 ZEND_GET_MODULE(gmp)
-# ifdef PHP_WIN32
-# include "zend_arg_defs.c"
-# endif
 #endif
 
 static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);

-- 
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/simplexml simplexml.c

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 13:41:52 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/simplexml  simplexml.c 
  Log:
  Added SimpleXMLElement::saveXML() as an alias for SimpleXMLElement::asXML()
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.95&r2=1.2027.2.547.2.96&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.95 php-src/NEWS:1.2027.2.547.2.96
--- php-src/NEWS:1.2027.2.547.2.95  Mon Jun 26 13:23:46 2006
+++ php-src/NEWSMon Jun 26 13:41:52 2006
@@ -59,6 +59,8 @@
 - Added memory_get_peak_usage() function for retrieving peak memory usage of
   a PHP script. (Ilia)
 - Added pg_field_table() function. (Edin)
+- Added SimpleXMLElement::saveXML() as an alias for SimpleXMLElement::asXML().
+  (Hannes)
 
 - Optimized zend_try/zend_catch macros by eliminating memcpy(3). (Dmitry)
 - Optimized require_once() and include_once() by eliminating fopen(3)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.7&r2=1.151.2.22.2.8&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.7 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.8
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.7Tue Jun  6 12:05:30 2006
+++ php-src/ext/simplexml/simplexml.c   Mon Jun 26 13:41:52 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.7 2006/06/06 12:05:30 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.8 2006/06/26 13:41:52 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -48,6 +48,7 @@
 }
 
 #define SXE_ME(func, arg_info, flags) PHP_ME(simplexml_element, func, 
arg_info, flags)
+#define SXE_MALIAS(func, alias, arg_info, flags) PHP_MALIAS(simplexml_element, 
func, alias, arg_info, flags)
 
 #define SXE_METHOD(func) PHP_METHOD(simplexml_element, func)
 
@@ -2246,6 +2247,7 @@
 static zend_function_entry sxe_functions[] = {
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* 
must be called */
SXE_ME(asXML,  NULL, ZEND_ACC_PUBLIC)
+   SXE_MALIAS(saveXML, asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath,  NULL, ZEND_ACC_PUBLIC)
SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
@@ -2307,7 +2309,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.7 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.8 $");
php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
"enabled");

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

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

2006-06-26 Thread Dmitry Stogov

dmitry  Mon Jun 26 13:31:37 2006 UTC

  Modified files:  
/php-src/ext/soap   php_sdl.c 
  Log:
  Fixed bug #37862 (Integer pointer comparison to numeric value)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.100 php-src/ext/soap/php_sdl.c:1.101
--- php-src/ext/soap/php_sdl.c:1.100Wed Apr 19 10:49:16 2006
+++ php-src/ext/soap/php_sdl.c  Mon Jun 26 13:31:37 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_sdl.c,v 1.100 2006/04/19 10:49:16 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.101 2006/06/26 13:31:37 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/libxml/php_libxml.h"
@@ -2193,7 +2193,7 @@

zend_hash_find(&tmp_bindings,(char*)&(*tmp)->binding,sizeof((*tmp)->binding), 
(void**)&binding_num) != SUCCESS) {
}
WSDL_CACHE_PUT_INT(*binding_num, out);
-   if (binding_num >= 0) {
+   if (*binding_num >= 0) {
if ((*tmp)->binding->bindingType == 
BINDING_SOAP && (*tmp)->bindingAttributes != NULL) {
sdlSoapBindingFunctionPtr binding = 
(sdlSoapBindingFunctionPtr)(*tmp)->bindingAttributes;
WSDL_CACHE_PUT_1(binding->style, out);

-- 
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/soap php_sdl.c

2006-06-26 Thread Dmitry Stogov

dmitry  Mon Jun 26 13:23:47 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/soap   php_sdl.c 
  Log:
  Fixed bug #37862 (Integer pointer comparison to numeric value)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.94&r2=1.2027.2.547.2.95&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.94 php-src/NEWS:1.2027.2.547.2.95
--- php-src/NEWS:1.2027.2.547.2.94  Sun Jun 25 23:22:40 2006
+++ php-src/NEWSMon Jun 26 13:23:46 2006
@@ -69,6 +69,8 @@
 - Fixed memory leaks in openssl streams context options. (Pierre)
 - Fixed handling of extremely long paths inside tempnam() function. (Ilia)
 - Fixed bug #37864 (file_get_contents() leaks on empty file). (Hannes)
+- Fixed bug #37862 (Integer pointer comparison to numeric value).
+  (bugs-php at thewrittenword dot com)
 - Fixed bug #37807 (segmentation fault during SOAP schema import). (Tony)
 - Fixed bug #37780 (memory leak trying to execute a non existing file (CLI)).
   (Mike)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12&r2=1.88.2.12.2.1&diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12 
php-src/ext/soap/php_sdl.c:1.88.2.12.2.1
--- php-src/ext/soap/php_sdl.c:1.88.2.12Wed Apr 19 10:48:54 2006
+++ php-src/ext/soap/php_sdl.c  Mon Jun 26 13:23:46 2006
@@ -17,7 +17,7 @@
   |  Dmitry Stogov <[EMAIL PROTECTED]> |
   +--+
 */
-/* $Id: php_sdl.c,v 1.88.2.12 2006/04/19 10:48:54 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.1 2006/06/26 13:23:46 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/libxml/php_libxml.h"
@@ -2193,7 +2193,7 @@

zend_hash_find(&tmp_bindings,(char*)&(*tmp)->binding,sizeof((*tmp)->binding), 
(void**)&binding_num) != SUCCESS) {
}
WSDL_CACHE_PUT_INT(*binding_num, out);
-   if (binding_num >= 0) {
+   if (*binding_num >= 0) {
if ((*tmp)->binding->bindingType == 
BINDING_SOAP && (*tmp)->bindingAttributes != NULL) {
sdlSoapBindingFunctionPtr binding = 
(sdlSoapBindingFunctionPtr)(*tmp)->bindingAttributes;
WSDL_CACHE_PUT_1(binding->style, out);

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

2006-06-26 Thread Rasmus Lerdorf

rasmus  Mon Jun 26 13:15:21 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   basic_functions.c 
  Log:
  MFH: fix sapi_getenv() leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.6&r2=1.725.2.31.2.7&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.6 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.7
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.6   Sun Jun 25 
21:06:39 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 13:15:20 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.6 2006/06/25 21:06:39 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.7 2006/06/26 13:15:20 rasmus Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1427,12 +1427,9 @@
RETURN_FALSE;
}
ptr = sapi_getenv(str, str_len TSRMLS_CC);
-   if (! ptr) {
-   ptr = getenv(str);
-   }
-   if (ptr) {
-   RETURN_STRING(ptr, 1);
-   }
+   if(ptr) RETURN_STRING(ptr, 0);
+   ptr = getenv(str);
+   if(ptr) RETURN_STRING(ptr, 1);
RETURN_FALSE;
 }
 /* }}} */

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

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

2006-06-26 Thread Rasmus Lerdorf

rasmus  Mon Jun 26 13:10:32 2006 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  Cleaner fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.781&r2=1.782&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.781 
php-src/ext/standard/basic_functions.c:1.782
--- php-src/ext/standard/basic_functions.c:1.781Mon Jun 26 13:03:41 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 13:10:31 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.781 2006/06/26 13:03:41 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.782 2006/06/26 13:10:31 rasmus Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -4308,14 +4308,10 @@
RETURN_FALSE;
}
ptr = sapi_getenv(str, str_len TSRMLS_CC);
-   if(ptr) {
-   RETVAL_RT_STRING(ptr,1);
-   efree(ptr);
-   } else {
-   ptr = getenv(str);
-   if(ptr) RETURN_RT_STRING(ptr, 1);
-   else RETURN_FALSE;
-   }
+   if(ptr) RETURN_RT_STRING(ptr, 0);
+   ptr = getenv(str);
+   if(ptr) RETURN_RT_STRING(ptr, 1);
+   RETURN_FALSE;
 }
 /* }}} */
 

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

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

2006-06-26 Thread Rasmus Lerdorf

rasmus  Mon Jun 26 13:03:41 2006 UTC

  Modified files:  
/php-src/ext/standard   basic_functions.c 
  Log:
  sapi_getenv() estrdups the returned string now, so we need to free it
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.780&r2=1.781&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.780 
php-src/ext/standard/basic_functions.c:1.781
--- php-src/ext/standard/basic_functions.c:1.780Mon Jun 26 11:31:19 2006
+++ php-src/ext/standard/basic_functions.c  Mon Jun 26 13:03:41 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.780 2006/06/26 11:31:19 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.781 2006/06/26 13:03:41 rasmus Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -4308,13 +4308,14 @@
RETURN_FALSE;
}
ptr = sapi_getenv(str, str_len TSRMLS_CC);
-   if (! ptr) {
+   if(ptr) {
+   RETVAL_RT_STRING(ptr,1);
+   efree(ptr);
+   } else {
ptr = getenv(str);
+   if(ptr) RETURN_RT_STRING(ptr, 1);
+   else RETURN_FALSE;
}
-   if (ptr) {
-   RETURN_RT_STRING(ptr, 1);
-   }
-   RETURN_FALSE;
 }
 /* }}} */
 

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

[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c php_mcrypt.h /ext/mysql php_mysql.c /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h

2006-06-26 Thread Hannes Magnusson

bjori   Mon Jun 26 11:31:19 2006 UTC

  Modified files:  
/php-src/ext/mcrypt mcrypt.c php_mcrypt.h 
/php-src/ext/mysql  php_mysql.c 
/php-src/ext/standard   basic_functions.c streamsfuncs.c 
streamsfuncs.h 
  Log:
  Removed custom deprecate error messages
  Use the fancy ZEND_ACC_DEPRECATED flag.
  
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.98 php-src/ext/mcrypt/mcrypt.c:1.99
--- php-src/ext/mcrypt/mcrypt.c:1.98Tue Jun 13 13:12:18 2006
+++ php-src/ext/mcrypt/mcrypt.c Mon Jun 26 11:31:19 2006
@@ -16,7 +16,7 @@
|  Derick Rethans <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: mcrypt.c,v 1.98 2006/06/13 13:12:18 dmitry Exp $ */
+/* $Id: mcrypt.c,v 1.99 2006/06/26 11:31:19 bjori Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,7 +63,7 @@
PHP_FE(mcrypt_generic_init, NULL)
PHP_FE(mcrypt_generic, NULL)
PHP_FE(mdecrypt_generic, NULL)
-   PHP_FE(mcrypt_generic_end, NULL)
+   PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, NULL)
PHP_FE(mcrypt_generic_deinit, NULL)
 
PHP_FE(mcrypt_enc_self_test, NULL)
@@ -604,16 +604,6 @@
 /* }}} */
 
 
-/* {{{ proto bool mcrypt_generic_end(resource td)
-   This function terminates encrypt specified by the descriptor td */
-PHP_FUNCTION(mcrypt_generic_end)
-{
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function is 
deprecated, please use mcrypt_generic_deinit()");
-   zif_mcrypt_generic_deinit(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
-
 /* {{{ proto bool mcrypt_generic_deinit(resource td)
This function terminates encrypt specified by the descriptor td */
 PHP_FUNCTION(mcrypt_generic_deinit)
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/php_mcrypt.h?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/mcrypt/php_mcrypt.h
diff -u php-src/ext/mcrypt/php_mcrypt.h:1.27 
php-src/ext/mcrypt/php_mcrypt.h:1.28
--- php-src/ext/mcrypt/php_mcrypt.h:1.27Sun Jan  1 13:09:51 2006
+++ php-src/ext/mcrypt/php_mcrypt.h Mon Jun 26 11:31:19 2006
@@ -16,7 +16,7 @@
|  Derick Rethans <[EMAIL PROTECTED]>|
+--+
  */
-/* $Id: php_mcrypt.h,v 1.27 2006/01/01 13:09:51 sniper Exp $ */
+/* $Id: php_mcrypt.h,v 1.28 2006/06/26 11:31:19 bjori Exp $ */
 
 #ifndef PHP_MCRYPT_H
 #define PHP_MCRYPT_H
@@ -52,7 +52,6 @@
 PHP_FUNCTION(mcrypt_generic_init);
 PHP_FUNCTION(mcrypt_generic);
 PHP_FUNCTION(mdecrypt_generic);
-PHP_FUNCTION(mcrypt_generic_end);
 PHP_FUNCTION(mcrypt_generic_deinit);
 
 PHP_FUNCTION(mcrypt_enc_self_test);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.223&r2=1.224&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.223 php-src/ext/mysql/php_mysql.c:1.224
--- php-src/ext/mysql/php_mysql.c:1.223 Tue Jun 13 13:12:19 2006
+++ php-src/ext/mysql/php_mysql.c   Mon Jun 26 11:31:19 2006
@@ -18,7 +18,7 @@
+--+
 */
  
-/* $Id: php_mysql.c,v 1.223 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.224 2006/06/26 11:31:19 bjori Exp $ */
 
 /* TODO:
  *
@@ -126,15 +126,15 @@
PHP_FE(mysql_select_db, 
NULL)
 #ifndef NETWARE/* The below two functions not supported on 
NetWare */
 #if MYSQL_VERSION_ID < 4
-   PHP_FE(mysql_create_db, 
NULL)
-   PHP_FE(mysql_drop_db,   
NULL)
+   PHP_DEP_FE(mysql_create_db, 
NULL)
+   PHP_DEP_FE(mysql_drop_db,   
NULL)
 #endif
 #endif /* NETWARE */
PHP_FE(mysql_query, 
NULL)
PHP_FE(mysql_unbuffered_query,  
NULL)
PHP_FE(mysql_db_query,  
NULL)
PHP_FE(mysql_list_dbs,  
NULL)
-   PHP_FE(mysql_list_tables,   
NULL)
+   PHP_DEP_FE(mysql_list_tables,   
NULL)
PHP_FE(mysql_list_fields,   
NULL)
PHP_FE(mysql_list_processes,
NULL)
PHP_FE(mysql_error, 
NULL)
@@ -185,15 +185,15 @@
PHP_FALIAS(mysql_selectdb,

[PHP-CVS] Re: cvs: php-src(PHP_5_2) / NEWS /main SAPI.c /sapi/apache mod_php5.c

2006-06-26 Thread Michael Wallner


Rasmus Lerdorf wrote:

rasmus  Wed May 10 21:19:32 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src	NEWS 
/php-src/main	SAPI.c 
/php-src/sapi/apache	mod_php5.c 
  Log:

  Add input_filter hook call in getenv()



http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.202.2.7&r2=1.202.2.7.2.1&diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202.2.7 php-src/main/SAPI.c:1.202.2.7.2.1
--- php-src/main/SAPI.c:1.202.2.7   Sun Jan  1 12:50:17 2006
+++ php-src/main/SAPI.c Wed May 10 21:19:32 2006
@@ -18,13 +18,14 @@
+--+
 */
 
-/* $Id: SAPI.c,v 1.202.2.7 2006/01/01 12:50:17 sniper Exp $ */

+/* $Id: SAPI.c,v 1.202.2.7.2.1 2006/05/10 21:19:32 rasmus Exp $ */
 
 #include 

 #include 
 
 #include "php.h"

 #include "SAPI.h"
+#include "php_variables.h"
 #include "php_ini.h"
 #include "ext/standard/php_string.h"
 #include "ext/standard/pageinfo.h"
@@ -914,11 +915,15 @@
 
 SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)

 {
-   if (sapi_module.getenv) {
-   return sapi_module.getenv(name, name_len TSRMLS_CC);
+	if (sapi_module.getenv) { 
+		char *value, *tmp = sapi_module.getenv(name, name_len TSRMLS_CC);
+		if(tmp) value = estrdup(tmp); 
+		else return NULL;

+   sapi_module.input_filter(PARSE_ENV, name, &value, 
strlen(value), NULL TSRMLS_CC);
+   return value;


Is this supposed to leak now?


} else {
-   return NULL;
-   }
+		return NULL; 
+	}   
 }


Regards,
--
Michael

--
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/dom/tests bug34276.phpt bug35342.phpt dom002.phpt /ext/iconv/tests bug37176.phpt /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt

[PHP-CVS] cvs: php-src /ext/dom/tests bug34276.phpt bug35342.phpt dom002.phpt /ext/iconv/tests bug37176.phpt /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_m

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcre/tests locales.phpt

[PHP-CVS] cvs: php-src /ext/pcre/tests locales.phpt

[PHP-CVS] cvs: php-src /ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 007.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zlib/tests 004.phpt 004.txt.gz 005.phpt 006.phpt 007.phpt

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

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

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

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

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

[PHP-CVS] cvs: php-src /ext/bz2/tests 001.phpt 002.phpt 003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 004_2.txt.bz2 005.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings bug37244.phpt

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

[PHP-CVS] cvs: php-src /ext/standard base64.c base64.h /ext/standard/tests/strings bug37244.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/bz2/tests 001.phpt 002.phpt 003.phpt 003.txt.bz2 004.phpt 004_1.txt.bz2 004_2.txt.bz2 005.phpt

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

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

[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c basic_functions.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c formatted_print.c levenshtein.c metaphone.c streamsfuncs.c string.c url.c uuencode.c versioning.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard user_filters.c /ext/standard/tests/filters php_user_filter_01.phpt php_user_filter_02.phpt php_user_filter_03.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mcrypt mcrypt.c php_mcrypt.h /ext/mysql php_mysql.c /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/gmp gmp.c /ext/libxml libxml.c

[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/gmp gmp.c /ext/libxml libxml.c

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

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

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

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

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

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

[PHP-CVS] cvs: php-src /ext/mcrypt mcrypt.c php_mcrypt.h /ext/mysql php_mysql.c /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h

[PHP-CVS] Re: cvs: php-src(PHP_5_2) / NEWS /main SAPI.c /sapi/apache mod_php5.c

33 matches

Site Navigation

Mail list logo

Footer information