date:20100305

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/acinclude.m4 branches/PHP_5_2/ext/iconv/iconv.c branches/PHP_5_2/ext/iconv/php_iconv.h branches/PHP_5_3/acinclude.m4 branches/PHP_5_

2010-03-05 Thread Moriyoshi Koizumi

moriyoshiFri, 05 Mar 2010 09:12:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295848

Log:
- Fixed bug #49267 (linking fails for iconv)

Bug: http://bugs.php.net/49267 (No Feedback) Linking fails for iconv: 
Undefined symbols: _libiconv
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/acinclude.m4
U   php/php-src/branches/PHP_5_2/ext/iconv/iconv.c
U   php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
U   php/php-src/branches/PHP_5_3/acinclude.m4
U   php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
U   php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
U   php/php-src/trunk/acinclude.m4
U   php/php-src/trunk/ext/iconv/iconv.c
U   php/php-src/trunk/ext/iconv/php_iconv.h

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-03-05 09:12:13 UTC (rev 295848)
@@ -11,6 +11,7 @@
   an invalid option is provided). (Ilia)
 - Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones)
 - Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris 
Jones)
+- Fixed bug #49267 (Linking fails for iconv). (Moriyosh)
 - Fixed bug #43314 (iconv_mime_encode(), broken Q scheme). (Rasmus)
 - Fixed bug #23229 (syslog function truncates messages). (Adam)


Modified: php/php-src/branches/PHP_5_2/acinclude.m4
===
--- php/php-src/branches/PHP_5_2/acinclude.m4   2010-03-05 06:45:28 UTC (rev 
295847)
+++ php/php-src/branches/PHP_5_2/acinclude.m4   2010-03-05 09:12:13 UTC (rev 
295848)
@@ -2424,6 +2424,7 @@
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h
   echo  ext/iconv/php_php_iconv_impl.h
+  echo  ext/iconv/php_have_libiconv_in_libiconv.h
   echo  ext/iconv/php_php_iconv_h_path.h
   echo  ext/iconv/php_iconv_supports_errno.h

@@ -2471,6 +2472,8 @@
 found_iconv=yes
 PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
 AC_DEFINE(HAVE_LIBICONV,1,[ ])
+PHP_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[ext/iconv])
+AC_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[iconv() is aliased to 
libiconv() in -liconv])
   ], [
 PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
   found_iconv=yes

Modified: php/php-src/branches/PHP_5_2/ext/iconv/iconv.c
===
--- php/php-src/branches/PHP_5_2/ext/iconv/iconv.c  2010-03-05 06:45:28 UTC 
(rev 295847)
+++ php/php-src/branches/PHP_5_2/ext/iconv/iconv.c  2010-03-05 09:12:13 UTC 
(rev 295848)
@@ -193,7 +193,7 @@
 }
 /* }}} */

-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV)  defined(HAVE_LIBICONV_IN_LIBICONV)
 #define iconv libiconv
 #endif


Modified: php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
===
--- php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h  2010-03-05 06:45:28 UTC 
(rev 295847)
+++ php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h  2010-03-05 09:12:13 UTC 
(rev 295848)
@@ -35,6 +35,7 @@
 #ifdef PHP_ATOM_INC
 #include ext/iconv/php_have_iconv.h
 #include ext/iconv/php_have_libiconv.h
+#include ext/iconv/php_have_libiconv_in_libiconv.h
 #include ext/iconv/php_have_glibc_iconv.h
 #include ext/iconv/php_have_bsd_iconv.h
 #include ext/iconv/php_iconv_supports_errno.h

Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===
--- php/php-src/branches/PHP_5_3/acinclude.m4   2010-03-05 06:45:28 UTC (rev 
295847)
+++ php/php-src/branches/PHP_5_3/acinclude.m4   2010-03-05 09:12:13 UTC (rev 
295848)
@@ -2424,6 +2424,7 @@
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h
   echo  ext/iconv/php_php_iconv_impl.h
+  echo  ext/iconv/php_have_libiconv_in_libiconv.h
   echo  ext/iconv/php_php_iconv_h_path.h
   echo  ext/iconv/php_iconv_supports_errno.h

@@ -2471,6 +2472,8 @@
 found_iconv=yes
 PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
 AC_DEFINE(HAVE_LIBICONV,1,[ ])
+PHP_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[ext/iconv])
+AC_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[iconv() is aliased to 
libiconv() in -liconv])
   ], [
 PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
   found_iconv=yes

Modified: php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
===
--- php/php-src/branches/PHP_5_3/ext/iconv/iconv.c  2010-03-05 06:45:28 UTC 
(rev 295847)
+++ php/php-src/branches/PHP_5_3/ext/iconv/iconv.c  2010-03-05 09:12:13 UTC 
(rev 295848)
@@ -182,7 +182,7 @@
 }
 /* }}} */

-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV)  defined(HAVE_LIBICONV_IN_LIBICONV)
 #define iconv libiconv
 #endif


Modified:

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dba/tests/dba011.phpt branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt trunk/ext/dba/tests/dba011.phpt trunk/ext/dba/tests/dba_cdb_001.phpt

2010-03-05 Thread Christopher Jones

sixd Sat, 06 Mar 2010 00:23:16 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295874

Log:
Test misc argument error conditions

