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

2005-12-03 Thread changelog
changelog   Sun Dec  4 01:46:55 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2183r2=1.2184ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2183 php-src/ChangeLog:1.2184
--- php-src/ChangeLog:1.2183Sat Dec  3 01:44:24 2005
+++ php-src/ChangeLog   Sun Dec  4 01:46:40 2005
@@ -1,3 +1,26 @@
+2005-12-03  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/sockets/sockets.c:
+  yet another compile warning
+
+2005-12-03  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  ext/bz2/bz2_filter.c:
+  MFH: - Fix bug #35530 (ext/bz2 compile failure with phpize)
+
+* ext/bz2/bz2_filter.c:
+  - Fix bug #35530 (ext/bz2 compile failure with phpize)
+
+* sapi/cgi/cgi_main.c:
+  - fix possible compile error
+
+* main/snprintf.h:
+  fix compile failure (bug #35528)
+
+* ZendEngine2/tests/bug30346.phpt:
+  Nuked dos EOLs and fixed typo
+
 2005-12-02  Jani Taskinen  [EMAIL PROTECTED]
 
 * php.ini-dist
@@ -18171,7 +18194,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2183 2005/12/03 06:44:24 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -21572,7 +21595,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2183 2005/12/03 06:44:24 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -22053,7 +22076,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2183 2005/12/03 06:44:24 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -23527,7 +23550,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2183 2005/12/03 06:44:24 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2184 2005/12/04 06:46:40 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:


[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash/tests crc32.phpt

2005-12-03 Thread Michael Wallner
mikeSat Dec  3 05:18:39 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/hash/tests crc32.phpt 
  Log:
  MFH: add crc32 test
  
  

http://cvs.php.net/co.php/php-src/ext/hash/tests/crc32.phpt?r=1.1p=1
Index: php-src/ext/hash/tests/crc32.phpt
+++ php-src/ext/hash/tests/crc32.phpt
--TEST--
CRC32
--SKIPIF--
?php extension_loaded('hash') or die('skip'); ?
--FILE--
?php
echo hash('crc32', ''), \n;
echo hash('crc32', 'a'), \n;
echo hash('crc32', 'abc'), \n;
echo hash('crc32', 'message digest'), \n;
echo hash('crc32', 'abcdefghijklmnopqrstuvwxyz'), \n;
echo hash('crc32', 
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'), \n;
echo hash('crc32', 
'12345678901234567890123456789012345678901234567890123456789012345678901234567890'),
 \n;
echo hash('crc32b', ''), \n;
echo hash('crc32b', 'a'), \n;
echo hash('crc32b', 'abc'), \n;
echo hash('crc32b', 'message digest'), \n;
echo hash('crc32b', 'abcdefghijklmnopqrstuvwxyz'), \n;
echo hash('crc32b', 
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'), \n;
echo hash('crc32b', 
'12345678901234567890123456789012345678901234567890123456789012345678901234567890'),
 \n;
?
--EXPECT--

6b9b9319
73bb8c64
5703c9bf
9693bf77
882174a0
96790816

43beb7e8
c2412435
7f9d1520
bd50274c
d2e6c21f
724aa97c

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash package.xml

2005-12-03 Thread Michael Wallner
mikeSat Dec  3 05:19:51 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/hash   package.xml 
  Log:
  - add test to package.xml
  
http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.10.2.3r2=1.10.2.4ty=u
Index: php-src/ext/hash/package.xml
diff -u php-src/ext/hash/package.xml:1.10.2.3 
php-src/ext/hash/package.xml:1.10.2.4
--- php-src/ext/hash/package.xml:1.10.2.3   Fri Dec  2 20:17:48 2005
+++ php-src/ext/hash/package.xmlSat Dec  3 05:19:50 2005
@@ -80,6 +80,7 @@
 file role=test name=whirlpool.phpt/
 file role=test name=gost.phpt/
 file role=test name=snefru.phpt/
+   file role=test name=crc32.phpt/
/dir
   /filelist
 

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash package.xml

2005-12-03 Thread Michael Wallner
mikeSat Dec  3 05:25:31 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/hash   package.xml 
  Log:
  MFH: fix ws
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.10.2.4r2=1.10.2.5ty=u
Index: php-src/ext/hash/package.xml
diff -u php-src/ext/hash/package.xml:1.10.2.4 
php-src/ext/hash/package.xml:1.10.2.5
--- php-src/ext/hash/package.xml:1.10.2.4   Sat Dec  3 05:19:50 2005
+++ php-src/ext/hash/package.xmlSat Dec  3 05:25:31 2005
@@ -80,8 +80,11 @@
 file role=test name=whirlpool.phpt/
 file role=test name=gost.phpt/
 file role=test name=snefru.phpt/
-   file role=test name=crc32.phpt/
+file role=test name=crc32.phpt/
/dir
   /filelist
 
 /package
+!-- 
+vim: et ts=1 sw=1
+--

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash package.xml /ext/hash/tests adler32.phpt

2005-12-03 Thread Michael Wallner
mikeSat Dec  3 05:31:02 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/hash/tests adler32.phpt 

  Modified files:  
/php-src/ext/hash   package.xml 
  Log:
  - add adler32 test
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.10.2.5r2=1.10.2.6ty=u
Index: php-src/ext/hash/package.xml
diff -u php-src/ext/hash/package.xml:1.10.2.5 
php-src/ext/hash/package.xml:1.10.2.6
--- php-src/ext/hash/package.xml:1.10.2.5   Sat Dec  3 05:25:31 2005
+++ php-src/ext/hash/package.xmlSat Dec  3 05:30:59 2005
@@ -81,6 +81,7 @@
 file role=test name=gost.phpt/
 file role=test name=snefru.phpt/
 file role=test name=crc32.phpt/
+file role=test name=adler32.phpt/
/dir
   /filelist
 

http://cvs.php.net/co.php/php-src/ext/hash/tests/adler32.phpt?r=1.1p=1
Index: php-src/ext/hash/tests/adler32.phpt
+++ php-src/ext/hash/tests/adler32.phpt

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

2005-12-03 Thread Jani Taskinen
sniper  Sat Dec  3 08:22:20 2005 EDT

  Modified files:  
/php-src/ext/bz2bz2_filter.c 
  Log:
  - Fix bug #35530 (ext/bz2 compile failure with phpize)
  
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2_filter.c?r1=1.4r2=1.5ty=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.4 php-src/ext/bz2/bz2_filter.c:1.5
--- php-src/ext/bz2/bz2_filter.c:1.4Thu Aug 11 19:35:53 2005
+++ php-src/ext/bz2/bz2_filter.cSat Dec  3 08:22:20 2005
@@ -16,7 +16,11 @@
+--+
 */
 
-/* $Id: bz2_filter.c,v 1.4 2005/08/11 23:35:53 andrei Exp $ */
+/* $Id: bz2_filter.c,v 1.5 2005/12/03 13:22:20 sniper Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
 
 #include php.h
 #include php_bz2.h

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



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

2005-12-03 Thread Jani Taskinen
sniper  Sat Dec  3 08:23:14 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/bz2bz2_filter.c 
  Log:
  MFH: - Fix bug #35530 (ext/bz2 compile failure with phpize)
  
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2_filter.c?r1=1.3r2=1.3.2.1ty=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.3 php-src/ext/bz2/bz2_filter.c:1.3.2.1
--- php-src/ext/bz2/bz2_filter.c:1.3Wed Aug  3 10:06:39 2005
+++ php-src/ext/bz2/bz2_filter.cSat Dec  3 08:23:14 2005
@@ -16,7 +16,11 @@
+--+
 */
 
-/* $Id: bz2_filter.c,v 1.3 2005/08/03 14:06:39 sniper Exp $ */
+/* $Id: bz2_filter.c,v 1.3.2.1 2005/12/03 13:23:14 sniper Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
 
 #include php.h
 #include php_bz2.h

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



[PHP-CVS] cvs: php-src /ext/xmlwriter php_xmlwriter.c php_xmlwriter.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:19:50 2005 EDT

  Modified files:  
/php-src/ext/xmlwriter  php_xmlwriter.c php_xmlwriter.h 
  Log:
  fix compile warning
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20r2=1.21ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20 
php-src/ext/xmlwriter/php_xmlwriter.c:1.21
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20  Thu Dec  1 11:41:52 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Sat Dec  3 18:19:47 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20 2005/12/01 16:41:52 rrichards Exp $ */
+/* $Id: php_xmlwriter.c,v 1.21 2005/12/03 23:19:47 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -31,6 +31,9 @@
 
 zend_class_entry *xmlwriter_class_entry;
 
+static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
+static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+
 /* {{{ xmlwriter_object_free_storage */
 static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC) 
 {
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.h?r1=1.10r2=1.11ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.h
diff -u php-src/ext/xmlwriter/php_xmlwriter.h:1.10 
php-src/ext/xmlwriter/php_xmlwriter.h:1.11
--- php-src/ext/xmlwriter/php_xmlwriter.h:1.10  Thu Dec  1 11:41:52 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.h   Sat Dec  3 18:19:48 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.h,v 1.10 2005/12/01 16:41:52 rrichards Exp $ */
+/* $Id: php_xmlwriter.h,v 1.11 2005/12/03 23:19:48 tony2001 Exp $ */
 
 #ifndef PHP_XMLWRITER_H
 #define PHP_XMLWRITER_H
@@ -55,9 +55,6 @@
xmlwriter_object *xmlwriter_ptr;
 } ze_xmlwriter_object;
 
-static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
-static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-
 zend_class_entry *xmlwriter_class_entry_ce;
 
 #if LIBXML_VERSION = 20605

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/xmlwriter php_xmlwriter.c php_xmlwriter.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:20:07 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/xmlwriter  php_xmlwriter.c php_xmlwriter.h 
  Log:
  MFH: fix compile warning
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.2r2=1.20.2.3ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.2 
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.3
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.2  Thu Dec  1 21:05:24 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.c   Sat Dec  3 18:20:07 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.2 2005/12/02 02:05:24 iliaa Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.3 2005/12/03 23:20:07 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -31,6 +31,9 @@
 
 zend_class_entry *xmlwriter_class_entry;
 
+static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
+static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+
 /* {{{ xmlwriter_object_free_storage */
 static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC) 
 {
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.h?r1=1.10.2.2r2=1.10.2.3ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.h
diff -u php-src/ext/xmlwriter/php_xmlwriter.h:1.10.2.2 
php-src/ext/xmlwriter/php_xmlwriter.h:1.10.2.3
--- php-src/ext/xmlwriter/php_xmlwriter.h:1.10.2.2  Thu Dec  1 21:05:25 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.h   Sat Dec  3 18:20:07 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: php_xmlwriter.h,v 1.10.2.2 2005/12/02 02:05:25 iliaa Exp $ */
+/* $Id: php_xmlwriter.h,v 1.10.2.3 2005/12/03 23:20:07 tony2001 Exp $ */
 
 #ifndef PHP_XMLWRITER_H
 #define PHP_XMLWRITER_H
@@ -55,9 +55,6 @@
xmlwriter_object *xmlwriter_ptr;
 } ze_xmlwriter_object;
 
-static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
-static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
-
 zend_class_entry *xmlwriter_class_entry_ce;
 
 #if LIBXML_VERSION = 20605

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



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

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:24:09 2005 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  yet another compile warning
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.173r2=1.174ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.173 php-src/ext/sockets/sockets.c:1.174
--- php-src/ext/sockets/sockets.c:1.173 Thu Dec  1 09:03:51 2005
+++ php-src/ext/sockets/sockets.c   Sat Dec  3 18:24:07 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.173 2005/12/01 14:03:51 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.174 2005/12/03 23:24:07 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1504,7 +1504,9 @@
zval*arg1;
struct linger   linger_val;
struct timeval  tv;
+#ifdef PHP_WIN32
int timeout = 0;
+#endif
socklen_t   optlen;
php_socket  *php_sock;
int other_val;
@@ -1579,7 +1581,10 @@
struct linger   lv;
struct timeval tv;
php_socket  *php_sock;
-   int ov, optlen, retval, timeout;
+   int ov, optlen, retval; 
+#ifdef PHP_WIN32
+   int timeout;
+#endif
longlevel, optname;
void*opt_ptr;


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



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

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:24:29 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/socketssockets.c 
  Log:
  MFH: yet another compile warning
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171.2.3r2=1.171.2.4ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.3 
php-src/ext/sockets/sockets.c:1.171.2.4
--- php-src/ext/sockets/sockets.c:1.171.2.3 Thu Dec  1 09:02:54 2005
+++ php-src/ext/sockets/sockets.c   Sat Dec  3 18:24:29 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.171.2.3 2005/12/01 14:02:54 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.171.2.4 2005/12/03 23:24:29 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1506,7 +1506,9 @@
zval*arg1;
struct linger   linger_val;
struct timeval  tv;
+#ifdef PHP_WIN32
int timeout = 0;
+#endif
socklen_t   optlen;
php_socket  *php_sock;
int other_val;
@@ -1581,7 +1583,10 @@
struct linger   lv;
struct timeval tv;
php_socket  *php_sock;
-   int ov, optlen, retval, timeout;
+   int ov, optlen, retval; 
+#ifdef PHP_WIN32
+   int timeout;
+#endif
longlevel, optname;
void*opt_ptr;


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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash .cvsignore

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:28:01 2005 EDT

  Added files: (Branch: PHP_5_1)
/php-src/ext/hash   .cvsignore 
  Log:
  add .cvsignore
  
  

http://cvs.php.net/co.php/php-src/ext/hash/.cvsignore?r=1.1p=1
Index: php-src/ext/hash/.cvsignore
+++ php-src/ext/hash/.cvsignore
#*#
*.dsw
*.la
*.lo
*.ncb
*.opt
*.plg
*.tgz
*~..#*..deps..libs
Debug
Debug_TS
Makefile
Makefile.fragments
Makefile.global
Makefile.objects
Release
Release_TS
Release_TSDbg
Release_TS_inline
Release_inline
acinclude.m4
aclocal.m4
autom4te.cache
build
config.cache
config.guess
config.h
config.h.in
config.log
config.nice
config.status
config.sub
configure
configure.in
conftest
conftest.c
include
install-sh
libs.mk
libtool
ltmain.sh
missing
mkinstalldirs
modules
scan_makefile_in.awk
*.gcda
*.gcno

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash php_hash_gost.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:31:15 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/hash   php_hash_gost.h 
  Log:
  fix #35538 (new hash extensions does not compile on amd64)
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_gost.h?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/hash/php_hash_gost.h
diff -u php-src/ext/hash/php_hash_gost.h:1.2.2.2 
php-src/ext/hash/php_hash_gost.h:1.2.2.3
--- php-src/ext/hash/php_hash_gost.h:1.2.2.2Thu Dec  1 20:59:45 2005
+++ php-src/ext/hash/php_hash_gost.hSat Dec  3 18:31:14 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_gost.h,v 1.2.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash_gost.h,v 1.2.2.3 2005/12/03 23:31:14 tony2001 Exp $ */
 
 #ifndef PHP_HASH_GOST_H
 #define PHP_HASH_GOST_H
@@ -32,7 +32,7 @@
 } PHP_GOST_CTX;
 
 PHP_HASH_API void PHP_GOSTInit(PHP_GOST_CTX *);
-PHP_HASH_API void PHP_GOSTUpdate(PHP_GOST_CTX *, const unsigned char *, uint);
+PHP_HASH_API void PHP_GOSTUpdate(PHP_GOST_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_GOSTFinal(unsigned char[64], PHP_GOST_CTX *);
 
 #endif

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



[PHP-CVS] cvs: php-src /ext/hash php_hash_gost.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:31:49 2005 EDT

  Modified files:  
/php-src/ext/hash   php_hash_gost.h 
  Log:
  MF51: fix #35538 (new hash extensions does not compile on amd64)
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_gost.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/hash/php_hash_gost.h
diff -u php-src/ext/hash/php_hash_gost.h:1.2 
php-src/ext/hash/php_hash_gost.h:1.3
--- php-src/ext/hash/php_hash_gost.h:1.2Sat Nov 26 08:15:06 2005
+++ php-src/ext/hash/php_hash_gost.hSat Dec  3 18:31:49 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_gost.h,v 1.2 2005/11/26 13:15:06 mike Exp $ */
+/* $Id: php_hash_gost.h,v 1.3 2005/12/03 23:31:49 tony2001 Exp $ */
 
 #ifndef PHP_HASH_GOST_H
 #define PHP_HASH_GOST_H
@@ -32,7 +32,7 @@
 } PHP_GOST_CTX;
 
 PHP_HASH_API void PHP_GOSTInit(PHP_GOST_CTX *);
-PHP_HASH_API void PHP_GOSTUpdate(PHP_GOST_CTX *, const unsigned char *, uint);
+PHP_HASH_API void PHP_GOSTUpdate(PHP_GOST_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_GOSTFinal(unsigned char[64], PHP_GOST_CTX *);
 
 #endif

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



[PHP-CVS] cvs: php-src /ext/hash php_hash.h php_hash_salsa.h php_hash_snefru.h php_hash_whirlpool.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:49:53 2005 EDT

  Modified files:  
/php-src/ext/hash   php_hash.h php_hash_salsa.h php_hash_snefru.h 
php_hash_whirlpool.h 
  Log:
  add declarations
  more uint - size_t fixes
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash.h?r1=1.14r2=1.15ty=u
Index: php-src/ext/hash/php_hash.h
diff -u php-src/ext/hash/php_hash.h:1.14 php-src/ext/hash/php_hash.h:1.15
--- php-src/ext/hash/php_hash.h:1.14Fri Dec  2 19:51:29 2005
+++ php-src/ext/hash/php_hash.h Sat Dec  3 18:49:52 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_hash.h,v 1.14 2005/12/03 00:51:29 pollita Exp $ */
+/* $Id: php_hash.h,v 1.15 2005/12/03 23:49:52 tony2001 Exp $ */
 
 #ifndef PHP_HASH_H
 #define PHP_HASH_H
@@ -106,6 +106,17 @@
 #include TSRM.h
 #endif
 
+PHP_FUNCTION(hash);
+PHP_FUNCTION(hash_file);
+PHP_FUNCTION(hash_hmac);
+PHP_FUNCTION(hash_hmac_file);
+PHP_FUNCTION(hash_init);
+PHP_FUNCTION(hash_update);
+PHP_FUNCTION(hash_update_stream);
+PHP_FUNCTION(hash_update_file);
+PHP_FUNCTION(hash_final);
+PHP_FUNCTION(hash_algos);
+
 PHP_HASH_API php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len);
 PHP_HASH_API void php_hash_register_algo(const char *algo, php_hash_ops *ops);
 
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_salsa.h?r1=1.4r2=1.5ty=u
Index: php-src/ext/hash/php_hash_salsa.h
diff -u php-src/ext/hash/php_hash_salsa.h:1.4 
php-src/ext/hash/php_hash_salsa.h:1.5
--- php-src/ext/hash/php_hash_salsa.h:1.4   Sat Nov 26 08:15:06 2005
+++ php-src/ext/hash/php_hash_salsa.h   Sat Dec  3 18:49:52 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_salsa.h,v 1.4 2005/11/26 13:15:06 mike Exp $ */
+/* $Id: php_hash_salsa.h,v 1.5 2005/12/03 23:49:52 tony2001 Exp $ */
 
 #ifndef PHP_HASH_SALSA_H
 #define PHP_HASH_SALSA_H
@@ -36,7 +36,7 @@
 PHP_HASH_API void PHP_SALSA10Init(PHP_SALSA_CTX *);
 PHP_HASH_API void PHP_SALSA20Init(PHP_SALSA_CTX *);
 
-PHP_HASH_API void PHP_SALSAUpdate(PHP_SALSA_CTX *, const unsigned char *, 
uint);
+PHP_HASH_API void PHP_SALSAUpdate(PHP_SALSA_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_SALSAFinal(unsigned char[64], PHP_SALSA_CTX *);
 
 #endif
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_snefru.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/hash/php_hash_snefru.h
diff -u php-src/ext/hash/php_hash_snefru.h:1.2 
php-src/ext/hash/php_hash_snefru.h:1.3
--- php-src/ext/hash/php_hash_snefru.h:1.2  Sat Nov 26 08:15:06 2005
+++ php-src/ext/hash/php_hash_snefru.h  Sat Dec  3 18:49:52 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_snefru.h,v 1.2 2005/11/26 13:15:06 mike Exp $ */
+/* $Id: php_hash_snefru.h,v 1.3 2005/12/03 23:49:52 tony2001 Exp $ */
 
 #ifndef PHP_HASH_SNEFRU_H
 #define PHP_HASH_SNEFRU_H
@@ -36,7 +36,7 @@
 } PHP_SNEFRU_CTX;
 
 PHP_HASH_API void PHP_SNEFRUInit(PHP_SNEFRU_CTX *);
-PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *, const unsigned char *, 
uint);
+PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_SNEFRUFinal(unsigned char[32], PHP_SNEFRU_CTX *);
 
 #endif
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_whirlpool.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/hash/php_hash_whirlpool.h
diff -u php-src/ext/hash/php_hash_whirlpool.h:1.2 
php-src/ext/hash/php_hash_whirlpool.h:1.3
--- php-src/ext/hash/php_hash_whirlpool.h:1.2   Sat Nov 26 08:15:06 2005
+++ php-src/ext/hash/php_hash_whirlpool.h   Sat Dec  3 18:49:52 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_whirlpool.h,v 1.2 2005/11/26 13:15:06 mike Exp $ */
+/* $Id: php_hash_whirlpool.h,v 1.3 2005/12/03 23:49:52 tony2001 Exp $ */
 
 #ifndef PHP_HASH_WHIRLPOOL_H
 #define PHP_HASH_WHIRLPOOL_H
