[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c
sas Thu Jul 3 02:27:55 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ircg ircg.c
Log:
always provide recipient info, already fixed in HEAD
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.8 php-src/ext/ircg/ircg.c:1.137.2.9
--- php-src/ext/ircg/ircg.c:1.137.2.8 Mon Jun 2 09:17:45 2003
+++ php-src/ext/ircg/ircg.c Thu Jul 3 02:27:54 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.137.2.8 2003/06/02 13:17:45 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.9 2003/07/03 06:27:54 sas Exp $ */
/* {{{ includes */
@@ -829,7 +829,7 @@
/* {{{ IRCG-handlers */
static void handle_ctcp(php_irconn_t *conn, smart_str *chan, smart_str *from,
- smart_str *msg, smart_str *result)
+ smart_str *msg, smart_str *result, smart_str *recipient)
{
char *token_end;
char *real_msg;
@@ -844,7 +844,7 @@
real_msg_end = strchr(real_msg, '\001');
if (real_msg_end) {
format_msg_t *fmt_msg;
- smart_str tmp, tmp2;
+ smart_str tmp;
int status = 0;
*real_msg_end = '\0';
@@ -855,8 +855,7 @@
}
smart_str_setl(tmp, real_msg, real_msg_end - real_msg);
- smart_str_setl(tmp2, conn-conn.username,
conn-conn.username_len);
- format_msg(fmt_msg, chan, tmp2, from, tmp, result,
conn-conn.username, conn-conn.username_len, status);
+ format_msg(fmt_msg, chan, recipient, from, tmp, result,
conn-conn.username, conn-conn.username_len, status);
if (status == 1)
irc_disconnect(conn-conn, Connection terminated by
authenticated CTCP message);
@@ -2250,14 +2249,14 @@
case '#':
case '':
if (l.c[0] == 1) {
- handle_ctcp(conn, tmp, tmp2, l, m);
+ handle_ctcp(conn, tmp, tmp2, l, m, tmp);
} else {
FORMAT_MSG(conn, FMT_MSG_CHAN, tmp, NULL,
tmp2, l, m, conn-conn.username, conn-conn.username_len);
}
break;
default:
if (l.c[0] == 1) {
- handle_ctcp(conn, NULL, tmp2, l, m);
+ handle_ctcp(conn, NULL, tmp2, l, m, tmp);
} else {
FORMAT_MSG(conn, FMT_MSG_PRIV_FROM_ME, NULL,
tmp, tmp2, l, m,
conn-conn.username, conn-conn.username_len);
--
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/ircg ircg.c
sas Thu Jul 3 02:29:45 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ircg ircg.c
Log:
make it compile
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.9 php-src/ext/ircg/ircg.c:1.137.2.10
--- php-src/ext/ircg/ircg.c:1.137.2.9 Thu Jul 3 02:27:54 2003
+++ php-src/ext/ircg/ircg.c Thu Jul 3 02:29:45 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.137.2.9 2003/07/03 06:27:54 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.10 2003/07/03 06:29:45 sas Exp $ */
/* {{{ includes */
@@ -874,7 +874,7 @@
smart_str_setl(s_username, ircc-username, ircc-username_len);
if (msg-c[0] == '\001') {
- handle_ctcp(conn, chan, from, msg, m);
+ handle_ctcp(conn, chan, from, msg, m, chan);
} else if (chan) {
FORMAT_MSG(conn, FMT_MSG_CHAN, chan, s_username, from, msg, m,
conn-conn.username, conn-conn.username_len);
} else {
--
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/ircg ircg.c
sas Thu Jul 3 02:59:43 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ircg ircg.c
Log:
make the recipient parameter actually useful
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.10 php-src/ext/ircg/ircg.c:1.137.2.11
--- php-src/ext/ircg/ircg.c:1.137.2.10 Thu Jul 3 02:29:45 2003
+++ php-src/ext/ircg/ircg.c Thu Jul 3 02:59:43 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.137.2.10 2003/07/03 06:29:45 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.11 2003/07/03 06:59:43 sas Exp $ */
/* {{{ includes */
@@ -874,7 +874,7 @@
smart_str_setl(s_username, ircc-username, ircc-username_len);
if (msg-c[0] == '\001') {
- handle_ctcp(conn, chan, from, msg, m, chan);
+ handle_ctcp(conn, chan, from, msg, m, chan?chan:s_username);
} else if (chan) {
FORMAT_MSG(conn, FMT_MSG_CHAN, chan, s_username, from, msg, m,
conn-conn.username, conn-conn.username_len);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes private_redeclare.phpt
helly Thu Jul 3 06:05:01 2003 EDT
Added files:
/php-src/tests/classes private_redeclare.phpt
Log:
Check private redeclare behavior
Index: php-src/tests/classes/private_redeclare.phpt
+++ php-src/tests/classes/private_redeclare.phpt
--TEST--
ZE2 A derived class does not know anything about inherited private methods
--FILE--
?php
class base {
private function show() {
echo base\n;
}
function test() {
$this-show();
}
}
$t = new base();
$t-test();
class derived extends base {
function show() {
echo derived\n;
}
function test() {
echo test\n;
$this-show();
parent::test();
parent::show();
}
}
$t = new derived();
$t-test();
?
--EXPECTF--
base
test
derived
base
Fatal error: Call to private method base::show() from context 'derived' in %s on line
%d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dba dba_db2.c dba_db3.c dba_db4.c
helly Thu Jul 3 07:17:35 2003 EDT Modified files: /php-src/ext/dbadba_db2.c dba_db3.c dba_db4.c Log: Fix open mode (noticed by FutureQuest, Inc.) Index: php-src/ext/dba/dba_db2.c diff -u php-src/ext/dba/dba_db2.c:1.34 php-src/ext/dba/dba_db2.c:1.35 --- php-src/ext/dba/dba_db2.c:1.34 Tue Jun 10 16:03:26 2003 +++ php-src/ext/dba/dba_db2.c Thu Jul 3 07:17:34 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db2.c,v 1.34 2003/06/10 20:03:26 imajes Exp $ */ +/* $Id: dba_db2.c,v 1.35 2003/07/03 11:17:34 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -55,7 +55,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s ? DB_BTREE : DB_UNKNOWN; + !s ? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db3.c diff -u php-src/ext/dba/dba_db3.c:1.28 php-src/ext/dba/dba_db3.c:1.29 --- php-src/ext/dba/dba_db3.c:1.28 Tue Jun 10 16:03:26 2003 +++ php-src/ext/dba/dba_db3.c Thu Jul 3 07:17:34 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db3.c,v 1.28 2003/06/10 20:03:26 imajes Exp $ */ +/* $Id: dba_db3.c,v 1.29 2003/07/03 11:17:34 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s? DB_BTREE : DB_UNKNOWN; + !s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db4.c diff -u php-src/ext/dba/dba_db4.c:1.10 php-src/ext/dba/dba_db4.c:1.11 --- php-src/ext/dba/dba_db4.c:1.10 Sat Jun 21 14:16:38 2003 +++ php-src/ext/dba/dba_db4.c Thu Jul 3 07:17:34 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: dba_db4.c,v 1.10 2003/06/21 18:16:38 helly Exp $ */ +/* $Id: dba_db4.c,v 1.11 2003/07/03 11:17:34 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -65,7 +65,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s? DB_BTREE : DB_UNKNOWN; + !s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : -- 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/dba dba_db2.c dba_db3.c dba_db4.c
helly Thu Jul 3 07:23:27 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/dbadba_db2.c dba_db3.c dba_db4.c Log: MFH: Fix open mode (noticed by FutureQuest, Inc.) Index: php-src/ext/dba/dba_db2.c diff -u php-src/ext/dba/dba_db2.c:1.30.2.3 php-src/ext/dba/dba_db2.c:1.30.2.4 --- php-src/ext/dba/dba_db2.c:1.30.2.3 Fri Jan 31 15:10:11 2003 +++ php-src/ext/dba/dba_db2.c Thu Jul 3 07:23:27 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db2.c,v 1.30.2.3 2003/01/31 20:10:11 helly Exp $ */ +/* $Id: dba_db2.c,v 1.30.2.4 2003/07/03 11:23:27 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -55,7 +55,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s ? DB_BTREE : DB_UNKNOWN; + !s ? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db3.c diff -u php-src/ext/dba/dba_db3.c:1.21.2.5 php-src/ext/dba/dba_db3.c:1.21.2.6 --- php-src/ext/dba/dba_db3.c:1.21.2.5 Fri Jan 31 15:10:11 2003 +++ php-src/ext/dba/dba_db3.c Thu Jul 3 07:23:27 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db3.c,v 1.21.2.5 2003/01/31 20:10:11 helly Exp $ */ +/* $Id: dba_db3.c,v 1.21.2.6 2003/07/03 11:23:27 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s? DB_BTREE : DB_UNKNOWN; + !s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : Index: php-src/ext/dba/dba_db4.c diff -u php-src/ext/dba/dba_db4.c:1.6.2.3 php-src/ext/dba/dba_db4.c:1.6.2.4 --- php-src/ext/dba/dba_db4.c:1.6.2.3 Fri Jan 31 15:10:11 2003 +++ php-src/ext/dba/dba_db4.c Thu Jul 3 07:23:27 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: dba_db4.c,v 1.6.2.3 2003/01/31 20:10:11 helly Exp $ */ +/* $Id: dba_db4.c,v 1.6.2.4 2003/07/03 11:23:27 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -64,7 +64,7 @@ type = info-mode == DBA_READER ? DB_UNKNOWN : info-mode == DBA_TRUNC ? DB_BTREE : - s? DB_BTREE : DB_UNKNOWN; + !s? DB_BTREE : DB_UNKNOWN; gmode = info-mode == DBA_READER ? DB_RDONLY : (info-mode == DBA_CREAT s) ? DB_CREATE : -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes destructor_and_globals.phpt
helly Thu Jul 3 10:06:51 2003 EDT
Added files:
/php-src/tests/classes destructor_and_globals.phpt
Log:
Accessing globals from a destructor causes memory corruption
Index: php-src/tests/classes/destructor_and_globals.phpt
+++ php-src/tests/classes/destructor_and_globals.phpt
--TEST--
ZE2 accessing globals from destructor in shutdown
--FILE--
?php
$test_cnt = 0;
$test_num = 0;
function Show() {
global $test_cnt;
echo Count: $test_cnt\n;
}
class counter {
protected $id;
public function __construct() {
global $test_cnt, $test_num;
$test_cnt++;
$this-id = $test_num++;
}
public function Show() {
echo 'Id: '.$this-id.\n;
}
// try protected here
public function __destruct() {
global $test_cnt;
$test_cnt--;
}
static public function destroy($obj) {
$obj = NULL;
}
}
Show();
$obj1 = new counter;
$obj1-Show();
Show();
$obj2 = new counter;
$obj2-Show();
Show();
counter::destroy($obj1);
Show();
// or uncomment this line and it works
//counter::destroy($obj2);
echo Done\n;
?
--EXPECT--
Count: 0
Id: 0
Count: 1
Id: 1
Count: 2
Count: 1
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
hholzgraThu Jul 3 10:34:02 2003 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
PHP glob() will now emulate GLOB_ONLYDIR on non-GNU systems
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.121 php-src/ext/standard/dir.c:1.122
--- php-src/ext/standard/dir.c:1.121Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/dir.c Thu Jul 3 10:34:02 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.121 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: dir.c,v 1.122 2003/07/03 14:34:02 hholzgra Exp $ */
/* {{{ includes/startup/misc */
@@ -141,9 +141,6 @@
#ifdef GLOB_BRACE
REGISTER_LONG_CONSTANT(GLOB_BRACE, GLOB_BRACE, CONST_CS | CONST_PERSISTENT);
#endif
-#ifdef GLOB_ONLYDIR
- REGISTER_LONG_CONSTANT(GLOB_ONLYDIR, GLOB_ONLYDIR, CONST_CS |
CONST_PERSISTENT);
-#endif
#ifdef GLOB_MARK
REGISTER_LONG_CONSTANT(GLOB_MARK, GLOB_MARK, CONST_CS | CONST_PERSISTENT);
#endif
@@ -156,6 +153,17 @@
#ifdef GLOB_NOESCAPE
REGISTER_LONG_CONSTANT(GLOB_NOESCAPE, GLOB_NOESCAPE, CONST_CS |
CONST_PERSISTENT);
#endif
+
+#ifndef GLOB_ONLYDIR
+#define GLOB_ONLYDIR (130)
+#define GLOB_EMULATE_ONLYDIR
+#define GLOB_FLAGMASK (~GLOB_ONLYDIR)
+#else
+#define GLOB_FLAGMASK (~0)
+#endif
+
+ REGISTER_LONG_CONSTANT(GLOB_ONLYDIR, GLOB_ONLYDIR, CONST_CS |
CONST_PERSISTENT);
+
#endif
return SUCCESS;
@@ -386,7 +394,7 @@
#endif
globbuf.gl_offs = 0;
- if (0 != (ret = glob(pattern, flags, NULL, globbuf))) {
+ if (0 != (ret = glob(pattern, flags GLOB_FLAGMASK, NULL, globbuf))) {
#ifdef GLOB_NOMATCH
if (GLOB_NOMATCH == ret) {
/* Linux handles no matches as an error condition, but FreeBSD
@@ -421,6 +429,19 @@
array_init(return_value);
for (n = 0; n globbuf.gl_pathc; n++) {
+#ifdef GLOB_EMULATE_ONLYDIR
+ if (flags GLOB_ONLYDIR) {
+ struct stat s;
+
+ if (0 != stat(globbuf.gl_pathv[n], s)) {
+ continue;
+ }
+
+ if (!S_ISDIR(s.st_mode)) {
+ continue;
+ }
+ }
+#endif
add_next_index_string(return_value, globbuf.gl_pathv[n]+cwd_skip, 1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
hholzgraThu Jul 3 10:54:03 2003 EDT
Modified files:
/php-src/ext/standard dir.c
Log:
VCWD awareness and (hopefully) windows compile fix
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.122 php-src/ext/standard/dir.c:1.123
--- php-src/ext/standard/dir.c:1.122Thu Jul 3 10:34:02 2003
+++ php-src/ext/standard/dir.c Thu Jul 3 10:54:03 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.122 2003/07/03 14:34:02 hholzgra Exp $ */
+/* $Id: dir.c,v 1.123 2003/07/03 14:54:03 hholzgra Exp $ */
/* {{{ includes/startup/misc */
@@ -433,11 +433,11 @@
if (flags GLOB_ONLYDIR) {
struct stat s;
- if (0 != stat(globbuf.gl_pathv[n], s)) {
+ if (0 != VCWD_STAT(globbuf.gl_pathv[n], s)) {
continue;
}
- if (!S_ISDIR(s.st_mode)) {
+ if (S_IFDIR != s.st_mode S_IFMT) {
continue;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
moriyoshi Thu Jul 3 11:26:12 2003 EDT Modified files: /php-src/main rfc1867.c Log: Fix build Index: php-src/main/rfc1867.c diff -u php-src/main/rfc1867.c:1.140 php-src/main/rfc1867.c:1.141 --- php-src/main/rfc1867.c:1.140Wed Jul 2 22:59:04 2003 +++ php-src/main/rfc1867.c Thu Jul 3 11:26:12 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: rfc1867.c,v 1.140 2003/07/03 02:59:04 sniper Exp $ */ +/* $Id: rfc1867.c,v 1.141 2003/07/03 15:26:12 moriyoshi Exp $ */ /* * This product includes software developed by the Apache Group @@ -700,7 +700,7 @@ int max_file_size=0, skip_upload=0, anonindex=0, is_anonymous; zval *http_post_files=NULL; #if HAVE_MBSTRING !defined(COMPILE_DL_MBSTRING) - int str_len=0 + int str_len = 0; #endif zend_bool magic_quotes_gpc; multipart_buffer *mbuff; -- 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.h
moriyoshi Thu Jul 3 11:30:14 2003 EDT Modified files: /php-src/ext/mbstring mbstring.h Log: Added missing protos Index: php-src/ext/mbstring/mbstring.h diff -u php-src/ext/mbstring/mbstring.h:1.55 php-src/ext/mbstring/mbstring.h:1.56 --- php-src/ext/mbstring/mbstring.h:1.55Sat Jun 28 19:37:18 2003 +++ php-src/ext/mbstring/mbstring.h Thu Jul 3 11:30:14 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: mbstring.h,v 1.55 2003/06/28 23:37:18 hirokawa Exp $ */ +/* $Id: mbstring.h,v 1.56 2003/07/03 15:30:14 moriyoshi Exp $ */ /* * PHP4 Multibyte String module mbstring (currently only for Japanese) @@ -143,6 +143,9 @@ MBSTRING_API int php_mb_encoding_converter_ex(char **str, int *len, const char *encoding_to, const char *encoding_from TSRMLS_DC); +MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, const char *encoding_to, const char *encoding_from TSRMLS_DC); + +MBSTRING_API int php_mb_gpc_encoding_detector(const char *arg_string, int arg_length, char *arg_list TSRMLS_DC); ZEND_BEGIN_MODULE_GLOBALS(mbstring) enum mbfl_no_language language; -- 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/mbstring mbstring.h
moriyoshi Thu Jul 3 11:39:51 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring mbstring.h Log: MFH(r-1.56): added missing protos Index: php-src/ext/mbstring/mbstring.h diff -u php-src/ext/mbstring/mbstring.h:1.40.2.6 php-src/ext/mbstring/mbstring.h:1.40.2.7 --- php-src/ext/mbstring/mbstring.h:1.40.2.6Sat Jun 28 04:51:05 2003 +++ php-src/ext/mbstring/mbstring.h Thu Jul 3 11:39:51 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: mbstring.h,v 1.40.2.6 2003/06/28 08:51:05 hirokawa Exp $ */ +/* $Id: mbstring.h,v 1.40.2.7 2003/07/03 15:39:51 moriyoshi Exp $ */ /* * PHP4 Multibyte String module mbstring (currently only for Japanese) @@ -142,6 +142,9 @@ MBSTRING_API int php_mb_encoding_converter_ex(char **str, int *len, const char *encoding_to, const char *encoding_from TSRMLS_DC); +MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, const char *encoding_to, const char *encoding_from TSRMLS_DC); + +MBSTRING_API int php_mb_gpc_encoding_detector(const char *arg_string, int arg_length, char *arg_list TSRMLS_DC); ZEND_BEGIN_MODULE_GLOBALS(mbstring) enum mbfl_no_language language; -- 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/mssql php_mssql.c
fmk Thu Jul 3 12:47:10 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mssql php_mssql.c
Log:
Change fetch functions and protos so they make more sense.
fetch_row or fetch_assoc should not take the optional parameter
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.20 php-src/ext/mssql/php_mssql.c:1.86.2.21
--- php-src/ext/mssql/php_mssql.c:1.86.2.20 Fri Jun 13 23:36:46 2003
+++ php-src/ext/mssql/php_mssql.c Thu Jul 3 12:47:10 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.20 2003/06/14 03:36:46 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.21 2003/07/03 16:47:10 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1262,12 +1262,16 @@
/* }}} */
-static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
+static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int
expected_args)
{
zval **mssql_result_index, **resulttype = NULL;
mssql_result *result;
int i;
+ if (ZEND_NUM_ARGS() expected_args) {
+ WRONG_PARAM_COUNT;
+ }
+
switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, mssql_result_index)==FAILURE) {
@@ -1357,11 +1361,11 @@
result-cur_row++;
}
-/* {{{ proto array mssql_fetch_row(resource result_id [, int result_type])
+/* {{{ proto array mssql_fetch_row(resource result_id)
Returns an array of the current row in the result set specified by result_id */
PHP_FUNCTION(mssql_fetch_row)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_NUM);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_NUM, 1);
}
/* }}} */
@@ -1370,7 +1374,7 @@
Returns a psuedo-object of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_object)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC, 2);
if (Z_TYPE_P(return_value)==IS_ARRAY) {
object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR,
Z_ARRVAL_P(return_value));
}
@@ -1382,16 +1386,16 @@
Returns an associative array of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_array)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_BOTH);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_BOTH, 2);
}
/* }}} */
-/* {{{ proto array mssql_fetch_assoc(resource result_id [, int result_type])
+/* {{{ proto array mssql_fetch_assoc(resource result_id)
Returns an associative array of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_assoc)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC, 1);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fbsql php_fbsql.c php_fbsql.h
fmk Thu Jul 3 12:48:18 2003 EDT
Modified files:
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
Change fetch functions and protos so they make more sense.
fetch_row or fetch_assoc should not take the optional parameter
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.98 php-src/ext/fbsql/php_fbsql.c:1.99
--- php-src/ext/fbsql/php_fbsql.c:1.98 Sun Jun 15 11:27:13 2003
+++ php-src/ext/fbsql/php_fbsql.c Thu Jul 3 12:48:18 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.98 2003/06/15 15:27:13 andrey Exp $ */
+/* $Id: php_fbsql.c,v 1.99 2003/07/03 16:48:18 fmk Exp $ */
/* TODO:
*
@@ -358,14 +358,14 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN (fbsql.allow_persistent, 1,
PHP_INI_SYSTEM, OnUpdateLong,allowPersistent, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,0,
PHP_INI_SYSTEM, OnUpdateLong,generateWarnings, zend_fbsql_globals,
fbsql_globals)
- STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateLong,autoCommit,
zend_fbsql_globals, fbsql_globals)
- STD_PHP_INI_ENTRY_EX (fbsql.max_persistent, -1,
PHP_INI_SYSTEM, OnUpdateLong,maxPersistent,zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128, PHP_INI_SYSTEM, OnUpdateLong,maxLinks,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX (fbsql.max_connections, 128,
PHP_INI_SYSTEM, OnUpdateLong,maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX (fbsql.max_results,
128, PHP_INI_SYSTEM, OnUpdateLong,maxResults,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
- STD_PHP_INI_ENTRY_EX (fbsql.batchSize,
1000, PHP_INI_SYSTEM, OnUpdateLong,batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
+ STD_PHP_INI_BOOLEAN (fbsql.allow_persistent, 1,
PHP_INI_SYSTEM, OnUpdateBool, allowPersistent, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN (fbsql.generate_warnings,0,
PHP_INI_SYSTEM, OnUpdateBool, generateWarnings, zend_fbsql_globals,
fbsql_globals)
+ STD_PHP_INI_BOOLEAN (fbsql.autocommit,
1,PHP_INI_SYSTEM, OnUpdateBool, autoCommit,
zend_fbsql_globals, fbsql_globals)
+ STD_PHP_INI_ENTRY_EX (fbsql.max_persistent, -1,
PHP_INI_SYSTEM, OnUpdateLong, maxPersistent,zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX (fbsql.max_links,
128, PHP_INI_SYSTEM, OnUpdateLong, maxLinks, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX (fbsql.max_connections, 128,
PHP_INI_SYSTEM, OnUpdateLong, maxConnections, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX (fbsql.max_results,
128, PHP_INI_SYSTEM, OnUpdateLong, maxResults, zend_fbsql_globals,
fbsql_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY_EX (fbsql.batchSize,
1000, PHP_INI_SYSTEM, OnUpdateLong, batchSize,
zend_fbsql_globals, fbsql_globals, display_link_numbers)
STD_PHP_INI_ENTRY(fbsql.default_host,
NULL, PHP_INI_SYSTEM, OnUpdateString, hostName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY(fbsql.default_user,
_SYSTEM, PHP_INI_SYSTEM, OnUpdateString, userName, zend_fbsql_globals,
fbsql_globals)
STD_PHP_INI_ENTRY(fbsql.default_password, ,
PHP_INI_SYSTEM, OnUpdateString, userPassword, zend_fbsql_globals,
fbsql_globals)
@@ -2706,7 +2706,7 @@
Fetch a row of data. Returns an indexed array */
PHP_FUNCTION(fbsql_fetch_row)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_NUM);
+ php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_NUM, 1);
}
/* }}} */
@@ -2714,7 +2714,7 @@
Detch a row of data. Returns an assoc array */
PHP_FUNCTION(fbsql_fetch_assoc)
{
- php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU,
[PHP-CVS] cvs: php-src /ext/mssql php_mssql.c
fmk Thu Jul 3 12:53:05 2003 EDT
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
Change fetch functions and protos so they make more sense.
fetch_row or fetch_assoc should not take the optional parameter
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.114 php-src/ext/mssql/php_mssql.c:1.115
--- php-src/ext/mssql/php_mssql.c:1.114 Fri Jun 13 23:34:42 2003
+++ php-src/ext/mssql/php_mssql.c Thu Jul 3 12:53:04 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.114 2003/06/14 03:34:42 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.115 2003/07/03 16:53:04 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1262,12 +1262,16 @@
/* }}} */
-static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
+static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int
expected_args)
{
zval **mssql_result_index, **resulttype = NULL;
mssql_result *result;
int i;
+ if (ZEND_NUM_ARGS() expected_args) {
+ WRONG_PARAM_COUNT;
+ }
+
switch (ZEND_NUM_ARGS()) {
case 1:
if (zend_get_parameters_ex(1, mssql_result_index)==FAILURE) {
@@ -1355,11 +1359,11 @@
result-cur_row++;
}
-/* {{{ proto array mssql_fetch_row(resource result_id [, int result_type])
+/* {{{ proto array mssql_fetch_row(resource result_id)
Returns an array of the current row in the result set specified by result_id */
PHP_FUNCTION(mssql_fetch_row)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_NUM);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_NUM, 1);
}
/* }}} */
@@ -1368,7 +1372,7 @@
Returns a psuedo-object of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_object)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC, 2);
if (Z_TYPE_P(return_value)==IS_ARRAY) {
object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR,
Z_ARRVAL_P(return_value));
}
@@ -1380,16 +1384,16 @@
Returns an associative array of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_array)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_BOTH);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_BOTH, 2);
}
/* }}} */
-/* {{{ proto array mssql_fetch_assoc(resource result_id [, int result_type])
+/* {{{ proto array mssql_fetch_assoc(resource result_id)
Returns an associative array of the current row in the result set specified by
result_id */
PHP_FUNCTION(mssql_fetch_assoc)
{
- php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
+ php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC, 1);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes clone_004.phpt clone_005.phpt
helly Thu Jul 3 15:53:01 2003 EDT
Added files:
/php-src/tests/classes clone_005.phpt clone_004.phpt
Log:
More __clone testing
Index: php-src/tests/classes/clone_005.phpt
+++ php-src/tests/classes/clone_005.phpt
--TEST--
ZE2 object cloning, 5
--FILE--
?php
abstract class base {
public $a = 'base';
// disallow cloning once forever
final private function __clone() {}
}
class test extends base {
// reenabling should fail
public function __clone() {}
}
?
--EXPECTF--
Fatal error: Cannot override final method base::__clone() in %sclone_005.php on line %d
Index: php-src/tests/classes/clone_004.phpt
+++ php-src/tests/classes/clone_004.phpt
--TEST--
ZE2 object cloning, 4
--FILE--
?php
abstract class base {
public $a = 'base';
// disallow cloning
private function __clone() {}
}
class test extends base {
public $b = 'test';
// reenable cloning
public function __clone() {}
public function show() {
var_dump($this);
}
}
echo Original\n;
$o1 = new test;
$o1-a = array(1,2);
$o1-b = array(3,4);
$o1-show();
echo Clone\n;
$o2 = $o1-__clone();
$o2-show();
echo Modify\n;
$o2-a = 5;
$o2-b = 6;
$o2-show();
echo Done\n;
?
--EXPECT--
Original
object(test)#1 (2) {
[b]=
array(2) {
[0]=
int(3)
[1]=
int(4)
}
[a]=
array(2) {
[0]=
int(1)
[1]=
int(2)
}
}
Clone
object(test)#2 (2) {
[b]=
string(4) test
[a]=
string(4) base
}
Modify
object(test)#2 (2) {
[b]=
int(6)
[a]=
int(5)
}
Done
--
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) / acinclude.m4
sas Thu Jul 3 18:54:07 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-srcacinclude.m4
Log:
Quote all instances of ) when used in case..esac constructs
Some m4 versions appear to drop these when certain macros are used
recursively.
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.21 php-src/acinclude.m4:1.218.2.22
--- php-src/acinclude.m4:1.218.2.21 Tue Jul 1 23:03:41 2003
+++ php-src/acinclude.m4Thu Jul 3 18:54:07 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.21 2003/07/02 03:03:41 sas Exp $
+dnl $Id: acinclude.m4,v 1.218.2.22 2003/07/03 22:54:07 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -177,8 +177,8 @@
unset ac_new_flags
for i in [$]$1; do
case [$]i in
--L/usr/lib|-L/usr/lib/) ;;
-*) ac_new_flags=[$]ac_new_flags [$]i ;;
+-L/usr/lib|-L/usr/lib/[)] ;;
+*[)] ac_new_flags=[$]ac_new_flags [$]i ;;
esac
done
$1=[$]ac_new_flags
@@ -253,11 +253,11 @@
AC_DEFUN([PHP_EVAL_LIBLINE],[
for ac_i in $1; do
case $ac_i in
--l*)
+-l*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBRARY($ac_ii,1,$2)
;;
--L*)
+-L*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBPATH($ac_ii,$2)
;;
@@ -273,7 +273,7 @@
AC_DEFUN([PHP_EVAL_INCLINE],[
for ac_i in $1; do
case $ac_i in
--I*)
+-I*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_INCLUDE($ac_ii)
;;
@@ -337,10 +337,10 @@
PHP_SUBST(SHLIB_SUFFIX_NAME)
SHLIB_SUFFIX_NAME=so
case $host_alias in
- *hpux*)
+ *hpux*[)]
SHLIB_SUFFIX_NAME=sl
;;
- *darwin*)
+ *darwin*[)]
SHLIB_SUFFIX_NAME=dylib
;;
esac
@@ -511,17 +511,17 @@
ext_output=yes, shared
ext_shared=yes
case [$]$1 in
-shared,*)
+shared,*[)]
$1=`echo [$]$1|sed 's/^shared,//'`
;;
-shared)
+shared[)]
$1=yes
;;
-no)
+no[)]
ext_output=no
ext_shared=no
;;
-*)
+*[)]
ext_output=yes
ext_shared=no
;;
@@ -654,8 +654,8 @@
])
])
case $ac_cv_time_r_type in
- hpux) AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
- irix) AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
+ hpux[)] AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
+ irix[)] AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
esac
])
@@ -1238,10 +1238,10 @@
PHP_SAPI=$1
case $2 in
- static) PHP_BUILD_STATIC;;
- shared) PHP_BUILD_SHARED;;
- bundle) PHP_BUILD_BUNDLE;;
- program) PHP_BUILD_PROGRAM($5);;
+ static[)] PHP_BUILD_STATIC;;
+ shared[)] PHP_BUILD_SHARED;;
+ bundle[)] PHP_BUILD_BUNDLE;;
+ program[)] PHP_BUILD_PROGRAM($5);;
esac
ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
@@ -1327,13 +1327,13 @@
if test -n $EXT_SHARED; then
os=`uname -sr 2/dev/null`
case $os in
-SunOS 5.6|SunOS 5.7)
+SunOS 5.6|SunOS 5.7[)]
case $CC in
gcc*|egcs*) CFLAGS=$CFLAGS -fPIC;;
- *) CFLAGS=$CFLAGS -fpic;;
+ *[)] CFLAGS=$CFLAGS -fpic;;
esac
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
else
@@ -1371,8 +1371,8 @@
ac_shellvars='CPPFLAGS LDFLAGS LIBS'
for ac_shellvar in $ac_shellvars; do
case $ac_shellvar in
- CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;;
- *) ac_lfsvar=LFS_$ac_shellvar ;;
+ CPPFLAGS[)] ac_lfsvar=LFS_CFLAGS ;;
+ *[)] ac_lfsvar=LFS_$ac_shellvar ;;
esac
eval test '${'$ac_shellvar'+set}' = set ac_set=$ac_shellvar
(getconf $ac_lfsvar) /dev/null 21 || { ac_result=no; break; }
@@ -1381,14 +1381,14 @@
eval ac_test_$ac_shellvar=\$ac_getconf
done
case $ac_result$ac_getconfs in
-yes) ac_result=no ;;
+yes[)] ac_result=no ;;
esac
case $ac_result$ac_set in
-yes?*) ac_result=yes, but $ac_set is already set, so use its settings
+yes?*[)] ac_result=yes, but $ac_set is already set, so use its settings
esac
AC_MSG_RESULT([$ac_result])
case $ac_result in
-yes)
+yes[)]
for ac_shellvar in $ac_shellvars; do
eval $ac_shellvar=\$ac_test_$ac_shellvar
done ;;
@@ -1458,10 +1458,10 @@
AC_MSG_CHECKING([for broken getcwd])
os=`uname -sr 2/dev/null`
case $os in
-SunOS*)
+SunOS*[)]
AC_DEFINE(HAVE_BROKEN_GETCWD,1, [Define if system has broken getcwd])
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
])
@@ -1773,12 +1773,12 @@
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
case $found in
- yes)
+ yes[)]
PHP_DEF_HAVE($1)
ac_cv_func_$1=yes
;;
ifelse($#,1,,[
-*) PHP_CHECK_FUNC_LIB($@) ;;
+*[)] PHP_CHECK_FUNC_LIB($@) ;;
])
esac
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4) / acinclude.m4
sas Thu Jul 3 18:54:27 2003 EDT
Modified files: (Branch: PHP_4)
/php-srcacinclude.m4
Log:
MFB quoting of )
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.18.4.3 php-src/acinclude.m4:1.218.2.18.4.4
--- php-src/acinclude.m4:1.218.2.18.4.3 Tue Jul 1 23:04:28 2003
+++ php-src/acinclude.m4Thu Jul 3 18:54:27 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.18.4.3 2003/07/02 03:04:28 sas Exp $
+dnl $Id: acinclude.m4,v 1.218.2.18.4.4 2003/07/03 22:54:27 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -177,8 +177,8 @@
unset ac_new_flags
for i in [$]$1; do
case [$]i in
--L/usr/lib|-L/usr/lib/) ;;
-*) ac_new_flags=[$]ac_new_flags [$]i ;;
+-L/usr/lib|-L/usr/lib/[)] ;;
+*[)] ac_new_flags=[$]ac_new_flags [$]i ;;
esac
done
$1=[$]ac_new_flags
@@ -253,11 +253,11 @@
AC_DEFUN([PHP_EVAL_LIBLINE],[
for ac_i in $1; do
case $ac_i in
--l*)
+-l*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBRARY($ac_ii,1,$2)
;;
--L*)
+-L*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBPATH($ac_ii,$2)
;;
@@ -273,7 +273,7 @@
AC_DEFUN([PHP_EVAL_INCLINE],[
for ac_i in $1; do
case $ac_i in
--I*)
+-I*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_INCLUDE($ac_ii)
;;
@@ -337,10 +337,10 @@
PHP_SUBST(SHLIB_SUFFIX_NAME)
SHLIB_SUFFIX_NAME=so
case $host_alias in
- *hpux*)
+ *hpux*[)]
SHLIB_SUFFIX_NAME=sl
;;
- *darwin*)
+ *darwin*[)]
SHLIB_SUFFIX_NAME=dylib
;;
esac
@@ -511,17 +511,17 @@
ext_output=yes, shared
ext_shared=yes
case [$]$1 in
-shared,*)
+shared,*[)]
$1=`echo [$]$1|sed 's/^shared,//'`
;;
-shared)
+shared[)]
$1=yes
;;
-no)
+no[)]
ext_output=no
ext_shared=no
;;
-*)
+*[)]
ext_output=yes
ext_shared=no
;;
@@ -654,8 +654,8 @@
])
])
case $ac_cv_time_r_type in
- hpux) AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
- irix) AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
+ hpux[)] AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
+ irix[)] AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
esac
])
@@ -1238,10 +1238,10 @@
PHP_SAPI=$1
case $2 in
- static) PHP_BUILD_STATIC;;
- shared) PHP_BUILD_SHARED;;
- bundle) PHP_BUILD_BUNDLE;;
- program) PHP_BUILD_PROGRAM($5);;
+ static[)] PHP_BUILD_STATIC;;
+ shared[)] PHP_BUILD_SHARED;;
+ bundle[)] PHP_BUILD_BUNDLE;;
+ program[)] PHP_BUILD_PROGRAM($5);;
esac
ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
@@ -1327,13 +1327,13 @@
if test -n $EXT_SHARED; then
os=`uname -sr 2/dev/null`
case $os in
-SunOS 5.6|SunOS 5.7)
+SunOS 5.6|SunOS 5.7[)]
case $CC in
gcc*|egcs*) CFLAGS=$CFLAGS -fPIC;;
- *) CFLAGS=$CFLAGS -fpic;;
+ *[)] CFLAGS=$CFLAGS -fpic;;
esac
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
else
@@ -1371,8 +1371,8 @@
ac_shellvars='CPPFLAGS LDFLAGS LIBS'
for ac_shellvar in $ac_shellvars; do
case $ac_shellvar in
- CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;;
- *) ac_lfsvar=LFS_$ac_shellvar ;;
+ CPPFLAGS[)] ac_lfsvar=LFS_CFLAGS ;;
+ *[)] ac_lfsvar=LFS_$ac_shellvar ;;
esac
eval test '${'$ac_shellvar'+set}' = set ac_set=$ac_shellvar
(getconf $ac_lfsvar) /dev/null 21 || { ac_result=no; break; }
@@ -1381,14 +1381,14 @@
eval ac_test_$ac_shellvar=\$ac_getconf
done
case $ac_result$ac_getconfs in
-yes) ac_result=no ;;
+yes[)] ac_result=no ;;
esac
case $ac_result$ac_set in
-yes?*) ac_result=yes, but $ac_set is already set, so use its settings
+yes?*[)] ac_result=yes, but $ac_set is already set, so use its settings
esac
AC_MSG_RESULT([$ac_result])
case $ac_result in
-yes)
+yes[)]
for ac_shellvar in $ac_shellvars; do
eval $ac_shellvar=\$ac_test_$ac_shellvar
done ;;
@@ -1458,10 +1458,10 @@
AC_MSG_CHECKING([for broken getcwd])
os=`uname -sr 2/dev/null`
case $os in
-SunOS*)
+SunOS*[)]
AC_DEFINE(HAVE_BROKEN_GETCWD,1, [Define if system has broken getcwd])
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
])
@@ -1773,12 +1773,12 @@
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
case $found in
- yes)
+ yes[)]
PHP_DEF_HAVE($1)
ac_cv_func_$1=yes
;;
ifelse($#,1,,[
-*) PHP_CHECK_FUNC_LIB($@) ;;
+*[)] PHP_CHECK_FUNC_LIB($@) ;;
])
esac
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
sas Thu Jul 3 18:54:57 2003 EDT
Modified files:
/php-srcacinclude.m4
Log:
MFB quoting of )
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.254 php-src/acinclude.m4:1.255
--- php-src/acinclude.m4:1.254 Tue Jul 1 23:04:35 2003
+++ php-src/acinclude.m4Thu Jul 3 18:54:57 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.254 2003/07/02 03:04:35 sas Exp $
+dnl $Id: acinclude.m4,v 1.255 2003/07/03 22:54:57 sas Exp $
dnl
dnl This file contains local autoconf functions.
@@ -170,8 +170,8 @@
unset ac_new_flags
for i in [$]$1; do
case [$]i in
--L/usr/lib|-L/usr/lib/) ;;
-*) ac_new_flags=[$]ac_new_flags [$]i ;;
+-L/usr/lib|-L/usr/lib/[)] ;;
+*[)] ac_new_flags=[$]ac_new_flags [$]i ;;
esac
done
$1=[$]ac_new_flags
@@ -186,11 +186,11 @@
AC_DEFUN([PHP_EVAL_LIBLINE],[
for ac_i in $1; do
case $ac_i in
--l*)
+-l*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBRARY($ac_ii,1,$2)
;;
--L*)
+-L*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBPATH($ac_ii,$2)
;;
@@ -206,7 +206,7 @@
AC_DEFUN([PHP_EVAL_INCLINE],[
for ac_i in $1; do
case $ac_i in
--I*)
+-I*[)]
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_INCLUDE($ac_ii)
;;
@@ -270,10 +270,10 @@
PHP_SUBST(SHLIB_SUFFIX_NAME)
SHLIB_SUFFIX_NAME=so
case $host_alias in
- *hpux*)
+ *hpux*[)]
SHLIB_SUFFIX_NAME=sl
;;
- *darwin*)
+ *darwin*[)]
SHLIB_SUFFIX_NAME=dylib
;;
esac
@@ -444,17 +444,17 @@
ext_output=yes, shared
ext_shared=yes
case [$]$1 in
-shared,*)
+shared,*[)]
$1=`echo [$]$1|sed 's/^shared,//'`
;;
-shared)
+shared[)]
$1=yes
;;
-no)
+no[)]
ext_output=no
ext_shared=no
;;
-*)
+*[)]
ext_output=yes
ext_shared=no
;;
@@ -587,8 +587,8 @@
])
])
case $ac_cv_time_r_type in
- hpux) AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
- irix) AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
+ hpux[)] AC_DEFINE(PHP_HPUX_TIME_R,1,[Whether you have HP-UX 10.x]) ;;
+ irix[)] AC_DEFINE(PHP_IRIX_TIME_R,1,[Whether you have IRIX-style functions]) ;;
esac
])
@@ -1171,10 +1171,10 @@
PHP_SAPI=$1
case $2 in
- static) PHP_BUILD_STATIC;;
- shared) PHP_BUILD_SHARED;;
- bundle) PHP_BUILD_BUNDLE;;
- program) PHP_BUILD_PROGRAM($5);;
+ static[)] PHP_BUILD_STATIC;;
+ shared[)] PHP_BUILD_SHARED;;
+ bundle[)] PHP_BUILD_BUNDLE;;
+ program[)] PHP_BUILD_PROGRAM($5);;
esac
ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])])
@@ -1260,13 +1260,13 @@
if test -n $EXT_SHARED; then
os=`uname -sr 2/dev/null`
case $os in
-SunOS 5.6|SunOS 5.7)
+SunOS 5.6|SunOS 5.7[)]
case $CC in
gcc*|egcs*) CFLAGS=$CFLAGS -fPIC;;
- *) CFLAGS=$CFLAGS -fpic;;
+ *[)] CFLAGS=$CFLAGS -fpic;;
esac
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
else
@@ -1304,8 +1304,8 @@
ac_shellvars='CPPFLAGS LDFLAGS LIBS'
for ac_shellvar in $ac_shellvars; do
case $ac_shellvar in
- CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;;
- *) ac_lfsvar=LFS_$ac_shellvar ;;
+ CPPFLAGS[)] ac_lfsvar=LFS_CFLAGS ;;
+ *[)] ac_lfsvar=LFS_$ac_shellvar ;;
esac
eval test '${'$ac_shellvar'+set}' = set ac_set=$ac_shellvar
(getconf $ac_lfsvar) /dev/null 21 || { ac_result=no; break; }
@@ -1314,14 +1314,14 @@
eval ac_test_$ac_shellvar=\$ac_getconf
done
case $ac_result$ac_getconfs in
-yes) ac_result=no ;;
+yes[)] ac_result=no ;;
esac
case $ac_result$ac_set in
-yes?*) ac_result=yes, but $ac_set is already set, so use its settings
+yes?*[)] ac_result=yes, but $ac_set is already set, so use its settings
esac
AC_MSG_RESULT([$ac_result])
case $ac_result in
-yes)
+yes[)]
for ac_shellvar in $ac_shellvars; do
eval $ac_shellvar=\$ac_test_$ac_shellvar
done ;;
@@ -1391,10 +1391,10 @@
AC_MSG_CHECKING([for broken getcwd])
os=`uname -sr 2/dev/null`
case $os in
-SunOS*)
+SunOS*[)]
AC_DEFINE(HAVE_BROKEN_GETCWD,1, [Define if system has broken getcwd])
AC_MSG_RESULT([yes]);;
- *)
+ *[)]
AC_MSG_RESULT([no]);;
esac
])
@@ -1816,12 +1816,12 @@
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
case $found in
- yes)
+ yes[)]
PHP_DEF_HAVE($1)
ac_cv_func_$1=yes
;;
ifelse($#,1,,[
-*) PHP_CHECK_FUNC_LIB($@) ;;
+*[)] PHP_CHECK_FUNC_LIB($@) ;;
])
esac
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
