[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests strtotime3.phpt
nlopess Sat Jun 17 10:30:23 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests strtotime3.phpt
Log:
change the timezone used (per Derick request)
add one string I missed yesterday. Now every strotime() rule is covered
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/date/tests/strtotime3.phpt
diff -u php-src/ext/date/tests/strtotime3.phpt:1.1.2.1
php-src/ext/date/tests/strtotime3.phpt:1.1.2.2
--- php-src/ext/date/tests/strtotime3.phpt:1.1.2.1 Fri Jun 16 22:46:57 2006
+++ php-src/ext/date/tests/strtotime3.phpt Sat Jun 17 10:30:23 2006
@@ -2,7 +2,7 @@
strtotime() function
--FILE--
?php
-date_default_timezone_set('Portugal');
+date_default_timezone_set('Europe/Lisbon');
$time = 1150494719; // 16/June/2006
$strs = array(
@@ -27,6 +27,7 @@
'10/Oct/2000:13:55:36 +0100', //clf
'10/Oct/2000:13:55:36 +00100', //clf
'2006',
+ '1986', // year
'JAN',
'January',
);
@@ -63,5 +64,6 @@
string(31) Tue, 10 Oct 2000 13:55:36 +0100
bool(false)
string(31) Fri, 16 Jun 2006 20:06:00 +0100
+string(31) Mon, 16 Jun 1986 22:51:59 +0100
string(31) Mon, 16 Jan 2006 00:00:00 +
string(31) Mon, 16 Jan 2006 00:00:00 +
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests strtotime3.phpt
nlopess Sat Jun 17 10:31:21 2006 UTC
Modified files:
/php-src/ext/date/tests strtotime3.phpt
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/date/tests/strtotime3.phpt
diff -u php-src/ext/date/tests/strtotime3.phpt:1.2
php-src/ext/date/tests/strtotime3.phpt:1.3
--- php-src/ext/date/tests/strtotime3.phpt:1.2 Fri Jun 16 22:48:29 2006
+++ php-src/ext/date/tests/strtotime3.phpt Sat Jun 17 10:31:21 2006
@@ -2,7 +2,7 @@
strtotime() function
--FILE--
?php
-date_default_timezone_set('Portugal');
+date_default_timezone_set('Europe/Lisbon');
$time = 1150494719; // 16/June/2006
$strs = array(
@@ -27,6 +27,7 @@
'10/Oct/2000:13:55:36 +0100', //clf
'10/Oct/2000:13:55:36 +00100', //clf
'2006',
+ '1986', // year
'JAN',
'January',
);
@@ -63,5 +64,6 @@
string(31) Tue, 10 Oct 2000 13:55:36 +0100
bool(false)
string(31) Fri, 16 Jun 2006 20:06:00 +0100
+string(31) Mon, 16 Jun 1986 22:51:59 +0100
string(31) Mon, 16 Jan 2006 00:00:00 +
string(31) Mon, 16 Jan 2006 00:00:00 +
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date/tests strtotime-mysql.phpt strtotime2.phpt strtotime3.phpt
On Fri, 16 Jun 2006, Nuno Lopes wrote:
+++ php-src/ext/date/tests/strtotime3.phpt Fri Jun 16 22:48:29 2006
@@ -0,0 +1,67 @@
+--TEST--
+strtotime() function
+--FILE--
+?php
+date_default_timezone_set('Portugal');
Please use the new names here... not the old bc ones. Europe/Lisbon
would be the one to pick.
regards,
Derick
Fixed.
Thanks,
Nuno
--
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) / configure.in /sapi/cgi cgi_main.c
nlopess Sat Jun 17 11:08:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcconfigure.in
/php-src/sapi/cgi cgi_main.c
Log:
plug memory leak in sapi_putenv, by using setenv(), that doesnt need any
malloc
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.52.2.1r2=1.579.2.52.2.2diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.1 php-src/configure.in:1.579.2.52.2.2
--- php-src/configure.in:1.579.2.52.2.1 Sat May 6 21:58:03 2006
+++ php-src/configure.inSat Jun 17 11:08:05 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.1 2006/05/06 21:58:03 iliaa Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.2 2006/06/17 11:08:05 nlopess Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -505,6 +505,7 @@
setitimer \
setlocale \
localeconv \
+setenv \
setpgid \
setsockopt \
setvbuf \
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.5r2=1.267.2.15.2.6diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.5
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.6
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.5 Tue Jun 13 14:22:46 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Jun 17 11:08:05 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.5 2006/06/13 14:22:46 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.6 2006/06/17 11:08:05 nlopess Exp $ */
#include php.h
#include php_globals.h
@@ -405,6 +405,18 @@
return fcgi_putenv(request, name, name_len, value);
}
#endif
+#if HAVE_SETENV
+ if (value) {
+ setenv(name, value, 1);
+ }
+#endif
+#if HAVE_UNSETENV
+ if (!value) {
+ unsetenv(name);
+ }
+#endif
+
+#if !HAVE_SETENV || !HAVE_UNSETENV
/* if cgi, or fastcgi and not found in fcgi env
check the regular environment
this leaks, but it's only cgi anyway, we'll fix
@@ -415,12 +427,19 @@
if (buf == NULL) {
return getenv(name);
}
+#endif
+#if !HAVE_SETENV
if (value) {
len = snprintf(buf, len - 1, %s=%s, name, value);
- } else {
+ putenv(buf);
+ }
+#endif
+#if !HAVE_UNSETENV
+ if (!value) {
len = snprintf(buf, len - 1, %s=, name);
+ putenv(buf);
}
- putenv(buf);
+#endif
return getenv(name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /sapi/cgi cgi_main.c
nlopess Sat Jun 17 11:14:21 2006 UTC
Modified files:
/php-srcconfigure.in
/php-src/sapi/cgi cgi_main.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.603r2=1.604diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.603 php-src/configure.in:1.604
--- php-src/configure.in:1.603 Mon Apr 10 12:16:08 2006
+++ php-src/configure.inSat Jun 17 11:14:21 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.604 2006/06/17 11:14:21 nlopess Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -502,6 +502,7 @@
setitimer \
setlocale \
localeconv \
+setenv \
setpgid \
setsockopt \
setvbuf \
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.292r2=1.293diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.292 php-src/sapi/cgi/cgi_main.c:1.293
--- php-src/sapi/cgi/cgi_main.c:1.292 Tue Jun 13 14:22:27 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Jun 17 11:14:21 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.292 2006/06/13 14:22:27 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.293 2006/06/17 11:14:21 nlopess Exp $ */
#include php.h
#include php_globals.h
@@ -385,6 +385,18 @@
return fcgi_putenv(request, name, name_len, value);
}
+#if HAVE_SETENV
+ if (value) {
+ setenv(name, value, 1);
+ }
+#endif
+#if HAVE_UNSETENV
+ if (!value) {
+ unsetenv(name);
+ }
+#endif
+
+#if !HAVE_SETENV || !HAVE_UNSETENV
/* if cgi, or fastcgi and not found in fcgi env
check the regular environment
this leaks, but it's only cgi anyway, we'll fix
@@ -395,12 +407,19 @@
if (buf == NULL) {
return getenv(name);
}
+#endif
+#if !HAVE_SETENV
if (value) {
len = snprintf(buf, len - 1, %s=%s, name, value);
- } else {
+ putenv(buf);
+ }
+#endif
+#if !HAVE_UNSETENV
+ if (!value) {
len = snprintf(buf, len - 1, %s=, name);
+ putenv(buf);
}
- putenv(buf);
+#endif
return getenv(name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests strtotime-mysql.phpt strtotime2.phpt strtotime3.phpt
bjori Sat Jun 17 12:48:20 2006 UTC Modified files: /php-src/ext/date/tests strtotime-mysql.phpt strtotime2.phpt strtotime3.phpt Log: Fixed tests http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime-mysql.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/date/tests/strtotime-mysql.phpt diff -u php-src/ext/date/tests/strtotime-mysql.phpt:1.2 php-src/ext/date/tests/strtotime-mysql.phpt:1.3 --- php-src/ext/date/tests/strtotime-mysql.phpt:1.2 Fri Jun 16 22:48:29 2006 +++ php-src/ext/date/tests/strtotime-mysql.phpt Sat Jun 17 12:48:20 2006 @@ -23,3 +23,7 @@ string(31) Fri, 23 May 1997 09:15:28 + string(31) Sun, 31 Dec 2000 18:58:59 + bool(false) +--UEXPECT-- +unicode(31) Fri, 23 May 1997 09:15:28 + +unicode(31) Sun, 31 Dec 2000 18:58:59 + +bool(false) http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime2.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/date/tests/strtotime2.phpt diff -u php-src/ext/date/tests/strtotime2.phpt:1.2 php-src/ext/date/tests/strtotime2.phpt:1.3 --- php-src/ext/date/tests/strtotime2.phpt:1.2 Fri Jun 16 22:48:29 2006 +++ php-src/ext/date/tests/strtotime2.phpt Sat Jun 17 12:48:20 2006 @@ -2,6 +2,8 @@ strtotime() on date constants --FILE-- ?php + +date_default_timezone_set(Europe/Oslo); $time = time(); $constants = array( http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime3.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/date/tests/strtotime3.phpt diff -u php-src/ext/date/tests/strtotime3.phpt:1.3 php-src/ext/date/tests/strtotime3.phpt:1.4 --- php-src/ext/date/tests/strtotime3.phpt:1.3 Sat Jun 17 10:31:21 2006 +++ php-src/ext/date/tests/strtotime3.phpt Sat Jun 17 12:48:20 2006 @@ -67,3 +67,28 @@ string(31) Mon, 16 Jun 1986 22:51:59 +0100 string(31) Mon, 16 Jan 2006 00:00:00 + string(31) Mon, 16 Jan 2006 00:00:00 + +--UEXPECT-- +bool(false) +bool(false) +unicode(31) Thu, 15 Jun 2006 00:00:00 +0100 +unicode(31) Fri, 16 Jun 2006 22:49:12 +0100 +bool(false) +unicode(31) Fri, 16 Jun 2006 23:49:12 +0100 +bool(false) +unicode(31) Fri, 16 Jun 2006 02:22:00 +0100 +bool(false) +unicode(31) Fri, 16 Jun 2006 02:22:33 +0100 +bool(false) +unicode(31) Tue, 02 Mar 2004 00:00:00 + +unicode(31) Tue, 02 Mar 2004 00:00:00 + +unicode(31) Sun, 12 Feb 2006 23:12:23 + +bool(false) +unicode(31) Fri, 16 Jun 2006 00:00:00 +0100 +unicode(31) Sun, 15 Jan 2006 00:00:00 + +unicode(31) Sun, 15 Jan 2006 00:00:00 + +unicode(31) Tue, 10 Oct 2000 13:55:36 +0100 +bool(false) +unicode(31) Fri, 16 Jun 2006 20:06:00 +0100 +unicode(31) Mon, 16 Jun 1986 22:51:59 +0100 +unicode(31) Mon, 16 Jan 2006 00:00:00 + +unicode(31) Mon, 16 Jan 2006 00:00:00 + -- 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/date/tests strtotime2.phpt
bjori Sat Jun 17 12:51:02 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date/tests strtotime2.phpt Log: Fix test http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/strtotime2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/date/tests/strtotime2.phpt diff -u php-src/ext/date/tests/strtotime2.phpt:1.1.2.1 php-src/ext/date/tests/strtotime2.phpt:1.1.2.2 --- php-src/ext/date/tests/strtotime2.phpt:1.1.2.1 Fri Jun 16 22:46:57 2006 +++ php-src/ext/date/tests/strtotime2.phpt Sat Jun 17 12:51:02 2006 @@ -2,6 +2,8 @@ strtotime() on date constants --FILE-- ?php + +date_default_timezone_set(Europe/Oslo); $time = time(); $constants = array( -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash hash.c /ext/iconv iconv.c /ext/libxml libxml.c
bjori Sat Jun 17 13:00:21 2006 UTC
Modified files:
/php-src/ext/iconv iconv.c
/php-src/ext/hash hash.c
/php-src/ext/libxml libxml.c
Log:
Added argument info
Fixed protos
Fixed vim folding
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/iconv.c?r1=1.136r2=1.137diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.136 php-src/ext/iconv/iconv.c:1.137
--- php-src/ext/iconv/iconv.c:1.136 Tue Jun 13 15:57:46 2006
+++ php-src/ext/iconv/iconv.c Sat Jun 17 13:00:20 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.136 2006/06/13 15:57:46 andrei Exp $ */
+/* $Id: iconv.c,v 1.137 2006/06/17 13:00:20 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -62,20 +62,97 @@
#define _php_iconv_memequal(a, b, c) \
((c) == sizeof(unsigned long) ? *((unsigned long *)(a)) == *((unsigned long
*)(b)) : ((c) == sizeof(unsigned int) ? *((unsigned int *)(a)) == *((unsigned
int *)(b)) : memcmp(a, b, c) == 0))
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strlen, 0, 0, 1)
+ ZEND_ARG_INFO(0, str)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_substr, 0, 0, 2)
+ ZEND_ARG_INFO(0, str)
+ ZEND_ARG_INFO(0, offset)
+ ZEND_ARG_INFO(0, length)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strpos, 0, 0, 2)
+ ZEND_ARG_INFO(0, haystack)
+ ZEND_ARG_INFO(0, needle)
+ ZEND_ARG_INFO(0, offset)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strrpos, 0, 0, 2)
+ ZEND_ARG_INFO(0, haystack)
+ ZEND_ARG_INFO(0, needle)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_encode, 0, 0, 2)
+ ZEND_ARG_INFO(0, field_name)
+ ZEND_ARG_INFO(0, field_value)
+ ZEND_ARG_INFO(0, preference) /* ZEND_ARG_ARRAY_INFO(0, preference, 1) */
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode, 0, 0, 1)
+ ZEND_ARG_INFO(0, encoded_string)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode_headers, 0, 0, 1)
+ ZEND_ARG_INFO(0, headers)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_iconv, 0)
+ ZEND_ARG_INFO(0, in_charset)
+ ZEND_ARG_INFO(0, out_charset)
+ ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ob_iconv_handler, 0)
+ ZEND_ARG_INFO(0, contents)
+ ZEND_ARG_INFO(0, status)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_iconv_set_encoding, 0)
+ ZEND_ARG_INFO(0, type)
+ ZEND_ARG_INFO(0, charset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_get_encoding, 0, 0, 0)
+ ZEND_ARG_INFO(0, type)
+ZEND_END_ARG_INFO()
+
+/* }}} */
+
/* {{{ iconv_functions[]
*/
zend_function_entry iconv_functions[] = {
- PHP_NAMED_FE(iconv,php_if_iconv,NULL)
- PHP_FE(ob_iconv_handler,
NULL)
- PHP_FE(iconv_get_encoding,
NULL)
- PHP_FE(iconv_set_encoding,
NULL)
- PHP_FE(iconv_strlen,
NULL)
- PHP_FE(iconv_substr,
NULL)
- PHP_FE(iconv_strpos,
NULL)
- PHP_FE(iconv_strrpos,
NULL)
- PHP_FE(iconv_mime_encode,
NULL)
- PHP_FE(iconv_mime_decode,
NULL)
- PHP_FE(iconv_mime_decode_headers, NULL)
+ PHP_NAMED_FE(iconv,php_if_iconv,
arginfo_iconv)
+ PHP_FE(ob_iconv_handler,
arginfo_ob_iconv_handler)
+ PHP_FE(iconv_get_encoding,
arginfo_iconv_get_encoding)
+ PHP_FE(iconv_set_encoding,
arginfo_iconv_set_encoding)
+ PHP_FE(iconv_strlen,
arginfo_iconv_strlen)
+ PHP_FE(iconv_substr,
arginfo_iconv_substr)
+ PHP_FE(iconv_strpos,
arginfo_iconv_strpos)
+ PHP_FE(iconv_strrpos,
arginfo_iconv_strrpos)
+
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/hash hash.c /ext/iconv iconv.c /ext/libxml libxml.c
bjori Sat Jun 17 13:06:06 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c
/php-src/ext/hash hash.c
/php-src/ext/iconv iconv.c
Log:
MFH: arg ifno
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.2r2=1.32.2.7.2.3diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.2
php-src/ext/libxml/libxml.c:1.32.2.7.2.3
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.2Thu Jun 15 18:33:07 2006
+++ php-src/ext/libxml/libxml.c Sat Jun 17 13:06:06 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.2 2006/06/15 18:33:07 dmitry Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.3 2006/06/17 13:06:06 bjori Exp $ */
#define IS_EXT_MODULE
@@ -83,13 +83,38 @@
/* }}} */
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_set_streams_context, 0)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0)
+ ZEND_ARG_INFO(0, use_errors)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_last_error, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_errors, 0)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
+ZEND_END_ARG_INFO()
+
+/* }}} */
+
/* {{{ extension definition structures */
zend_function_entry libxml_functions[] = {
- PHP_FE(libxml_set_streams_context, NULL)
- PHP_FE(libxml_use_internal_errors, NULL)
- PHP_FE(libxml_get_last_error, NULL)
- PHP_FE(libxml_clear_errors, NULL)
- PHP_FE(libxml_get_errors, NULL)
+ PHP_FE(libxml_set_streams_context, arginfo_libxml_set_streams_context)
+ PHP_FE(libxml_use_internal_errors, arginfo_libxml_use_internal_errors)
+ PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error)
+ PHP_FE(libxml_clear_errors, arginfo_libxml_clear_errors)
+ PHP_FE(libxml_get_errors, arginfo_libxml_get_errors)
{NULL, NULL, NULL}
};
@@ -674,7 +699,7 @@
}
/* }}} */
-/* {{{ proto void libxml_use_internal_errors(boolean use_errors)
+/* {{{ proto void libxml_use_internal_errors([boolean use_errors])
Disable libxml errors and allow user to fetch error information as needed */
PHP_FUNCTION(libxml_use_internal_errors)
{
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.1r2=1.18.2.5.2.2diff_format=u
Index: php-src/ext/hash/hash.c
diff -u php-src/ext/hash/hash.c:1.18.2.5.2.1
php-src/ext/hash/hash.c:1.18.2.5.2.2
--- php-src/ext/hash/hash.c:1.18.2.5.2.1Fri May 19 14:19:27 2006
+++ php-src/ext/hash/hash.c Sat Jun 17 13:06:06 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: hash.c,v 1.18.2.5.2.1 2006/05/19 14:19:27 mike Exp $ */
+/* $Id: hash.c,v 1.18.2.5.2.2 2006/06/17 13:06:06 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -596,32 +596,130 @@
}
/* }}} */
+/* {{{ arginfo */
+#ifdef PHP_HASH_MD5_NOT_IN_CORE
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5, 0, 0, 1)
+ ZEND_ARG_INFO(0, str)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_md5_file, 0, 0, 1)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+#endif
+
+#ifdef PHP_HASH_SHA1_NOT_IN_CORE
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1, 0, 0, 1)
+ ZEND_ARG_INFO(0, str)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_sha1_file, 0, 0, 1)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash, 0, 0, 2)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, data)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_file, 0, 0, 2)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac, 0, 0, 3)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, data)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac_file, 0, 0, 3)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, key)
+ ZEND_ARG_INFO(0, raw_output)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_init, 0, 0, 1)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, key)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_hash_update, 0)
+ ZEND_ARG_INFO(0, context)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_stream, 0, 0, 2)
+ ZEND_ARG_INFO(0,
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
bjori Sat Jun 17 13:15:37 2006 UTC Modified files: /php-src/ext/libxml libxml.c Log: Revert accidental libxml class property declaration.. http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.47r2=1.48diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.47 php-src/ext/libxml/libxml.c:1.48 --- php-src/ext/libxml/libxml.c:1.47Sat Jun 17 13:00:21 2006 +++ php-src/ext/libxml/libxml.c Sat Jun 17 13:15:37 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.47 2006/06/17 13:00:21 bjori Exp $ */ +/* $Id: libxml.c,v 1.48 2006/06/17 13:15:37 bjori Exp $ */ #define IS_EXT_MODULE @@ -628,12 +628,6 @@ INIT_CLASS_ENTRY(ce, LibXMLError, NULL); libxmlerror_class_entry = zend_register_internal_class(ce TSRMLS_CC); -zend_declare_property_long(libxmlerror_class_entry, code, sizeof(code)-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -zend_declare_property_long(libxmlerror_class_entry, level, sizeof(level)-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -zend_declare_property_long(libxmlerror_class_entry, column, sizeof(column)-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -zend_declare_property_string(libxmlerror_class_entry, message, sizeof(message)-1, , ZEND_ACC_PUBLIC TSRMLS_CC); -zend_declare_property_string(libxmlerror_class_entry, file, sizeof(file)-1, , ZEND_ACC_PUBLIC TSRMLS_CC); -zend_declare_property_long(libxmlerror_class_entry, line, sizeof(line)-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