@@ -33,7 +33,7 @@
 } PHP_WHIRLPOOL_CTX;
 
 PHP_HASH_API void PHP_WHIRLPOOLInit(PHP_WHIRLPOOL_CTX *);
-PHP_HASH_API void PHP_WHIRLPOOLUpdate(PHP_WHIRLPOOL_CTX *, const unsigned char 
*, uint);
+PHP_HASH_API void PHP_WHIRLPOOLUpdate(PHP_WHIRLPOOL_CTX *, const unsigned char 
*, size_t);
 PHP_HASH_API void PHP_WHIRLPOOLFinal(unsigned char[64], PHP_WHIRLPOOL_CTX *);
 
 #endif

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash php_hash.h php_hash_salsa.h php_hash_snefru.h php_hash_whirlpool.h

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 18:50:34 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/hash   php_hash.h php_hash_salsa.h php_hash_snefru.h 
php_hash_whirlpool.h 
  Log:
  MFH: add declarations
  more uint - size_t fixes
  
  
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash.h?r1=1.13.2.3r2=1.13.2.4ty=u
Index: php-src/ext/hash/php_hash.h
diff -u php-src/ext/hash/php_hash.h:1.13.2.3 
php-src/ext/hash/php_hash.h:1.13.2.4
--- php-src/ext/hash/php_hash.h:1.13.2.3Fri Dec  2 20:17:48 2005
+++ php-src/ext/hash/php_hash.h Sat Dec  3 18:50:33 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_hash.h,v 1.13.2.3 2005/12/03 01:17:48 pollita Exp $ */
+/* $Id: php_hash.h,v 1.13.2.4 2005/12/03 23:50:33 tony2001 Exp $ */
 
 #ifndef PHP_HASH_H
 #define PHP_HASH_H