Changed paths:
A   php/php-src/branches/PHP_5_3/ext/dba/tests/dba011.phpt
A   php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt
A   php/php-src/trunk/ext/dba/tests/dba011.phpt
A   php/php-src/trunk/ext/dba/tests/dba_cdb_001.phpt

Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba011.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba011.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba011.phpt	2010-03-06 00:23:16 UTC (rev 295874)
@@ -0,0 +1,38 @@
+--TEST--
+DBA argument tests
+--SKIPIF--
+?php
+require_once(dirname(__FILE__) .'/skipif.inc');
+die(info $HND handler used);
+?
+--FILE--
+?php
+require_once(dirname(__FILE__) .'/test.inc');
+echo database handler: $handler\n;
+var_dump(dba_open($db_file));
+var_dump(dba_open($db_file, 'n'));
+var_dump(dba_open($db_file, 'n', 'bogus'));
+var_dump(dba_open($db_file, 'q', $handler));
+var_dump(dba_open($db_file, 'nq', $handler));
+var_dump(dba_open($db_file, 'n', $handler, 2, 3, 4, 5, 6, 7, 8));
+?
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+database handler: flatfile
+
+Warning: Wrong parameter count for dba_open() in %sdba011.php on line %d
+NULL
+resource(%d) of type (dba)
+
+Warning: dba_open(%stest0.dbm,n): No such handler: bogus in %sdba011.php on line %d
+bool(false)
+
+Warning: dba_open(%stest0.dbm,q): Illegal DBA mode in %sdba011.php on line %d
+bool(false)
+
+Warning: dba_open(%stest0.dbm,nq): Illegal DBA mode in %sdba011.php on line %d
+bool(false)
+resource(%d) of type (dba)


Property changes on: php/php-src/branches/PHP_5_3/ext/dba/tests/dba011.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Added: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt	2010-03-06 00:23:16 UTC (rev 295874)
@@ -0,0 +1,89 @@
+--TEST--
+DBA CDB handler test
+--SKIPIF--
+?php
+$handler = 'cdb';
+require_once(dirname(__FILE__) .'/skipif.inc');
+die('info CDB does not support replace or delete');
+?
+--FILE--
+?php
+
+$handler = 'cdb';
+require_once(dirname(__FILE__) .'/test.inc');
+
+echo Test 0\n;
+
+if (($db_file = dba_open($db_filename, 'n', $handler))!==FALSE) {
+var_dump(dba_insert(key1, Content String 1, $db_file));
+var_dump(dba_replace(key1, New Content String, $db_file));
+var_dump(dba_fetch(key1, $db_file));
+var_dump(dba_firstkey($db_file));
+var_dump(dba_delete(key1, $db_file));
+var_dump(dba_optimize($db_file));
+var_dump(dba_sync($db_file));
+dba_close($db_file);
+}
+else {
+echo Failed to open DB\n;
+}
+
+unlink($db_filename);
+
+echo Test 1\n;
+
+if (($db_file = dba_open($db_filename, 'c', $handler))!==FALSE) {
+dba_insert(key1, Content String 1, $db_file);
+dba_close($db_file);
+}
+else {
+echo Failed to open DB\n;
+}
+
+echo Test 2\n;
+
+if (($db_file = dba_open($db_filename, 'r', $handler))!==FALSE) {
+dba_insert(key1, Content String 1, $db_file);
+dba_close($db_file);
+}
+else {
+echo Failed to open DB\n;
+}
+
+echo Test 3\n;
+
+if (($db_file = dba_open($db_filename, 'w', $handler))!==FALSE) {
+echo dba_fetch(key1, $db_file), \n;
+dba_close($db_file);
+}
+else {
+echo Failed to open DB\n;
+}
+
+?
+===DONE===
+--CLEAN--
+?php
+require(dirname(__FILE__) .'/clean.inc');
+?
+--EXPECTF--
+Test 0
+bool(true)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+Test 1
+
+Warning: dba_open(%stest0.dbm,c): Driver initialization failed for handler: cdb: Update operations are not supported in %sdba_cdb_001.php on line %d
+Failed to open DB
+Test 2
+
+Warning: dba_insert(): You cannot perform a modification to a database without proper access in %sdba_cdb_001.php on line %d
+Test 3
+
+Warning: dba_open(%stest0.dbm,w): Driver initialization failed for handler: cdb: Update operations are not supported in %sdba_cdb_001.php on line %d
+Failed to open DB
+===DONE===


Property changes on: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt
___
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Added: php/php-src/trunk/ext/dba/tests/dba011.phpt
===
--- php/php-src/trunk/ext/dba/tests/dba011.phpt	(rev 0)
+++ php/php-src/trunk/ext/dba/tests/dba011.phpt	2010-03-06 00:23:16 UTC (rev 295874)
@@ -0,0 +1,38 @@
+--TEST--
+DBA

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/acinclude.m4 branches/PHP_5_2/ext/iconv/iconv.c branches/PHP_5_2/ext/iconv/php_iconv.h branches/PHP_5_3/acinclude.m4 branches/PHP_5_

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dba/tests/dba011.phpt branches/PHP_5_3/ext/dba/tests/dba_cdb_001.phpt trunk/ext/dba/tests/dba011.phpt trunk/ext/dba/tests/dba_cdb_001.phpt

2 matches

Site Navigation

Mail list logo

Footer information