[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Sep 23 20:32:11 2003 EDT Modified files: /php-srcChangeLog Log: ChangeLog update Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1396 php-src/ChangeLog:1.1397 --- php-src/ChangeLog:1.1396Mon Sep 22 20:32:04 2003 +++ php-src/ChangeLog Tue Sep 23 20:32:10 2003 @@ -1,3 +1,135 @@ +2003-09-23 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/interbase/interbase.c: + Always return long from ibase_gen_id() on IB 6 + +2003-09-23 Jani Taskinen [EMAIL PROTECTED] + +* ext/interbase/interbase.c: + ws fix + +2003-09-23 Ard Biesheuvel [EMAIL PROTECTED] + +* NEWS: + Added ibase_gen_id() + +* ext/interbase/interbase.c + ext/interbase/php_interbase.h: + Added ibase_gen_id() + +2003-09-23 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/mbstring/php_mbregex.c: + Remove useless mutex code due to the switch to oniguruma. + +2003-09-23 Jani Taskinen [EMAIL PROTECTED] + +* ext/openssl/openssl.c: + Fixed typo. + +2003-09-23 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + ext/snmp/snmp.c: + MFH: Fixed bug #25636 (SNMP Session not closed on success). + +* ext/snmp/snmp.c: + Fixed bug #25636 (SNMP Session not closed on success). + Patch by: nesslage[at]mwsc[dot]edu + +2003-09-23 Andrey Hristov [EMAIL PROTECTED] + +* ext/standard/tests/array/007.phpt: + New test cases for the new 4 functions : + - array_udiff() + - array_udiff_assoc() + - array_diff_uassoc() + - array_udiff_uassoc() + +* ext/standard/array.c + ext/standard/basic_functions.c + ext/standard/php_array.h: + 4 new functions : + array_udiff() + array_udiff_assoc() + array_diff_uassoc() + array_udiff_uassoc() + They work like array_diff() or array_diff_assoc() but callback function(s) + can be used to perform the comparisons. For example array_udiff_uassoc() + expects 2 callbacks are last 2 parameters one is used to compare the + values + of the entries in the arrays the second to compare the keys. + Class methods are also valid callbacks. Even when the data that should be + used in the comparison is private or protected then a static method of a + class should be used (this behaviour can be seen in the regression test - + 007.phpt). + +2003-09-23 Wez Furlong [EMAIL PROTECTED] + +* ext/openssl/openssl.c + ext/openssl/tests/bug25614.phpt: + MFB 25614 fix + +2003-09-23 Jani Taskinen [EMAIL PROTECTED] + +* main/internal_functions.c.in: + Removed unnecessary ssl.h include + +2003-09-23 Wez Furlong [EMAIL PROTECTED] + +* ext/openssl/tests/bug25614.phpt + ext/openssl/tests/bug25614.phpt: + + file bug25614.phpt was initially added on branch PHP_4_3. + +* (PHP_4_3) + ext/openssl/openssl.c: + Fix for bug #25614. + The openssl_pkey_get_public() doesn't work as advertized in the docs; it + can't + get a public key from a private key (because a key is a key), but would + return + the private key anyway. The function was originally designed to get the + public + key from a certificate. + +2003-09-23 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/mbstring/mbstring.c: + Oops + +* ext/mbstring/mbstring.c: + Remove unused variable + +2003-09-23 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + ext/snmp/config.m4: + MFH: - Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build) + +* ext/snmp/config.m4: + - Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build) + +2003-09-23 Rui Hirokawa [EMAIL PROTECTED] + +* (PHP_4_3) + ext/mbstring/php_mbregex.c: + removed unnessesary null byte (patched by komura). + +* ext/mbstring/php_mbregex.c: + fixed wrong string length in mbregex. + +* ext/mbstring/config.m4: + revert a patch. + +* ext/mbstring/config.m4 + ext/mbstring/mbstring.c + ext/mbstring/mbstring.dsp + ext/mbstring/php_mbregex.c: + fixed win32-build and update e-mail address in mbstring. + 2003-09-22 Ilia Alshanetsky [EMAIL PROTECTED] * ext/exif/exif.c
[PHP-CVS] cvs: php-src /ext/snmp config.m4
sniper Tue Sep 23 04:15:50 2003 EDT Modified files: /php-src/ext/snmp config.m4 Log: - Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build) Index: php-src/ext/snmp/config.m4 diff -u php-src/ext/snmp/config.m4:1.30 php-src/ext/snmp/config.m4:1.31 --- php-src/ext/snmp/config.m4:1.30 Tue Jun 24 10:05:24 2003 +++ php-src/ext/snmp/config.m4 Tue Sep 23 04:15:49 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.30 2003/06/24 14:05:24 sniper Exp $ +dnl $Id: config.m4,v 1.31 2003/09/23 08:15:49 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -101,8 +101,15 @@ SNMP_LIBNAME=snmp fi - AC_CHECK_FUNCS(snmp_parse_oid) + dnl Check whether snmp_parse_oid() exists. + PHP_CHECK_LIBRARY($SNMP_LIBNAME, snmp_parse_oid, + [ +AC_DEFINE(HAVE_SNMP_PARSE_OID, 1, [ ]) + ], [], [ +$SNMP_SHARED_LIBADD + ]) + dnl Test build. PHP_CHECK_LIBRARY($SNMP_LIBNAME, init_snmp, [ AC_DEFINE(HAVE_SNMP,1,[ ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/snmp config.m4
sniper Tue Sep 23 04:16:48 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/snmp config.m4 Log: MFH: - Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build) Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.401 php-src/NEWS:1.1247.2.402 --- php-src/NEWS:1.1247.2.401 Fri Sep 19 22:52:44 2003 +++ php-src/NEWSTue Sep 23 04:16:46 2003 @@ -7,6 +7,7 @@ - Fixed crash bug when non-existing save/serializer handler was used. (Jani) - Fixed memory leak in gethostbynamel() if an error occurs. (Sara) - Fixed FastCGI being unable to bind to a specific IP. (Sascha) +- Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build). (Jani) - Fixed bug #25583 (Incorrect handling of paths starting with / on win32 inside glob() function). (Ilia) - Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called Index: php-src/ext/snmp/config.m4 diff -u php-src/ext/snmp/config.m4:1.28.2.2 php-src/ext/snmp/config.m4:1.28.2.3 --- php-src/ext/snmp/config.m4:1.28.2.2 Wed Aug 27 13:57:31 2003 +++ php-src/ext/snmp/config.m4 Tue Sep 23 04:16:47 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.2 2003/08/27 17:57:31 sniper Exp $ +dnl $Id: config.m4,v 1.28.2.3 2003/09/23 08:16:47 sniper Exp $ dnl PHP_ARG_WITH(snmp,for SNMP support, @@ -101,8 +101,15 @@ SNMP_LIBNAME=snmp fi - AC_CHECK_FUNCS(snmp_parse_oid) + dnl Check whether snmp_parse_oid() exists. + PHP_CHECK_LIBRARY($SNMP_LIBNAME, snmp_parse_oid, + [ +AC_DEFINE(HAVE_SNMP_PARSE_OID, 1, [ ]) + ], [], [ +$SNMP_SHARED_LIBADD + ]) + dnl Test build. PHP_CHECK_LIBRARY($SNMP_LIBNAME, init_snmp, [ AC_DEFINE(HAVE_SNMP,1,[ ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext/tests .cvsignore gettext_basic.phpt /ext/gettext/tests/locale/fi/LC_MESSAGES messages.mo messages.po
sniper Tue Sep 23 06:00:24 2003 EDT Added files: /php-src/ext/gettext/tests .cvsignore gettext_basic.phpt /php-src/ext/gettext/tests/locale/fi/LC_MESSAGESmessages.mo messages.po Log: Added simple test for gettext Index: php-src/ext/gettext/tests/.cvsignore +++ php-src/ext/gettext/tests/.cvsignore phpt.* *.diff *.log *.exp *.out *.php Index: php-src/ext/gettext/tests/gettext_basic.phpt +++ php-src/ext/gettext/tests/gettext_basic.phpt --TEST-- Gettext basic test --SKIPIF-- ?php if (!extension_loaded(gettext)) print skip; ? --FILE-- ?php // $Id: gettext_basic.phpt,v 1.1 2003/09/23 10:00:23 sniper Exp $ chdir(dirname(__FILE__)); setlocale(LC_ALL, 'fi_FI'); bindtextdomain (messages, ./locale); textdomain (messages); echo gettext(Basic test), \n; echo _(Basic test), \n; ? --EXPECT-- Perustesti Perustesti Index: php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo +++ php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo Þ ,P Q_\ ¼Basic testMIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Perustesti Index: php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po +++ php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # #, fuzzy msgid msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=ISO-8859-1\n Content-Transfer-Encoding: 8bit\n #: gettext_basic.phpt:11 msgid Basic test msgstr Perustesti -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext/tests/locale/fi/LC_MESSAGES messages.mo
sniper Tue Sep 23 06:05:48 2003 EDT Removed files: /php-src/ext/gettext/tests/locale/fi/LC_MESSAGESmessages.mo Log: remove corrupt file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext/tests/locale/fi/LC_MESSAGES messages.mo
sniper Tue Sep 23 06:06:20 2003 EDT Modified files: /php-src/ext/gettext/tests/locale/fi/LC_MESSAGESmessages.mo Log: add as binary.. Index: php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] email address at php.net
On Tue, 23 Sep 2003, Adrian Ciutureanu wrote: I created an e-mail address ([EMAIL PROTECTED]) about 2 years ago and I forgot where I can reconfigure (address where it forwards) OR where I can delete that address. I'm not sure, but I think I created it in the same time with my CVS account. I receive tones of SPAM on that address :(( You can change it here: http://master.php.net/manage/users.php Derick -- Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails. - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
moriyoshi Tue Sep 23 09:21:02 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Remove unused variable
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.196 php-src/ext/mbstring/mbstring.c:1.197
--- php-src/ext/mbstring/mbstring.c:1.196 Mon Sep 22 22:43:04 2003
+++ php-src/ext/mbstring/mbstring.c Tue Sep 23 09:21:01 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.196 2003/09/23 02:43:04 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.197 2003/09/23 13:21:01 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -931,8 +931,6 @@
/* {{{ PHP_MINFO_FUNCTION(mbstring) */
PHP_MINFO_FUNCTION(mbstring)
{
- char buf[32];
-
php_info_print_table_start();
php_info_print_table_row(2, Multibyte Support, enabled);
php_info_print_table_row(2, Multibyte string engine, libmbfl);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
moriyoshi Tue Sep 23 09:23:31 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Oops
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.197 php-src/ext/mbstring/mbstring.c:1.198
--- php-src/ext/mbstring/mbstring.c:1.197 Tue Sep 23 09:21:01 2003
+++ php-src/ext/mbstring/mbstring.c Tue Sep 23 09:23:30 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.197 2003/09/23 13:21:01 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.198 2003/09/23 13:23:30 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -953,10 +953,13 @@
php_info_print_table_row(2, HTTP input encoding translation,
enabled);
}
#if defined(HAVE_MBREGEX)
- php_info_print_table_row(2, Multibyte (japanese) regex support, enabled);
- sprintf(buf, %d.%d.%d,
+ {
+ char buf[32];
+ php_info_print_table_row(2, Multibyte (japanese) regex support,
enabled);
+ sprintf(buf, %d.%d.%d,
ONIGURUMA_VERSION_MAJOR,ONIGURUMA_VERSION_MINOR,ONIGURUMA_VERSION_TEENY);
- php_info_print_table_row(2, Multibyte regex (oniguruma) version, buf);
+ php_info_print_table_row(2, Multibyte regex (oniguruma) version,
buf);
+ }
#endif
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/openssl openssl.c /ext/openssl/tests bug25614.phpt
wez Tue Sep 23 10:52:27 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/openssl/tests bug25614.phpt
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Fix for bug #25614.
The openssl_pkey_get_public() doesn't work as advertized in the docs; it can't
get a public key from a private key (because a key is a key), but would return
the private key anyway. The function was originally designed to get the public
key from a certificate.
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.15 php-src/ext/openssl/openssl.c:1.52.2.16
--- php-src/ext/openssl/openssl.c:1.52.2.15 Sun Jul 13 06:13:19 2003
+++ php-src/ext/openssl/openssl.c Tue Sep 23 10:52:25 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.52.2.15 2003/07/13 10:13:19 sr Exp $ */
+/* $Id: openssl.c,v 1.52.2.16 2003/09/23 14:52:25 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1689,15 +1689,21 @@
free_cert = 0;
}
else if (type == le_key) {
+ int is_priv;
+
+ is_priv = php_openssl_is_private_key((EVP_PKEY*)what
TSRMLS_CC);
/* check whether it is actually a private key if requested */
- if (!public_key !php_openssl_is_private_key((EVP_PKEY*)what
TSRMLS_CC))
- {
+ if (!public_key !is_priv) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, supplied
key param is a public key);
return NULL;
}
-
- /* got the key - return it */
- return (EVP_PKEY*)what;
+ if (public_key is_priv) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Don't
know how to get public key from this private key (the documentation lied));
+ return NULL;
+ } else {
+ /* got the key - return it */
+ return (EVP_PKEY*)what;
+ }
}
/* other types could be used here - eg: file pointers and read in the
data from them */
Index: php-src/ext/openssl/tests/bug25614.phpt
+++ php-src/ext/openssl/tests/bug25614.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main internal_functions.c.in
sniper Tue Sep 23 12:04:04 2003 EDT Modified files: /php-src/main internal_functions.c.in Log: Removed unnecessary ssl.h include Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.25 php-src/main/internal_functions.c.in:1.26 --- php-src/main/internal_functions.c.in:1.25 Fri Jun 27 12:41:41 2003 +++ php-src/main/internal_functions.c.inTue Sep 23 12:04:03 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions.c.in,v 1.25 2003/06/27 16:41:41 sniper Exp $ */ +/* $Id: internal_functions.c.in,v 1.26 2003/09/23 16:04:03 sniper Exp $ */ #include php.h #include php_main.h @@ -27,12 +27,6 @@ #include stdarg.h #include stdlib.h #include stdio.h - -#ifdef HAVE_OPENSSL_EXT -/* zlib typedefs free_func which causes problems if the SSL includes happen - * after zlib.h is included */ -# include openssl/ssl.h -#endif @EXT_INCLUDE_CODE@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main internal_functions.c.in
sniper Tue Sep 23 12:04:56 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/main internal_functions.c.in Log: MFH: Removed unnecessary ssl.h include Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.22.4.1 php-src/main/internal_functions.c.in:1.22.4.2 --- php-src/main/internal_functions.c.in:1.22.4.1 Fri Jun 27 12:42:51 2003 +++ php-src/main/internal_functions.c.inTue Sep 23 12:04:55 2003 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions.c.in,v 1.22.4.1 2003/06/27 16:42:51 sniper Exp $ */ +/* $Id: internal_functions.c.in,v 1.22.4.2 2003/09/23 16:04:55 sniper Exp $ */ #include php.h #include php_main.h @@ -28,12 +28,6 @@ #include stdarg.h #include stdlib.h #include stdio.h - -#ifdef HAVE_OPENSSL_EXT -/* zlib typedefs free_func which causes problems if the SSL includes happen - * after zlib.h is included */ -# include openssl/ssl.h -#endif @EXT_INCLUDE_CODE@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c /ext/openssl/tests bug25614.phpt
wez Tue Sep 23 12:05:51 2003 EDT
Modified files:
/php-src/ext/opensslopenssl.c
/php-src/ext/openssl/tests bug25614.phpt
Log:
MFB 25614 fix
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.81 php-src/ext/openssl/openssl.c:1.82
--- php-src/ext/openssl/openssl.c:1.81 Sun Aug 31 16:45:42 2003
+++ php-src/ext/openssl/openssl.c Tue Sep 23 12:05:50 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.81 2003/08/31 20:45:42 iliaa Exp $ */
+/* $Id: openssl.c,v 1.82 2003/09/23 16:05:50 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1738,14 +1738,23 @@
cert = (X509*)what;
free_cert = 0;
} else if (type == le_key) {
+ int is_priv;
+
+ is_priv = php_openssl_is_private_key((EVP_PKEY*)what
TSRMLS_CC);
+
/* check whether it is actually a private key if requested */
- if (!public_key !php_openssl_is_private_key((EVP_PKEY*)what
TSRMLS_CC)) {
+ if (!public_key !ispriv) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, supplied
key param is a public key);
return NULL;
}
-
- /* got the key - return it */
- return (EVP_PKEY*)what;
+
+ if (public_key is_priv) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Don't
know how to get public key from this private key);
+ return NULL;
+ } else {
+ /* got the key - return it */
+ return (EVP_PKEY*)what;
+ }
}
/* other types could be used here - eg: file pointers and read in the
data from them */
Index: php-src/ext/openssl/tests/bug25614.phpt
diff -u /dev/null php-src/ext/openssl/tests/bug25614.phpt:1.2
--- /dev/null Tue Sep 23 12:05:51 2003
+++ php-src/ext/openssl/tests/bug25614.phpt Tue Sep 23 12:05:51 2003
@@ -0,0 +1,11 @@
+--TEST--
+openssl: get public key from generated private key
+--SKIPIF--
+?php if (!extension_loaded(openssl)) print skip; ?
+--FILE--
+?php
+$priv = openssl_pkey_new();
+$pub = openssl_pkey_get_public($priv);
+?
+--EXPECTF--
+Warning: openssl_pkey_get_public(): Don't know how to get public key from this
private key (the documentation lied) %s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c php_array.h
andrey Tue Sep 23 13:37:29 2003 EDT
Modified files:
/php-src/ext/standard array.c basic_functions.c php_array.h
Log:
4 new functions :
array_udiff()
array_udiff_assoc()
array_diff_uassoc()
array_udiff_uassoc()
They work like array_diff() or array_diff_assoc() but callback function(s)
can be used to perform the comparisons. For example array_udiff_uassoc()
expects 2 callbacks are last 2 parameters one is used to compare the values
of the entries in the arrays the second to compare the keys.
Class methods are also valid callbacks. Even when the data that should be
used in the comparison is private or protected then a static method of a
class should be used (this behaviour can be seen in the regression test -
007.phpt).
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.246 php-src/ext/standard/array.c:1.247
--- php-src/ext/standard/array.c:1.246 Mon Sep 22 19:19:17 2003
+++ php-src/ext/standard/array.cTue Sep 23 13:37:28 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.246 2003/09/22 23:19:17 andrey Exp $ */
+/* $Id: array.c,v 1.247 2003/09/23 17:37:28 andrey Exp $ */
#include php.h
#include php_ini.h
@@ -77,6 +77,10 @@
#define DIFF_NORMAL0
#define DIFF_ASSOC 1
+#define DIFF_COMP_DATA_INTERNAL 0
+#define DIFF_COMP_DATA_USER 1
+#define DIFF_COMP_KEY_INTERNAL 0
+#define DIFF_COMP_KEY_USER 1
#define INTERSECT_NORMAL 0
#define INTERSECT_ASSOC1
@@ -2866,29 +2870,147 @@
/* }}} */
-static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior)
+static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
data_compare_type, int key_compare_type)
{
zval ***args = NULL;
HashTable *hash;
- int argc, i, c;
+ int argc, arr_argc, i, c;
Bucket ***lists, **list, ***ptrs, *p;
+ char *callback_name;
+
+ zval **old_compare_func;
+ int (*diff_key_compare_func)(const void *, const void * TSRMLS_DC);
+ int (*diff_data_compare_func)(const void *, const void * TSRMLS_DC);
+
/* Get the argument count and check it */
argc = ZEND_NUM_ARGS();
- if (argc 2) {
- WRONG_PARAM_COUNT;
- }
- /* Allocate arguments array and get the arguments, checking for errors. */
args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
efree(args);
WRONG_PARAM_COUNT;
}
+
+ old_compare_func = BG(user_compare_func_name);
+
+ if (behavior == DIFF_NORMAL) {
+ diff_key_compare_func = array_key_compare;
+ if (data_compare_type == DIFF_COMP_DATA_INTERNAL) {
+ /* array_diff */
+
+ if (argc 2) {
+ efree(args);
+ WRONG_PARAM_COUNT;
+ }
+ arr_argc = argc;
+ diff_data_compare_func = array_data_compare;
+ } else if (data_compare_type = DIFF_COMP_DATA_USER) {
+ /* array_udiff */
+ if (argc 3) {
+ WRONG_PARAM_COUNT;
+ }
+ arr_argc = argc - 1;
+ diff_data_compare_func = array_user_compare;
+ if (!zend_is_callable(*args[arr_argc], 0, callback_name)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Not a
valid callback %s, callback_name);
+ efree(callback_name);
+ efree(args);
+ return;
+ }
+ efree(callback_name);
+
+ BG(user_compare_func_name) = args[arr_argc];
+ }
+ } else if (behavior == DIFF_ASSOC) {
+ diff_key_compare_func = array_key_compare;
+ if (data_compare_type == DIFF_COMP_DATA_INTERNAL
+
+ key_compare_type == DIFF_COMP_KEY_INTERNAL) {
+ /* array_diff_assoc() */
+
+ if (argc 2) {
+ efree(args);
+ WRONG_PARAM_COUNT;
+ }
+ arr_argc = argc;
+ diff_key_compare_func = array_key_compare;
+ diff_data_compare_func = array_data_compare;
+ } else if (data_compare_type == DIFF_COMP_DATA_USER
+
+ key_compare_type == DIFF_COMP_KEY_INTERNAL) {
+ /*
[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt
andrey Tue Sep 23 13:40:35 2003 EDT
Modified files:
/php-src/ext/standard/tests/array 007.phpt
Log:
New test cases for the new 4 functions :
- array_udiff()
- array_udiff_assoc()
- array_diff_uassoc()
- array_udiff_uassoc()
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.2
php-src/ext/standard/tests/array/007.phpt:1.3
--- php-src/ext/standard/tests/array/007.phpt:1.2 Sat Nov 16 12:26:52 2002
+++ php-src/ext/standard/tests/array/007.phpt Tue Sep 23 13:40:34 2003
@@ -47,8 +47,86 @@
echo Results:\n\n;
var_dump(array_diff($a,$b,$c));
var_dump(array_diff_assoc($a,$b,$c));
+
+echo -=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-\n;
+error_reporting(E_ALL);
+class cr {
+ private $priv_member;
+ public $public_member;
+ function cr($val) {
+ $this-priv_member = $val;
+ $this-public_member = $val;
+ }
+ static function comp_func_cr($a, $b) {
+ if ($a-priv_member === $b-priv_member) return 0;
+ return ($a-priv_member $b-priv_member)? 1:-1;
+ }
+}
+
+function comp_func($a, $b) {
+ if ($a === $b) return 0;
+ return ($a $b)? 1:-1;
+
+}
+
+function comp_func_cr($a, $b) {
+ if ($a-public_member === $b-public_member) return 0;
+ return ($a-public_member $b-public_member)? 1:-1;
+}
+
+
+/*
+$a = array(1,big=2,3,6,3,5,3,3,3,3,3,3,3,3,3,3);
+$b = array(2,2,3,3,3,3,3,3,3,3,3,3,3,3,3);
+$c = array(-1,1);
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo '$c='.var_export($c,TRUE).;\n;
+var_dump(array_diff($a,$b,$c));
+var_dump(array_diff_assoc($a,$b,$c));
+var_dump(array_udiff($a, $b, $c, comp_func));
+var_dump(array_diff_uassoc($a,$b,$c, comp_func));
+*/
+
+/*
+ $a = array(new cr(9),new cr(12),new cr(23),new cr(4),new cr(-15),);
+ $b = array(new cr(9),new cr(22),new cr( 3),new cr(4),new cr(-15),);
+ var_dump(array_udiff($a, $b, comp_func_cr));
+*/
+$a = array(0.1 = new cr(9), 0.5 = new cr(12), 0 = new cr(23), 1= new cr(4), 2
= new cr(-15),);
+$b = array(0.2 = new cr(9), 0.5 = new cr(22), 0 = new cr( 3), 1= new cr(4), 2
= new cr(-15),);
+
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo 'var_dump(array_udiff_uassoc($a, $b, comp_func_cr, comp_func));'.\n;
+var_dump(array_udiff_uassoc($a, $b, comp_func_cr, comp_func));
+
+
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo 'var_dump(array_udiff_uassoc($a, $b, array(cr, comp_func_cr),
comp_func));'.\n;
+var_dump(array_udiff_uassoc($a, $b, array(cr, comp_func_cr), comp_func));
+
+
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo 'var_dump(array_diff_assoc($a, $b));'.\n;
+var_dump(array_diff_assoc($a, $b));
+
+
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo 'var_dump(array_udiff($a, $b, comp_func_cr));'.\n;
+var_dump(array_udiff($a, $b, comp_func_cr));
+
+
+echo '$a='.var_export($a,TRUE).;\n;
+echo '$b='.var_export($b,TRUE).;\n;
+echo 'var_dump(array_udiff_assoc($a, $b, comp_func_cr));'.\n;
+var_dump(array_udiff_assoc($a, $b, comp_func_cr));
+
?
---EXPECT--
+--EXPECTF--
$a=array (
0 = 1,
'big' = 2,
@@ -172,4 +250,402 @@
int(42)
[want]=
string(5) wanna
+}
+-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
+$a=array (
+ '0.1' =
+ class cr {
+var $ = 9;
+var $public_member = 9;
+ },
+ '0.5' =
+ class cr {
+var $ = 12;
+var $public_member = 12;
+ },
+ 0 =
+ class cr {
+var $ = 23;
+var $public_member = 23;
+ },
+ 1 =
+ class cr {
+var $ = 4;
+var $public_member = 4;
+ },
+ 2 =
+ class cr {
+var $ = -15;
+var $public_member = -15;
+ },
+);
+$b=array (
+ '0.2' =
+ class cr {
+var $ = 9;
+var $public_member = 9;
+ },
+ '0.5' =
+ class cr {
+var $ = 22;
+var $public_member = 22;
+ },
+ 0 =
+ class cr {
+var $ = 3;
+var $public_member = 3;
+ },
+ 1 =
+ class cr {
+var $ = 4;
+var $public_member = 4;
+ },
+ 2 =
+ class cr {
+var $ = -15;
+var $public_member = -15;
+ },
+);
+var_dump(array_udiff_uassoc($a, $b, comp_func_cr, comp_func));
+array(3) {
+ [0.1]=
+ object(cr)#%d (%d) {
+[]=
+int(9)
+[public_member]=
+int(9)
+ }
+ [0.5]=
+ object(cr)#%d (%d) {
+[]=
+int(12)
+[public_member]=
+int(12)
+ }
+ [0]=
+ object(cr)#%d (%d) {
+[]=
+int(23)
+[public_member]=
+int(23)
+ }
+}
+$a=array (
+ '0.1' =
+ class cr {
+var $ = 9;
+var $public_member = 9;
+ },
+ '0.5' =
+ class cr {
+var $ = 12;
+var $public_member = 12;
+ },
+ 0 =
+ class cr {
+var $ = 23;
+var $public_member = 23;
+ },
+ 1 =
+ class cr {
+var $ = 4;
+var $public_member = 4;
+ },
+ 2 =
+ class cr {
+var $ = -15;
+var $public_member = -15;
+ },
+);
+$b=array (
+ '0.2' =
+
[PHP-CVS] cvs: php-src /ext/mbstring php_mbregex.c
moriyoshi Tue Sep 23 16:11:06 2003 EDT
Modified files:
/php-src/ext/mbstring php_mbregex.c
Log:
Remove useless mutex code due to the switch to oniguruma.
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.43 php-src/ext/mbstring/php_mbregex.c:1.44
--- php-src/ext/mbstring/php_mbregex.c:1.43 Mon Sep 22 22:47:06 2003
+++ php-src/ext/mbstring/php_mbregex.c Tue Sep 23 16:11:05 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.43 2003/09/23 02:47:06 hirokawa Exp $ */
+/* $Id: php_mbregex.c,v 1.44 2003/09/23 20:11:05 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -34,10 +34,6 @@
ZEND_EXTERN_MODULE_GLOBALS(mbstring)
-#ifdef ZTS
-MUTEX_T mbregex_locale_mutex = NULL;
-#endif
-
/* {{{ static void php_mb_regex_free_cache() */
static void php_mb_regex_free_cache(php_mb_regex_t **pre)
{
@@ -70,9 +66,6 @@
/* {{{ PHP_MINIT_FUNCTION(mb_regex) */
PHP_MINIT_FUNCTION(mb_regex)
{
-# ifdef ZTS
- mbregex_locale_mutex = tsrm_mutex_alloc();
-# endif
return SUCCESS;
}
/* }}} */
@@ -80,11 +73,6 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION(mb_regex) */
PHP_MSHUTDOWN_FUNCTION(mb_regex)
{
-#ifdef ZTS
- if (mbregex_locale_mutex != NULL) {
- tsrm_mutex_free(mbregex_locale_mutex);
- }
-#endif
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
abies Tue Sep 23 17:17:17 2003 EDT Modified files: /php-srcNEWS Log: Added ibase_gen_id() Index: php-src/NEWS diff -u php-src/NEWS:1.1467 php-src/NEWS:1.1468 --- php-src/NEWS:1.1467 Thu Sep 18 13:37:23 2003 +++ php-src/NEWSTue Sep 23 17:17:16 2003 @@ -14,6 +14,7 @@ statements into ibase_query() . Added ibase_commit_ret() and ibase_rollback_ret() . Added ibase_drop_db() + . Added ibase_gen_id() . Added ibase_name_result() . Added ibase_errcode() . Added ibase_affected_rows() and ibase_num_params() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase interbase.c
sniper Tue Sep 23 18:17:41 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
ws fix
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.186 php-src/ext/interbase/interbase.c:1.187
--- php-src/ext/interbase/interbase.c:1.186 Tue Sep 23 16:58:13 2003
+++ php-src/ext/interbase/interbase.c Tue Sep 23 18:17:40 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.186 2003/09/23 20:58:13 abies Exp $ */
+/* $Id: interbase.c,v 1.187 2003/09/23 22:17:40 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -26,7 +26,7 @@
#include php.h
-#define FILE_REVISION $Revision: 1.186 $
+#define FILE_REVISION $Revision: 1.187 $
#if HAVE_IBASE
@@ -116,7 +116,7 @@
#if HAVE_STRFTIME
PHP_FE(ibase_timefmt, NULL)
#endif
-PHP_FE(ibase_gen_id, NULL)
+ PHP_FE(ibase_gen_id, NULL)
PHP_FE(ibase_num_fields, NULL)
PHP_FE(ibase_num_params, NULL)
#if abies_0
@@ -267,9 +267,9 @@
/* {{{ internal macros, functions and structures */
typedef struct {
-isc_db_handle *db_ptr;
-long tpb_len;
-char *tpb_ptr;
+ isc_db_handle *db_ptr;
+ long tpb_len;
+ char *tpb_ptr;
} ISC_TEB;
typedef struct {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase interbase.c
abies Tue Sep 23 19:09:08 2003 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
Always return long from ibase_gen_id() on IB 6
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.187 php-src/ext/interbase/interbase.c:1.188
--- php-src/ext/interbase/interbase.c:1.187 Tue Sep 23 18:17:40 2003
+++ php-src/ext/interbase/interbase.c Tue Sep 23 19:08:59 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.187 2003/09/23 22:17:40 sniper Exp $ */
+/* $Id: interbase.c,v 1.188 2003/09/23 23:08:59 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -26,7 +26,7 @@
#include php.h
-#define FILE_REVISION $Revision: 1.187 $
+#define FILE_REVISION $Revision: 1.188 $
#if HAVE_IBASE
@@ -3306,7 +3306,7 @@
precision = 9;
break;
#ifdef SQL_INT64
- case SQL_INT64:
+ case SQL_INT64:
precision = 18;
break;
#endif
@@ -3317,8 +3317,8 @@
} else {
switch (var-sqltype ~1) {
case SQL_TEXT:
- s = CHAR;
- break;
+ s = CHAR;
+ break;
case SQL_VARYING:
s = VARCHAR;
break;
@@ -3328,13 +3328,13 @@
case SQL_LONG:
s = INTEGER;
break;
- case SQL_FLOAT:
+ case SQL_FLOAT:
s = FLOAT; break;
- case SQL_DOUBLE:
- case SQL_D_FLOAT:
+ case SQL_DOUBLE:
+ case SQL_D_FLOAT:
s = DOUBLE PRECISION; break;
#ifdef SQL_INT64
- case SQL_INT64:
+ case SQL_INT64:
s = BIGINT;
break;
#endif
@@ -4412,14 +4412,14 @@
zval **arg1, **arg2, **arg3, **query_arg;
ibase_db_link *ib_link;
ibase_trans *trans = NULL;
- long increment;
-#ifdef SQL_INT64
- ISC_INT64 result;
-#else
- ISC_LONG result;
-#endif
-
- XSQLDA out_sqlda;
+ long increment;
+#ifdef SQL_INT64
+ ISC_INT64 result;
+#else
+ ISC_LONG result;
+#endif
+
+ XSQLDA out_sqlda;
RESET_ERRMSG;
@@ -4429,8 +4429,8 @@
RETURN_FALSE;
}
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), InterBase link, le_link, le_plink);
- query_arg = arg1;
- increment = 1;
+ query_arg = arg1;
+ increment = 1;
break;
case 2:
if (zend_get_parameters_ex(2, arg1, arg2) == FAILURE) {
@@ -4438,14 +4438,14 @@
}
if (Z_TYPE_PP(arg1) == IS_STRING) /* first param is generator,
second is inc */
- {
+ {
query_arg = arg1;
convert_to_long_ex(arg2);
increment = Z_LVAL_PP(arg2);
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL,
IBG(default_link), InterBase link, le_link, le_plink);
} else {
-
_php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, arg1, ib_link, trans);
+
_php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, arg1, ib_link, trans);
query_arg = arg2;
increment = 1;
}
@@ -4455,7 +4455,7 @@
RETURN_FALSE;
}
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link*, arg1, -1,
InterBase link, le_link, le_plink);
-
+
query_arg = arg2;
convert_to_long_ex(arg3);
increment = Z_LVAL_PP(arg3);
@@ -4467,45 +4467,45 @@
}
convert_to_string_ex(query_arg);
- sprintf(query, SELECT GEN_ID(%s,%ld) FROM rdb$database,
Z_STRVAL_PP(query_arg), increment);
+ sprintf(query, SELECT GEN_ID(%s,%ld) FROM rdb$database,
Z_STRVAL_PP(query_arg), increment);
/* open default transaction */
if (_php_ibase_def_trans(ib_link, trans TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
Re: [PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c php_array.h
Should these functions really go into the core? Perhaps they are better off in an extension (pecl/array_utils ?) The names aren't really all that obvious to me either. --Wez. - Original Message - From: Andrey Hristov [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 6:37 PM Subject: [PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c php_array.h andrey Tue Sep 23 13:37:29 2003 EDT Modified files: /php-src/ext/standard array.c basic_functions.c php_array.h Log: 4 new functions : array_udiff() array_udiff_assoc() array_diff_uassoc() array_udiff_uassoc() They work like array_diff() or array_diff_assoc() but callback function(s) can be used to perform the comparisons. For example array_udiff_uassoc() expects 2 callbacks are last 2 parameters one is used to compare the values of the entries in the arrays the second to compare the keys. Class methods are also valid callbacks. Even when the data that should be used in the comparison is private or protected then a static method of a class should be used (this behaviour can be seen in the regression test - 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_4_3) /ext/gettext/tests gettext_basic.phpt /ext/gettext/tests/locale/fi/LC_MESSAGES messages.mo messages.po
sniper Tue Sep 23 20:44:24 2003 EDT Added files: (Branch: PHP_4_3) /php-src/ext/gettext/tests gettext_basic.phpt /php-src/ext/gettext/tests/locale/fi/LC_MESSAGESmessages.mo messages.po Log: MFH: basic gettext test Index: php-src/ext/gettext/tests/gettext_basic.phpt +++ php-src/ext/gettext/tests/gettext_basic.phpt --TEST-- Gettext basic test --SKIPIF-- ?php if (!extension_loaded(gettext)) print skip; ? --FILE-- ?php // $Id: gettext_basic.phpt,v 1.1 2003/09/23 10:00:23 sniper Exp $ chdir(dirname(__FILE__)); setlocale(LC_ALL, 'fi_FI'); bindtextdomain (messages, ./locale); textdomain (messages); echo gettext(Basic test), \n; echo _(Basic test), \n; ? --EXPECT-- Perustesti Perustesti Index: php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo +++ php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.mo Þ ,P Q_\ ¼Basic testMIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Perustesti Index: php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po +++ php-src/ext/gettext/tests/locale/fi/LC_MESSAGES/messages.po # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # #, fuzzy msgid msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=ISO-8859-1\n Content-Transfer-Encoding: 8bit\n #: gettext_basic.phpt:11 msgid Basic test msgstr Perustesti -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext gettext.c php_gettext.h
sniper Tue Sep 23 22:07:05 2003 EDT
Modified files:
/php-src/ext/gettextgettext.c php_gettext.h
Log:
- Fixed bug #24402 (Compile failure with gettext 0.12.x)
Index: php-src/ext/gettext/gettext.c
diff -u php-src/ext/gettext/gettext.c:1.42 php-src/ext/gettext/gettext.c:1.43
--- php-src/ext/gettext/gettext.c:1.42 Tue Jun 10 16:03:29 2003
+++ php-src/ext/gettext/gettext.c Tue Sep 23 22:07:04 2003
@@ -16,58 +16,57 @@
+--+
*/
-/* $Id: gettext.c,v 1.42 2003/06/10 20:03:29 imajes Exp $ */
+/* $Id: gettext.c,v 1.43 2003/09/24 02:07:04 sniper Exp $ */
-#include stdio.h
#ifdef HAVE_CONFIG_H
#include config.h
#endif
#include php.h
-#include php_gettext.h
#if HAVE_LIBINTL
+#include stdio.h
#include libintl.h
#include ext/standard/info.h
+#include php_gettext.h
/* {{{ php_gettext_functions[]
*/
function_entry php_gettext_functions[] = {
- PHP_FE(textdomain, NULL)
- PHP_FE(gettext, NULL)
- PHP_FALIAS(_, gettext,NULL)
- PHP_FE(dgettext,NULL)
- PHP_FE(dcgettext, NULL)
- PHP_FE(bindtextdomain, NULL)
+ PHP_NAMED_FE(textdomain,zif_textdomain, NULL)
+ PHP_NAMED_FE(gettext, zif_gettext,NULL)
+ /* Alias for gettext() */
+ PHP_NAMED_FE(_, zif_gettext,NULL)
+ PHP_NAMED_FE(dgettext, zif_dgettext, NULL)
+ PHP_NAMED_FE(dcgettext, zif_dcgettext, NULL)
+ PHP_NAMED_FE(bindtextdomain,zif_bindtextdomain, NULL)
#if HAVE_NGETTEXT
- PHP_FE(ngettext,NULL)
+ PHP_NAMED_FE(ngettext, zif_ngettext, NULL)
#endif
#if HAVE_DNGETTEXT
- PHP_FE(dngettext, NULL)
+ PHP_NAMED_FE(dngettext, zif_dngettext, NULL)
#endif
#if HAVE_DCNGETTEXT
- PHP_FE(dcngettext, NULL)
+ PHP_NAMED_FE(dcngettext,zif_dcngettext, NULL)
#endif
#if HAVE_BIND_TEXTDOMAIN_CODESET
- PHP_FE(bind_textdomain_codeset, NULL)
+ PHP_NAMED_FE(bind_textdomain_codeset, zif_bind_textdomain_codeset,NULL)
#endif
-
-
{NULL, NULL, NULL}
};
/* }}} */
zend_module_entry php_gettext_module_entry = {
-STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
gettext,
php_gettext_functions,
NULL,
NULL,
NULL,
NULL,
- PHP_MINFO(gettext),
-NO_VERSION_YET,
+ PHP_MINFO(php_gettext),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
@@ -75,7 +74,7 @@
ZEND_GET_MODULE(php_gettext)
#endif
-PHP_MINFO_FUNCTION(gettext)
+PHP_MINFO_FUNCTION(php_gettext)
{
php_info_print_table_start();
php_info_print_table_row(2, GetText Support, enabled);
@@ -84,7 +83,7 @@
/* {{{ proto string textdomain(string domain)
Set the textdomain to domain. Returns the current domain */
-PHP_FUNCTION(textdomain)
+PHP_NAMED_FUNCTION(zif_textdomain)
{
zval **domain;
char *domain_name, *retval;
@@ -110,7 +109,7 @@
/* {{{ proto string gettext(string msgid)
Return the translation of msgid for the current domain, or msgid unaltered if a
translation does not exist */
-PHP_FUNCTION(gettext)
+PHP_NAMED_FUNCTION(zif_gettext)
{
zval **msgid;
char *msgstr;
@@ -128,7 +127,7 @@
/* {{{ proto string dgettext(string domain_name, string msgid)
Return the translation of msgid for domain_name, or msgid unaltered if a
translation does not exist */
-PHP_FUNCTION(dgettext)
+PHP_NAMED_FUNCTION(zif_dgettext)
{
zval **domain_name, **msgid;
char *msgstr;
@@ -147,7 +146,7 @@
/* {{{ proto string dcgettext(string domain_name, string msgid, long category)
Return the translation of msgid for domain_name and category, or msgid unaltered
if a translation does not exist */
-PHP_FUNCTION(dcgettext)
+PHP_NAMED_FUNCTION(zif_dcgettext)
{
zval **domain_name, **msgid, **category;
char *msgstr;
@@ -167,7 +166,7 @@
/* {{{ proto string bindtextdomain(string domain_name, string dir)
Bind to the text domain domain_name, looking for translations in dir. Returns the
current domain */
-PHP_FUNCTION(bindtextdomain)
+PHP_NAMED_FUNCTION(zif_bindtextdomain)
{
zval **domain_name, **dir;
char *retval, dir_name[MAXPATHLEN];
@@ -198,7 +197,7 @@
#if HAVE_NGETTEXT
/* {{{ proto string ngettext(string MSGID1, string MSGID2, int N)
Plural version of gettext() */
-PHP_FUNCTION(ngettext)
+PHP_NAMED_FUNCTION(zif_ngettext)
{
zval **msgid1, **msgid2, **count;
char *msgstr;
@@ -224,7 +223,7 @@
#if HAVE_DNGETTEXT
/* {{{ proto string dngettext (string domain,
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/gettext gettext.c php_gettext.h
sniper Tue Sep 23 22:08:50 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/gettextgettext.c php_gettext.h
Log:
MFH: Fixed bug #24402 (Compile failure with gettext 0.12.x)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.403 php-src/NEWS:1.1247.2.404
--- php-src/NEWS:1.1247.2.403 Tue Sep 23 14:26:10 2003
+++ php-src/NEWSTue Sep 23 22:08:35 2003
@@ -46,6 +46,7 @@
- Fixed bug #25109 (Possible crash when fetching field names in pgsql). (Ilia)
- Fixed bug #25106 (Added more stringent checks on bzopen() mode). (Ilia)
- Fixed bug #25218 (deflate compressed pages had a gzip header). (Stefan)
+- Fixed bug #24402 (Compile failure with gettext 0.12.x). (Jani)
- Fixed bug #23326 (ext/domxml: Attributes via append_child not supported).
(Melvyn)
- Fixed bug #21220 (Wrong Apache version shown in phpinfo() output). (Jani)
Index: php-src/ext/gettext/gettext.c
diff -u php-src/ext/gettext/gettext.c:1.39.4.2 php-src/ext/gettext/gettext.c:1.39.4.3
--- php-src/ext/gettext/gettext.c:1.39.4.2 Sat Feb 8 13:59:38 2003
+++ php-src/ext/gettext/gettext.c Tue Sep 23 22:08:48 2003
@@ -16,58 +16,57 @@
+--+
*/
-/* $Id: gettext.c,v 1.39.4.2 2003/02/08 18:59:38 sas Exp $ */
+/* $Id: gettext.c,v 1.39.4.3 2003/09/24 02:08:48 sniper Exp $ */
-#include stdio.h
#ifdef HAVE_CONFIG_H
#include config.h
#endif
#include php.h
-#include php_gettext.h
#if HAVE_LIBINTL
+#include stdio.h
#include libintl.h
#include ext/standard/info.h
+#include php_gettext.h
/* {{{ php_gettext_functions[]
*/
function_entry php_gettext_functions[] = {
- PHP_FE(textdomain, NULL)
- PHP_FE(gettext, NULL)
- PHP_FALIAS(_, gettext,NULL)
- PHP_FE(dgettext,NULL)
- PHP_FE(dcgettext, NULL)
- PHP_FE(bindtextdomain, NULL)
+ PHP_NAMED_FE(textdomain,zif_textdomain, NULL)
+ PHP_NAMED_FE(gettext, zif_gettext,NULL)
+ /* Alias for gettext() */
+ PHP_NAMED_FE(_, zif_gettext,NULL)
+ PHP_NAMED_FE(dgettext, zif_dgettext, NULL)
+ PHP_NAMED_FE(dcgettext, zif_dcgettext, NULL)
+ PHP_NAMED_FE(bindtextdomain,zif_bindtextdomain, NULL)
#if HAVE_NGETTEXT
- PHP_FE(ngettext,NULL)
+ PHP_NAMED_FE(ngettext, zif_ngettext, NULL)
#endif
#if HAVE_DNGETTEXT
- PHP_FE(dngettext, NULL)
+ PHP_NAMED_FE(dngettext, zif_dngettext, NULL)
#endif
#if HAVE_DCNGETTEXT
- PHP_FE(dcngettext, NULL)
+ PHP_NAMED_FE(dcngettext,zif_dcngettext, NULL)
#endif
#if HAVE_BIND_TEXTDOMAIN_CODESET
- PHP_FE(bind_textdomain_codeset, NULL)
+ PHP_NAMED_FE(bind_textdomain_codeset, zif_bind_textdomain_codeset,NULL)
#endif
-
-
{NULL, NULL, NULL}
};
/* }}} */
zend_module_entry php_gettext_module_entry = {
-STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
gettext,
php_gettext_functions,
NULL,
NULL,
NULL,
NULL,
- PHP_MINFO(gettext),
-NO_VERSION_YET,
+ PHP_MINFO(php_gettext),
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
@@ -75,7 +74,7 @@
ZEND_GET_MODULE(php_gettext)
#endif
-PHP_MINFO_FUNCTION(gettext)
+PHP_MINFO_FUNCTION(php_gettext)
{
php_info_print_table_start();
php_info_print_table_row(2, GetText Support, enabled);
@@ -84,7 +83,7 @@
/* {{{ proto string textdomain(string domain)
Set the textdomain to domain. Returns the current domain */
-PHP_FUNCTION(textdomain)
+PHP_NAMED_FUNCTION(zif_textdomain)
{
zval **domain;
char *domain_name, *retval;
@@ -110,7 +109,7 @@
/* {{{ proto string gettext(string msgid)
Return the translation of msgid for the current domain, or msgid unaltered if a
translation does not exist */
-PHP_FUNCTION(gettext)
+PHP_NAMED_FUNCTION(zif_gettext)
{
zval **msgid;
char *msgstr;
@@ -128,7 +127,7 @@
/* {{{ proto string dgettext(string domain_name, string msgid)
Return the translation of msgid for domain_name, or msgid unaltered if a
translation does not exist */
-PHP_FUNCTION(dgettext)
+PHP_NAMED_FUNCTION(zif_dgettext)
{
zval **domain_name, **msgid;
char *msgstr;
@@ -147,7 +146,7 @@
/* {{{ proto string dcgettext(string domain_name, string msgid, long category)
Return the translation of msgid for domain_name and category, or msgid unaltered
if a translation does not exist */
-PHP_FUNCTION(dcgettext)
+PHP_NAMED_FUNCTION(zif_dcgettext)
{
zval **domain_name, **msgid,
[PHP-CVS] cvs: php-src /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt
iliaa Tue Sep 23 22:27:44 2003 EDT Modified files: /php-src/ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt Log: Specify full path for cat utility used by the test. Index: php-src/ext/mbstring/tests/mb_send_mail01.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.4 php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.5 --- php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.4 Tue May 13 20:36:00 2003 +++ php-src/ext/mbstring/tests/mb_send_mail01.phpt Tue Sep 23 22:27:43 2003 @@ -7,7 +7,7 @@ } ? --INI-- -sendmail_path=cat +sendmail_path=/usr/cat --FILE-- ?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail02.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.4 php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5 --- php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.4 Tue May 13 20:36:00 2003 +++ php-src/ext/mbstring/tests/mb_send_mail02.phpt Tue Sep 23 22:27:43 2003 @@ -7,7 +7,7 @@ } ? --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- ?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail03.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.5 php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6 --- php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.5 Tue May 13 20:36:00 2003 +++ php-src/ext/mbstring/tests/mb_send_mail03.phpt Tue Sep 23 22:27:43 2003 @@ -7,7 +7,7 @@ } ? --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- ?php $to = '[EMAIL PROTECTED]'; Index: php-src/ext/mbstring/tests/mb_send_mail04.phpt diff -u php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.4 php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5 --- php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.4 Tue May 13 20:36:00 2003 +++ php-src/ext/mbstring/tests/mb_send_mail04.phpt Tue Sep 23 22:27:43 2003 @@ -7,7 +7,7 @@ } ? --INI-- -sendmail_path=cat +sendmail_path=/bin/cat --FILE-- ?php $to = '[EMAIL PROTECTED]'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/bz2/tests with_strings.phpt /ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt mb_send_mail03.phpt mb_send_mail04.phpt /ext/standard/tests/aggregation aggregate.phpt aggregate_methods.phpt aggregate_methods_by_list.phpt aggregate_methods_by_regexp.phpt aggregate_properties.phpt aggregate_properties_by_list.phpt aggregate_properties_by_regexp.phpt aggregation_info.phpt deaggregate.phpt /ext/standard/tests/array 001.phpt 002.phpt 003.phpt array_search.phpt /ext/standard/tests/math abs.phpt pow.phpt round.phpt /ext/standard/tests/strings trim.phpt wordwrap.phpt
iliaa Tue Sep 23 22:29:16 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/strings wordwrap.phpt trim.phpt
/php-src/ext/standard/tests/mathround.phpt pow.phpt abs.phpt
/php-src/ext/standard/tests/array array_search.phpt 003.phpt
002.phpt 001.phpt
/php-src/ext/standard/tests/aggregation deaggregate.phpt
aggregation_info.phpt
aggregate_properties_by_regexp.phpt
aggregate_properties_by_list.phpt
aggregate_properties.phpt
aggregate_methods_by_regexp.phpt
aggregate_methods_by_list.phpt
aggregate_methods.phpt
aggregate.phpt
/php-src/ext/mbstring/tests mb_send_mail04.phpt mb_send_mail03.phpt
mb_send_mail02.phpt mb_send_mail01.phpt
/php-src/ext/bz2/tests with_strings.phpt
Log:
MFH: Specify full path for the cat utility for mbstring e-mail tests.
MFH: Previously made fixes to tests that address bug #25635
Index: php-src/ext/standard/tests/strings/wordwrap.phpt
diff -u php-src/ext/standard/tests/strings/wordwrap.phpt:1.5
php-src/ext/standard/tests/strings/wordwrap.phpt:1.5.4.1
--- php-src/ext/standard/tests/strings/wordwrap.phpt:1.5Sun Mar 17 21:00:57
2002
+++ php-src/ext/standard/tests/strings/wordwrap.phptTue Sep 23 22:29:11 2003
@@ -31,7 +31,7 @@
TESTS;
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
--EXPECT--
OK
Index: php-src/ext/standard/tests/strings/trim.phpt
diff -u php-src/ext/standard/tests/strings/trim.phpt:1.4
php-src/ext/standard/tests/strings/trim.phpt:1.4.2.1
--- php-src/ext/standard/tests/strings/trim.phpt:1.4Sun Oct 6 15:12:22 2002
+++ php-src/ext/standard/tests/strings/trim.phptTue Sep 23 22:29:11 2003
@@ -23,7 +23,7 @@
ABC === trim(ABC\\x50\\xC1\\x60\\x90,\\x50..\\xC1)
TESTS;
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
--EXPECT--
OK
Index: php-src/ext/standard/tests/math/round.phpt
diff -u php-src/ext/standard/tests/math/round.phpt:1.2
php-src/ext/standard/tests/math/round.phpt:1.2.8.1
--- php-src/ext/standard/tests/math/round.phpt:1.2 Tue Mar 5 04:00:56 2002
+++ php-src/ext/standard/tests/math/round.phpt Tue Sep 23 22:29:12 2003
@@ -3,7 +3,7 @@
--POST--
--GET--
--FILE--
-?php // $Id: round.phpt,v 1.2 2002/03/05 09:00:56 derick Exp $
+?php // $Id: round.phpt,v 1.2.8.1 2003/09/24 02:29:12 iliaa Exp $
define('LONG_MAX', is_int(50)? 9223372036854775807 : 0x7FFF);
define('LONG_MIN', -LONG_MAX - 1);
@@ -33,7 +33,7 @@
LONG_MAX ~== floor(LONG_MAX + 0.5)
TESTS;
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
--EXPECT--
1,1,0,0
OK
Index: php-src/ext/standard/tests/math/pow.phpt
diff -u php-src/ext/standard/tests/math/pow.phpt:1.12
php-src/ext/standard/tests/math/pow.phpt:1.12.4.1
--- php-src/ext/standard/tests/math/pow.phpt:1.12 Thu Mar 21 09:18:30 2002
+++ php-src/ext/standard/tests/math/pow.phptTue Sep 23 22:29:12 2003
@@ -3,7 +3,7 @@
--POST--
--GET--
--FILE--
-?php // $Id: pow.phpt,v 1.12 2002/03/21 14:18:30 sander Exp $
+?php // $Id: pow.phpt,v 1.12.4.1 2003/09/24 02:29:12 iliaa Exp $
define('LONG_MAX', is_int(50)? 9223372036854775807 : 0x7FFF);
define('LONG_MIN', -LONG_MAX - 1);
@@ -143,7 +143,7 @@
TESTS;
echo On failure, please mail result to [EMAIL PROTECTED];
- include('tests/quicktester.inc');
+ include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
--EXPECT--
1,1,0,0
Index: php-src/ext/standard/tests/math/abs.phpt
diff -u php-src/ext/standard/tests/math/abs.phpt:1.2
php-src/ext/standard/tests/math/abs.phpt:1.2.8.1
--- php-src/ext/standard/tests/math/abs.phpt:1.2Tue Mar 5 04:00:56 2002
+++ php-src/ext/standard/tests/math/abs.phptTue Sep 23 22:29:12 2003
@@ -3,7 +3,7 @@
--POST--
--GET--
--FILE--
-?php // $Id: abs.phpt,v 1.2 2002/03/05 09:00:56 derick Exp $
+?php // $Id: abs.phpt,v 1.2.8.1 2003/09/24 02:29:12 iliaa Exp $
define('LONG_MAX', is_int(50)? 9223372036854775807 : 0x7FFF);
define('LONG_MIN', -LONG_MAX - 1);
@@ -20,7 +20,7 @@
-(LONG_MIN+1) === abs(LONG_MIN+1)
TESTS;
-include('tests/quicktester.inc');
+include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
--EXPECT--
1,1,0,0
OK
Index: php-src/ext/standard/tests/array/array_search.phpt
diff -u php-src/ext/standard/tests/array/array_search.phpt:1.2.8.1
php-src/ext/standard/tests/array/array_search.phpt:1.2.8.2
---
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
iliaa Tue Sep 23 22:30:18 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Bug fixing news. Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.404 php-src/NEWS:1.1247.2.405 --- php-src/NEWS:1.1247.2.404 Tue Sep 23 22:08:35 2003 +++ php-src/NEWSTue Sep 23 22:30:16 2003 @@ -9,6 +9,7 @@ - Fixed FastCGI being unable to bind to a specific IP. (Sascha) - Fixed bug #25636 (SNMP Session not closed on success). (Ilia, nesslage[at]mwsc[dot]edu) +- Fixed bug #25635 (Make make tests to fail due to invalid include_path). (Ilia) - Fixed bug #25604 (HAVE_SNMP_PARSE_OID undefined with phpize build). (Jani) - Fixed bug #25583 (Incorrect handling of paths starting with / on win32 inside glob() function). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