@@ -106,6 +106,17 @@
 #include TSRM.h
 #endif
 
+PHP_FUNCTION(hash);
+PHP_FUNCTION(hash_file);
+PHP_FUNCTION(hash_hmac);
+PHP_FUNCTION(hash_hmac_file);
+PHP_FUNCTION(hash_init);
+PHP_FUNCTION(hash_update);
+PHP_FUNCTION(hash_update_stream);
+PHP_FUNCTION(hash_update_file);
+PHP_FUNCTION(hash_final);
+PHP_FUNCTION(hash_algos);
+
 PHP_HASH_API php_hash_ops *php_hash_fetch_ops(const char *algo, int algo_len);
 PHP_HASH_API void php_hash_register_algo(const char *algo, php_hash_ops *ops);
 
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_salsa.h?r1=1.4.2.2r2=1.4.2.3ty=u
Index: php-src/ext/hash/php_hash_salsa.h
diff -u php-src/ext/hash/php_hash_salsa.h:1.4.2.2 
php-src/ext/hash/php_hash_salsa.h:1.4.2.3
--- php-src/ext/hash/php_hash_salsa.h:1.4.2.2   Thu Dec  1 20:59:45 2005
+++ php-src/ext/hash/php_hash_salsa.h   Sat Dec  3 18:50:33 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_salsa.h,v 1.4.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash_salsa.h,v 1.4.2.3 2005/12/03 23:50:33 tony2001 Exp $ */
 
 #ifndef PHP_HASH_SALSA_H
 #define PHP_HASH_SALSA_H
@@ -36,7 +36,7 @@
 PHP_HASH_API void PHP_SALSA10Init(PHP_SALSA_CTX *);
 PHP_HASH_API void PHP_SALSA20Init(PHP_SALSA_CTX *);
 
-PHP_HASH_API void PHP_SALSAUpdate(PHP_SALSA_CTX *, const unsigned char *, 
uint);
+PHP_HASH_API void PHP_SALSAUpdate(PHP_SALSA_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_SALSAFinal(unsigned char[64], PHP_SALSA_CTX *);
 
 #endif
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_snefru.h?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/hash/php_hash_snefru.h
diff -u php-src/ext/hash/php_hash_snefru.h:1.2.2.2 
php-src/ext/hash/php_hash_snefru.h:1.2.2.3
--- php-src/ext/hash/php_hash_snefru.h:1.2.2.2  Thu Dec  1 20:59:45 2005
+++ php-src/ext/hash/php_hash_snefru.h  Sat Dec  3 18:50:33 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_snefru.h,v 1.2.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash_snefru.h,v 1.2.2.3 2005/12/03 23:50:33 tony2001 Exp $ */
 
 #ifndef PHP_HASH_SNEFRU_H
 #define PHP_HASH_SNEFRU_H
@@ -36,7 +36,7 @@
 } PHP_SNEFRU_CTX;
 
 PHP_HASH_API void PHP_SNEFRUInit(PHP_SNEFRU_CTX *);
-PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *, const unsigned char *, 
uint);
+PHP_HASH_API void PHP_SNEFRUUpdate(PHP_SNEFRU_CTX *, const unsigned char *, 
size_t);
 PHP_HASH_API void PHP_SNEFRUFinal(unsigned char[32], PHP_SNEFRU_CTX *);
 
 #endif
http://cvs.php.net/diff.php/php-src/ext/hash/php_hash_whirlpool.h?r1=1.2.2.2r2=1.2.2.3ty=u
Index: php-src/ext/hash/php_hash_whirlpool.h
diff -u php-src/ext/hash/php_hash_whirlpool.h:1.2.2.2 
php-src/ext/hash/php_hash_whirlpool.h:1.2.2.3
--- php-src/ext/hash/php_hash_whirlpool.h:1.2.2.2   Thu Dec  1 20:59:45 2005
+++ php-src/ext/hash/php_hash_whirlpool.h   Sat Dec  3 18:50:33 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_hash_whirlpool.h,v 1.2.2.2 2005/12/02 01:59:45 iliaa Exp $ */
+/* $Id: php_hash_whirlpool.h,v 1.2.2.3 2005/12/03 23:50:33 tony2001 Exp $ */
 
 #ifndef PHP_HASH_WHIRLPOOL_H
 #define PHP_HASH_WHIRLPOOL_H
@@ -33,7 +33,7 @@
 } PHP_WHIRLPOOL_CTX;
 
 PHP_HASH_API void PHP_WHIRLPOOLInit(PHP_WHIRLPOOL_CTX *);
-PHP_HASH_API void PHP_WHIRLPOOLUpdate(PHP_WHIRLPOOL_CTX *, const unsigned char 
*, uint);
+PHP_HASH_API void PHP_WHIRLPOOLUpdate(PHP_WHIRLPOOL_CTX *, const unsigned char 
*, size_t);
 PHP_HASH_API void PHP_WHIRLPOOLFinal(unsigned char[64], PHP_WHIRLPOOL_CTX *);
 
 #endif

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



[PHP-CVS] cvs: php-src /ext/xmlwriter config.m4

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 19:20:53 2005 EDT

  Modified files:  
/php-src/ext/xmlwriter  config.m4 
  Log:
  fix typos in xmlwriter/config.m4
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/config.m4?r1=1.6r2=1.7ty=u
Index: php-src/ext/xmlwriter/config.m4
diff -u php-src/ext/xmlwriter/config.m4:1.6 php-src/ext/xmlwriter/config.m4:1.7
--- php-src/ext/xmlwriter/config.m4:1.6 Fri Dec  2 20:06:36 2005
+++ php-src/ext/xmlwriter/config.m4 Sat Dec  3 19:20:52 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.6 2005/12/03 01:06:36 sniper Exp $
+dnl $Id: config.m4,v 1.7 2005/12/04 00:20:52 tony2001 Exp $
 dnl
 
 PHP_ARG_ENABLE(xmlwriter, whether to enable XMLWriter support,
@@ -13,10 +13,10 @@
 if test $PHP_XMLWRITER != no; then
 
   if test $PHP_LIBXML = no; then
-AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add 
--enable-libxml])
+AC_MSG_ERROR([XMLWriter extension requires LIBXML extension, add 
--enable-libxml])
   fi
 
-  PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
+  PHP_SETUP_LIBXML(XMLWRITER_SHARED_LIBADD, [
 AC_DEFINE(HAVE_XMLWRITER,1,[ ])
 PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared)
 PHP_SUBST(XMLWRITER_SHARED_LIBADD)

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



[PHP-CVS] cvs: php-src(PHP_5_1) /ext/xmlwriter config.m4

2005-12-03 Thread Antony Dovgal
tony2001Sat Dec  3 19:21:39 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/xmlwriter  config.m4 
  Log:
  MFH: fix typos in xmlwriter/config.m4
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/config.m4?r1=1.4.2.5r2=1.4.2.6ty=u
Index: php-src/ext/xmlwriter/config.m4
diff -u php-src/ext/xmlwriter/config.m4:1.4.2.5 
php-src/ext/xmlwriter/config.m4:1.4.2.6
--- php-src/ext/xmlwriter/config.m4:1.4.2.5 Fri Dec  2 20:07:00 2005
+++ php-src/ext/xmlwriter/config.m4 Sat Dec  3 19:21:39 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.4.2.5 2005/12/03 01:07:00 sniper Exp $
+dnl $Id: config.m4,v 1.4.2.6 2005/12/04 00:21:39 tony2001 Exp $
 dnl
 
 PHP_ARG_ENABLE(xmlwriter, whether to enable XMLWriter support,
@@ -13,10 +13,10 @@
 if test $PHP_XMLWRITER != no; then
 
   if test $PHP_LIBXML = no; then
-AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add 
--enable-libxml])
+AC_MSG_ERROR([XMLWriter extension requires LIBXML extension, add 
--enable-libxml])
   fi
 
-  PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
+  PHP_SETUP_LIBXML(XMLWRITER_SHARED_LIBADD, [
 AC_DEFINE(HAVE_XMLWRITER,1,[ ])
 PHP_NEW_EXTENSION(xmlwriter, php_xmlwriter.c, $ext_shared)
 PHP_SUBST(XMLWRITER_SHARED_LIBADD)

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