[PHP-CVS] cvs: php-src /ext/simplexml/tests .cvsignore

2003-07-07 Thread Jani Taskinen
sniper  Mon Jul  7 07:40:12 2003 EDT

  Added files: 
/php-src/ext/simplexml/tests.cvsignore 
  Log:
  Added missing .cvsignore file
  

Index: php-src/ext/simplexml/tests/.cvsignore
+++ php-src/ext/simplexml/tests/.cvsignore
phpt.*
*.diff
*.log
*.exp
*.out
*.php



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



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

2003-07-07 Thread Jani Taskinen
sniper  Mon Jul  7 07:43:34 2003 EDT

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  ws + missing fold tag
  
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.50 php-src/ext/simplexml/simplexml.c:1.51
--- php-src/ext/simplexml/simplexml.c:1.50  Fri Jul  4 20:33:13 2003
+++ php-src/ext/simplexml/simplexml.c   Mon Jul  7 07:43:34 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.50 2003/07/05 00:33:13 sterling Exp $ */
+/* $Id: simplexml.c,v 1.51 2003/07/07 11:43:34 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -208,7 +208,6 @@
 }
 /* }}} */
 
-
 /* {{{ sxe_property_write()
  */
 static void
@@ -746,7 +745,7 @@
php_sxe_object *sxe;
char   *contents = NULL;
 
-sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
+   sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
if (should_free) {
zval_dtor(writeobj);
}
@@ -794,7 +793,7 @@
 */
return NULL;
 }
-
+/* }}} */
 
 static zend_object_handlers sxe_object_handlers = {
ZEND_OBJECTS_STORE_HANDLERS,
@@ -1054,9 +1053,8 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.50 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.51 $);
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 /ext/simplexml simplexml.c

2003-07-07 Thread Zeev Suraski
zeevMon Jul  7 08:07:02 2003 EDT

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  Add missing elements
  
  
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.51 php-src/ext/simplexml/simplexml.c:1.52
--- php-src/ext/simplexml/simplexml.c:1.51  Mon Jul  7 07:43:34 2003
+++ php-src/ext/simplexml/simplexml.c   Mon Jul  7 08:07:02 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.51 2003/07/07 11:43:34 sniper Exp $ */
+/* $Id: simplexml.c,v 1.52 2003/07/07 12:07:02 zeev Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -799,6 +799,8 @@
ZEND_OBJECTS_STORE_HANDLERS,
sxe_property_read,
sxe_property_write,
+   NULL,
+   NULL,
sxe_property_get_ptr,
sxe_property_get_ptr,
sxe_object_get,
@@ -1053,7 +1055,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.51 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.52 $);
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 /ext/recode recode.c

2003-07-07 Thread Derick Rethans
derick  Mon Jul  7 09:21:10 2003 EDT

  Modified files:  
/php-src/ext/recode recode.c 
  Log:
  - Commiting conversion to zend_parse_parameters (leftovers from debugging).
  
  
Index: php-src/ext/recode/recode.c
diff -u php-src/ext/recode/recode.c:1.32 php-src/ext/recode/recode.c:1.33
--- php-src/ext/recode/recode.c:1.32Tue Jun 10 16:03:35 2003
+++ php-src/ext/recode/recode.c Mon Jul  7 09:21:10 2003
@@ -16,7 +16,7 @@
+--+
  */
  
-/* $Id: recode.c,v 1.32 2003/06/10 20:03:35 imajes Exp $ */
+/* $Id: recode.c,v 1.33 2003/07/07 13:21:10 derick Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -119,7 +119,7 @@
 {
php_info_print_table_start();
php_info_print_table_row(2, Recode Support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.32 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.33 $);
php_info_print_table_end();
 }
 
@@ -129,16 +129,14 @@
 {
RECODE_REQUEST request = NULL;
char *r = NULL;
-   zval **str;
-   zval **req;
bool success;
-   int r_len=0, r_alen =0;
+   int r_len = 0, r_alen = 0;
+   int req_len, str_len;
+   char *req, *str;
 
-   if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, req, str) == FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(TSRMLS_CC ZEND_NUM_ARGS(), ss, req, req_len, 
str, str_len) == FAILURE) {
+   return;
}
-   convert_to_string_ex(str);
-   convert_to_string_ex(req);
 
request = recode_new_request(ReSG(outer));
 
@@ -147,13 +145,13 @@
RETURN_FALSE;
}

-   success = recode_scan_request(request, Z_STRVAL_PP(req));
+   success = recode_scan_request(request, req);
if (!success) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Illegal recode request 
'%s', Z_STRVAL_PP(req));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Illegal recode request 
'%s', req);
goto error_exit;
}

-   recode_buffer_to_buffer(request, Z_STRVAL_PP(str), Z_STRLEN_PP(str), r, 
r_len, r_alen);
+   recode_buffer_to_buffer(request, str, str_len, r, r_len, r_alen);
if (!r) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Recoding failed.);
goto error_exit;



-- 
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 php_ircg.h

2003-07-07 Thread Sascha Schumann
sas Mon Jul  7 10:39:03 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ircg   ircg.c php_ircg.h 
  Log:
  Add support for who/invite/notice/lusers
  Add ircg_names/ircg_invite/ircg_lusers/ircg_oper/ircg_who/ircg_list
  
  # feature patch applied to PHP_4_3 due to won't be released status
  # of PHP_4 and HEAD being IRCG 3 incompatible.
  
  Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.11 php-src/ext/ircg/ircg.c:1.137.2.12
--- php-src/ext/ircg/ircg.c:1.137.2.11  Thu Jul  3 02:59:43 2003
+++ php-src/ext/ircg/ircg.c Mon Jul  7 10:39:03 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.11 2003/07/03 06:59:43 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.12 2003/07/07 14:39:03 sas Exp $ */
 
 /* {{{ includes */
 
@@ -105,6 +105,18 @@
FMT_MSG_DISCONNECTED,
FMT_MSG_LIST,
FMT_MSG_LISTEND,
+   FMT_MSG_WHOREPLY1,
+   FMT_MSG_WHOREPLY2,
+   FMT_MSG_ENDOFWHO,
+   FMT_MSG_INVITE,
+   FMT_MSG_NOTICE_CHAN,
+   FMT_MSG_NOTICE_TO_ME,
+   FMT_MSG_NOTICE_FROM_ME,
+   FMT_MSG_LUSERCLIENT,
+   FMT_MSG_LUSEROP,
+   FMT_MSG_LUSERUNKNOWN,
+   FMT_MSG_LUSERCHANNELS,
+   FMT_MSG_LUSERME,
NO_FMTS
 };
 /* }}} */
@@ -136,6 +148,12 @@
PHP_FE(ircg_register_format_messages, NULL)
PHP_FE(ircg_get_username, NULL)
PHP_FE(ircg_eval_ecmascript_params, NULL)
+   PHP_FE(ircg_names, NULL)
+   PHP_FE(ircg_invite, NULL)
+   PHP_FE(ircg_lusers, NULL)
+   PHP_FE(ircg_oper, NULL)
+   PHP_FE(ircg_who, NULL)
+   PHP_FE(ircg_list, NULL)
{NULL, NULL, NULL}  /* Must be the last line in ircg_functions[] */
 };
 /* }}} */
@@ -260,7 +278,19 @@
end of ban list for %cbr /,
You have been disconnectedbr /,
Channel %c has %t users and the topic is '%m'br /,
-   End of LISTbr /
+   End of LISTbr /,
+   Nickname %t has ident %f, realname '%m', hostname %c, ,
+   is on server %t, has flag %f, hopcount %m, and channel %c.br /,
+   end of whobr /,
+   %f is inviting %t to %cbr /,
+   [notice %c] %f: %mbr /,
+   notice from %f: %mbr /,
+   notice to %t: %mbr /,
+   %t users, %f services, %r serversbr /,
+   %r operatorsbr /,
+   %r unknown connectionsbr /,
+   %r formed channelsbr /,
+   I have %t clients and %r serversbr /,
 };
 
 /* }}} */
@@ -885,6 +915,27 @@
msg_send(conn, m);
 }
 
+static void notice_handler(irconn_t *ircc, smart_str *chan, smart_str *from,
+smart_str *msg, void *conn_data, void *chan_data)
+{
+php_irconn_t *conn = conn_data;
+smart_str m = {0};
+smart_str s_username;
+
+smart_str_setl(s_username, ircc-username, ircc-username_len);
+
+if (msg-c[0] == '\001') {
+handle_ctcp(conn, chan, from, chan?chan:s_username, msg, m);
+} else if (chan) {
+FORMAT_MSG(conn, FMT_MSG_NOTICE_CHAN, chan, s_username, from, msg, m, 
conn-conn.username, conn-conn.username_len);
+} else {
+FORMAT_MSG(conn, FMT_MSG_NOTICE_TO_ME, NULL, s_username, from,
+msg, m, conn-conn.username, conn-conn.username_len);
+}
+
+msg_send(conn, m);
+}
+
 static void nick_handler(irconn_t *c, smart_str *oldnick, smart_str *newnick,
void *dummy)
 {
@@ -976,6 +1027,104 @@
msg_send(conn, m);
 }
 
+static void whoreply_handler(irconn_t *c, smart_str *chan, smart_str *user,
+smart_str *host, smart_str *server, smart_str *nick, smart_str *flag,
+smart_str *hopcount, smart_str *realname, void *dummy,
+void *chan_data)
+{
+php_irconn_t *conn = dummy;
+smart_str m = {0};
+
+FORMAT_MSG(conn, FMT_MSG_WHOREPLY1, host, nick, user, realname, m,
+conn-conn.username, conn-conn.username_len);
+
+FORMAT_MSG(conn, FMT_MSG_WHOREPLY2, chan, server, flag, hopcount, m,
+conn-conn.username, conn-conn.username_len);
+msg_send(conn, m);
+}
+
+static void endofwho_handler(irconn_t *c, void *dummy)
+{
+php_irconn_t *conn = dummy;
+smart_str m = {0};
+
+FORMAT_MSG(conn, FMT_MSG_ENDOFWHO, NULL, NULL, NULL, NULL, m,
+conn-conn.username, conn-conn.username_len);
+
+msg_send(conn, m);
+}
+
+static void invite_handler(irconn_t *c, smart_str *nick, smart_str *chan, int mode, 
void *dummy)
+{
+php_irconn_t *conn = dummy;
+smart_str m = {0};
+smart_str *from, *to, tmp = {0};
+
+smart_str_setl(tmp, conn-conn.username, conn-conn.username_len);
+if (mode == 1) {
+from = tmp;
+to = nick;
+} else {
+from = nick;
+to = tmp;
+}
+
+FORMAT_MSG(conn, FMT_MSG_INVITE, chan, to, from, NULL, m,
+conn-conn.username, conn-conn.username_len);
+msg_send(conn, m);
+}
+
+
+static void luserclient_handler(irconn_t *c, smart_str *users, smart_str *services, 
smart_str *servers)
+{
+   php_irconn_t 

Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c php_ircg.h

2003-07-07 Thread Derick Rethans
On Mon, 7 Jul 2003, Sascha Schumann wrote:

 sas   Mon Jul  7 10:39:03 2003 EDT
 
   Modified files:  (Branch: PHP_4_3)
 /php-src/ext/ircg ircg.c php_ircg.h 
   Log:
   Add support for who/invite/notice/lusers
   Add ircg_names/ircg_invite/ircg_lusers/ircg_oper/ircg_who/ircg_list
   
   # feature patch applied to PHP_4_3 due to won't be released status
   # of PHP_4 and HEAD being IRCG 3 incompatible.

Isn't it much better off in PECL, where you have full control over your 
release cycle?

regards,
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(PHP_4_3) /ext/ircg ircg.c

2003-07-07 Thread Sascha Schumann
sas Mon Jul  7 11:33:08 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ircg   ircg.c 
  Log:
  Fixing
  
  
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.12 php-src/ext/ircg/ircg.c:1.137.2.13
--- php-src/ext/ircg/ircg.c:1.137.2.12  Mon Jul  7 10:39:03 2003
+++ php-src/ext/ircg/ircg.c Mon Jul  7 11:33:08 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.12 2003/07/07 14:39:03 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.13 2003/07/07 15:33:08 sas Exp $ */
 
 /* {{{ includes */
 
@@ -1075,7 +1075,7 @@
 }
 
 
-static void luserclient_handler(irconn_t *c, smart_str *users, smart_str *services, 
smart_str *servers)
+static void luserclient_handler(irconn_t *c, smart_str *users, smart_str *services, 
smart_str *servers, void *dummy)
 {
php_irconn_t *conn = dummy;
smart_str m = {0};
@@ -1085,7 +1085,7 @@
msg_send(conn, m);
 }
 
-static void luserme_handler(irconn_t *c, smart_str *users, smart_str *servers)
+static void luserme_handler(irconn_t *c, smart_str *users, smart_str *servers, void 
*dummy)
 {
php_irconn_t *conn = dummy;
smart_str m = {0};
@@ -1095,7 +1095,7 @@
msg_send(conn, m);
 }
 
-static void luserop_t(irconn_t *dummy, smart_str *str)
+static void luserop_handler(irconn_t *c, smart_str *str, void *dummy)
 {
php_irconn_t *conn = dummy;
smart_str m = {0};
@@ -1105,7 +1105,7 @@
msg_send(conn, m);
 }
 
-static void luserunknown_t(irconn_t *dummy, smart_str *str)
+static void luserunknown_handler(irconn_t *c, smart_str *str, void *dummy)
 {
php_irconn_t *conn = dummy;
smart_str m = {0};
@@ -1115,7 +1115,7 @@
msg_send(conn, m);
 }
 
-static void luserchannels_t(irconn_t *dummy, smart_str *str)
+static void luserchannels_handler(irconn_t *c, smart_str *str, void *dummy)
 {
php_irconn_t *conn = dummy;
smart_str m = {0};
@@ -1739,8 +1739,6 @@
 
 irc_handle_command(conn-conn, WHO, ops ? 2 : 1, Z_STRVAL_PP(p2), o);
 
-put_irconn(conn);
-
 RETVAL_TRUE;
 }
 #endif
@@ -1768,7 +1766,6 @@
 
 irc_handle_command(conn-conn, INVITE, 2, Z_STRVAL_PP(p3),
 Z_STRVAL_PP(p2));
-put_irconn(conn);
 
 RETVAL_TRUE;
 }
@@ -1799,7 +1796,7 @@
 
if (!conn) RETURN_FALSE;

-   irc_handle_command(conn-conn, NAMES, ac  2 ? 2 : 1, Z_STRVAL_PP(p2), 
Z_STRVAL_PP(p3));
+   irc_handle_command(conn-conn, NAMES, ac  2 ? 2 : 1, Z_STRVAL_PP(p2), ac  
2 ? Z_STRVAL_PP(p3) : NULL);
RETVAL_TRUE;
 }
 /* }}} */
@@ -2132,8 +2129,10 @@
irc_set_realname(conn, m);
}
 #endif
-   
-#define IFMSG(n, p, q) if (MSG(irconn, n)-ntoken != 0) irc_register_hook(conn, p, q)
+
+#define MSG_NOT_EMPTY(n) (MSG(irconn,n)  MSG(irconn,n)-ntoken != 0)
+
+#define IFMSG(n, p, q) if (MSG_NOT_EMPTY(n)) irc_register_hook(conn, p, q)

irc_register_hook(conn, IRCG_MSG, msg_handler);
irc_register_hook(conn, IRCG_QUIT, quit_handler);
@@ -2357,8 +2356,8 @@
 }
 /* }}} */
 
-/* {{{ proto bool ircg_nick(void)
-   ??? */
+/* {{{ proto bool ircg_nick(int connection, string newnick)
+   Changes the nickname */
 PHP_FUNCTION(ircg_nick)
 {
zval **id, **newnick;
@@ -2380,8 +2379,32 @@
 }
 /* }}} */
 
-/* {{{ proto bool ircg_notice(void)
-   ??? */
+/* {{{ proto bool ircg_list(int connection, string channel)
+   List topic/user count of channel(s) */
+PHP_FUNCTION(ircg_list)
+{
+   zval **id, **p2;
+   php_irconn_t *conn;
+   int ac = ZEND_NUM_ARGS();
+   
+   if (ac != 2 || zend_get_parameters_ex(ac, id, p2) == FAILURE)
+   WRONG_PARAM_COUNT;
+
+   convert_to_long_ex(id);
+   convert_to_string_ex(p2);
+
+   conn = lookup_irconn(Z_LVAL_PP(id));
+
+   if (!conn) RETURN_FALSE;
+   
+   irc_handle_command(conn-conn, LIST, 1, Z_STRVAL_PP(p2));
+   
+   RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool ircg_notice(int connection, string recipient, string message)
+   Sends a one-way communication NOTICE to a target */
 PHP_FUNCTION(ircg_notice)
 {
zval **id, **recipient, **msg;
@@ -2666,9 +2689,9 @@
php_info_print_table_start();
php_info_print_table_header(2, ircg support, enabled);

-   sprintf(buf, %lu, getdtablesize());
+   sprintf(buf, %d, getdtablesize());
php_info_print_table_row(2, Maximum number of open fds, buf);
-   sprintf(buf, %lu, highest_fd);
+   sprintf(buf, %d, highest_fd);
php_info_print_table_row(2, Highest encountered fd, buf);
 
sprintf(buf, %lu, cache_hits);



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



[PHP-CVS] cvs: php-src /ext/ircg ircg.c php_ircg_formats.h

2003-07-07 Thread Sascha Schumann
sas Mon Jul  7 11:45:44 2003 EDT

  Modified files:  
/php-src/ext/ircg   ircg.c php_ircg_formats.h 
  Log:
  add lusers related format messages
  
  
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.191 php-src/ext/ircg/ircg.c:1.192
--- php-src/ext/ircg/ircg.c:1.191   Fri Jul  4 03:18:32 2003
+++ php-src/ext/ircg/ircg.c Mon Jul  7 11:45:43 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: ircg.c,v 1.191 2003/07/04 07:18:32 sas Exp $ */
+/* $Id: ircg.c,v 1.192 2003/07/07 15:45:43 sas Exp $ */
 
 /* {{{ includes */
 
@@ -218,6 +218,11 @@
[notice %c] %f: %mbr /,
notice from %f: %mbr /,
notice to %t: %mbr /,
+%t users, %f services, %r serversbr /,
+%r operatorsbr /,
+%r unknown connectionsbr /,
+%r formed channelsbr /,
+I have %t clients and %r serversbr /,
 };
 
 ZEND_DECLARE_MODULE_GLOBALS(ircg);
Index: php-src/ext/ircg/php_ircg_formats.h
diff -u php-src/ext/ircg/php_ircg_formats.h:1.2 php-src/ext/ircg/php_ircg_formats.h:1.3
--- php-src/ext/ircg/php_ircg_formats.h:1.2 Thu Jun 26 14:06:20 2003
+++ php-src/ext/ircg/php_ircg_formats.h Mon Jul  7 11:45:43 2003
@@ -35,6 +35,11 @@
FMT_MSG_NOTICE_CHAN,
FMT_MSG_NOTICE_TO_ME,
FMT_MSG_NOTICE_FROM_ME,
+FMT_MSG_LUSERCLIENT,
+FMT_MSG_LUSEROP,
+FMT_MSG_LUSERUNKNOWN,
+FMT_MSG_LUSERCHANNELS,
+FMT_MSG_LUSERME,
NO_FMTS
 };
 /* }}} */



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



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

2003-07-07 Thread Rob Richards
rrichards   Mon Jul  7 15:45:25 2003 EDT

  Modified files:  
/php-src/ext/xslxsltprocessor.c 
  Log:
  changed to studlyCaps naming convention
  
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.7 php-src/ext/xsl/xsltprocessor.c:1.8
--- php-src/ext/xsl/xsltprocessor.c:1.7 Sat Jul  5 19:43:10 2003
+++ php-src/ext/xsl/xsltprocessor.c Mon Jul  7 15:45:24 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: xsltprocessor.c,v 1.7 2003/07/05 23:43:10 rrichards Exp $ */
+/* $Id: xsltprocessor.c,v 1.8 2003/07/07 19:45:24 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -35,13 +35,13 @@
 */
 
 zend_function_entry php_xsl_xsltprocessor_class_functions[] = {
-   PHP_FALIAS(import_stylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
-   PHP_FALIAS(transform_to_doc, xsl_xsltprocessor_transform_to_doc, NULL)
-   PHP_FALIAS(transform_to_uri, xsl_xsltprocessor_transform_to_uri, NULL)
-   PHP_FALIAS(transform_to_xml, xsl_xsltprocessor_transform_to_xml, NULL)
-   PHP_FALIAS(set_parameter, xsl_xsltprocessor_set_parameter, NULL)
-   PHP_FALIAS(get_parameter, xsl_xsltprocessor_get_parameter, NULL)
-   PHP_FALIAS(remove_parameter, xsl_xsltprocessor_remove_parameter, NULL)
+   PHP_FALIAS(importStylesheet, xsl_xsltprocessor_import_stylesheet, NULL)
+   PHP_FALIAS(transformToDoc, xsl_xsltprocessor_transform_to_doc, NULL)
+   PHP_FALIAS(transformToUri, xsl_xsltprocessor_transform_to_uri, NULL)
+   PHP_FALIAS(transformToXml, xsl_xsltprocessor_transform_to_xml, NULL)
+   PHP_FALIAS(setParameter, xsl_xsltprocessor_set_parameter, NULL)
+   PHP_FALIAS(getParameter, xsl_xsltprocessor_get_parameter, NULL)
+   PHP_FALIAS(removeParameter, xsl_xsltprocessor_remove_parameter, NULL)
{NULL, NULL, NULL}
 };
 



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



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

2003-07-07 Thread Sara Golemon
pollita Mon Jul  7 18:27:32 2003 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  Fix non-GNU build.  Use getaddrinfo() rather than gethostbyname2()
  
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.143 php-src/ext/sockets/sockets.c:1.144
--- php-src/ext/sockets/sockets.c:1.143 Tue Jun 17 00:44:30 2003
+++ php-src/ext/sockets/sockets.c   Mon Jul  7 18:27:32 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.143 2003/06/17 04:44:30 sterling Exp $ */
+/* $Id: sockets.c,v 1.144 2003/07/07 22:27:32 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -378,12 +378,16 @@
 static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket 
*php_sock TSRMLS_DC)
 {
struct in6_addr tmp;
-   struct hostent *host_entry;
+   struct addrinfo hints;
+   struct addrinfo *addrinfo = NULL;
 
if (inet_pton(AF_INET6, string, tmp)) {
memcpy((sin6-sin6_addr.s6_addr), (tmp.s6_addr), sizeof(struct 
in6_addr));
} else {
-   if (! (host_entry = gethostbyname2(string, AF_INET6))) {
+   memset(hints, 0, sizeof(struct addrinfo));
+   hints.ai_family = PF_INET6;
+   getaddrinfo(string, NULL, hints, addrinfo);
+   if (!addrinfo) {
 #ifdef PHP_WIN32
PHP_SOCKET_ERROR(php_sock, Host lookup failed, 
WSAGetLastError());
 #else
@@ -391,11 +395,14 @@
 #endif
return 0;
}
-   if (host_entry-h_addrtype != AF_INET6) {
+   if (addrinfo-ai_family != PF_INET6 || addrinfo-ai_addrlen != 
sizeof(struct sockaddr_in6)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup 
failed: Non AF_INET6 domain returned on AF_INET6 socket);
+   freeaddrinfo(addrinfo);
return 0;
}
-   memcpy((sin6-sin6_addr.s6_addr), host_entry-h_addr_list[0], 
host_entry-h_length);
+
+   memcpy((sin6-sin6_addr.s6_addr), ((struct 
sockaddr_in6*)(addrinfo-ai_addr))-sin6_addr.s6_addr, sizeof(struct in6_addr));
+   freeaddrinfo(addrinfo);
}
 
return 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) / EXTENSIONS

2003-07-07 Thread Jani Taskinen
sniper  Mon Jul  7 18:51:17 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcEXTENSIONS 
  Log:
  MFH
  
Index: php-src/EXTENSIONS
diff -u php-src/EXTENSIONS:1.51.2.1 php-src/EXTENSIONS:1.51.2.2
--- php-src/EXTENSIONS:1.51.2.1 Tue May  6 11:07:09 2003
+++ php-src/EXTENSIONS  Mon Jul  7 18:51:16 2003
@@ -31,6 +31,10 @@
 MAINTENANCE: Unknown
 STATUS:  Unknown
 ---
+EXTENSION:   activescript
+MAINTENANCE: Unknown
+STATUS:  Unknown
+---
 EXTENSION:   apache
 PRIMARY MAINTAINER:  Rasmus Lerdorf [EMAIL PROTECTED]
 MAINTENANCE: Maintained
@@ -45,6 +49,10 @@
 MAINTENANCE: Unknown
 STATUS:  Working
 ---
+EXTENSION:   cli
+MAINTENANCE: Unknown
+STATUS:  Working
+---
 EXTENSION:   fhttpd
 MAINTENANCE: Unknown
 STATUS:  Unknown
@@ -54,8 +62,9 @@
 STATUS:  Working
 ---
 EXTENSION:   nsapi
-MAINTENANCE: Unknown
-STATUS:  Unknown
+PRIMARY MAINTAINER:  Uwe Schindler [EMAIL PROTECTED]
+MAINTENANCE: Maintained
+STATUS:  Working
 ---
 EXTENSION:   phttpd
 MAINTENANCE: Unknown



-- 
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

2003-07-07 Thread Jani Taskinen
sniper  Mon Jul  7 18:51:27 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  Missing entries
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.275 php-src/NEWS:1.1247.2.276
--- php-src/NEWS:1.1247.2.275   Wed Jul  2 10:05:44 2003
+++ php-src/NEWSMon Jul  7 18:51:27 2003
@@ -27,9 +27,11 @@
   . php4_execute (obj.conf): support for additional php.ini values.
 Allows different settings per virtual server. 
 (See sapi/nsapi/nsapi-readme.txt for more information)
-  . Added support for virtual()
+  . Added support for virtual().
+  . Added nsapi_request_headers() and nsapi_response_headers() with aliases 
+for apache compatibility.
   . Added nsapi.read_timeout php.ini option. 
-  . Synced $_SERVER variables to be similar to Apache variables
+  . Synced $_SERVER variables to be similar to Apache variables.
 - Improved the IMAP extension (Ilia)
   . Added imap_timeout() function. (bug #24161)
   . Added optional 'charset' parameter to imap_search() and imap_sort().



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



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

2003-07-07 Thread Jani Taskinen

And you're sure getaddrinfo() is always available (whenever IPV6 is) ??

--Jani


On Mon, 7 Jul 2003, Sara Golemon wrote:

pollitaMon Jul  7 18:27:32 2003 EDT

  Modified files:  
/php-src/ext/sockets   sockets.c 
  Log:
  Fix non-GNU build.  Use getaddrinfo() rather than gethostbyname2()
  
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.143 php-src/ext/sockets/sockets.c:1.144
--- php-src/ext/sockets/sockets.c:1.143Tue Jun 17 00:44:30 2003
+++ php-src/ext/sockets/sockets.c  Mon Jul  7 18:27:32 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.143 2003/06/17 04:44:30 sterling Exp $ */
+/* $Id: sockets.c,v 1.144 2003/07/07 22:27:32 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -378,12 +378,16 @@
 static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket 
 *php_sock TSRMLS_DC)
 {
   struct in6_addr tmp;
-  struct hostent *host_entry;
+  struct addrinfo hints;
+  struct addrinfo *addrinfo = NULL;
 
   if (inet_pton(AF_INET6, string, tmp)) {
   memcpy((sin6-sin6_addr.s6_addr), (tmp.s6_addr), sizeof(struct 
 in6_addr));
   } else {
-  if (! (host_entry = gethostbyname2(string, AF_INET6))) {
+  memset(hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = PF_INET6;
+  getaddrinfo(string, NULL, hints, addrinfo);
+  if (!addrinfo) {
 #ifdef PHP_WIN32
   PHP_SOCKET_ERROR(php_sock, Host lookup failed, 
 WSAGetLastError());
 #else
@@ -391,11 +395,14 @@
 #endif
   return 0;
   }
-  if (host_entry-h_addrtype != AF_INET6) {
+  if (addrinfo-ai_family != PF_INET6 || addrinfo-ai_addrlen != 
sizeof(struct sockaddr_in6)) {
   php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup 
 failed: Non AF_INET6 domain returned on AF_INET6 socket);
+  freeaddrinfo(addrinfo);
   return 0;
   }
-  memcpy((sin6-sin6_addr.s6_addr), host_entry-h_addr_list[0], 
host_entry-h_length);
+
+  memcpy((sin6-sin6_addr.s6_addr), ((struct 
sockaddr_in6*)(addrinfo-ai_addr))-sin6_addr.s6_addr, sizeof(struct in6_addr));
+  freeaddrinfo(addrinfo);
   }
 
   return 1;





-- 
https://www.paypal.com/xclick/[EMAIL PROTECTED]no_note=1tax=0currency_code=EUR
 


-- 
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

2003-07-07 Thread Sascha Schumann
sas Mon Jul  7 21:16:59 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ircg   ircg.c 
  Log:
  Enable HTML-encoding for all IRC data
  Encode all channel names in the default format messages
  
  
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.13 php-src/ext/ircg/ircg.c:1.137.2.14
--- php-src/ext/ircg/ircg.c:1.137.2.13  Mon Jul  7 11:33:08 2003
+++ php-src/ext/ircg/ircg.c Mon Jul  7 21:16:59 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.13 2003/07/07 15:33:08 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.14 2003/07/08 01:16:59 sas Exp $ */
 
 /* {{{ includes */
 
@@ -229,8 +229,8 @@
P_JS  = 1,
P_NICKNAME= 2,
P_NICKNAME_JS = 3,
-   P_MIRC= 4,
-   P_MIRC_JS = 5,
+   P_HTML= 4,
+   P_HTML_JS = 5,
P_NOAUTO_LINKS = 8, /* Don't automatically convert links */
P_CONV_BR  = 16,/* Convert a special character to br */
P_COND_STOP= 32,/* If argument != username, stop */
@@ -251,39 +251,39 @@
 /* {{{ Default format messages */
 
 static char *fmt_msgs_default[] = {
-   [EMAIL PROTECTED]: %mbr /,
+   [EMAIL PROTECTED]: %mbr /,
%f: %mbr /,
To %t: %mbr /,
-   %f leaves %cbr /,
-   %f joins %cbr /,
-   %t was kicked by %f from %c (%m)br /,
-   %f changes topic on %c to %mbr /,
+   %f leaves %6cbr /,
+   %f joins %6cbr /,
+   %t was kicked by %f from %6c (%m)br /,
+   %f changes topic on %6c to %mbr /,
Error: %mbr /,
Fatal Error: %mbr /,
,
,
%f changes nick to %tbr /,
%f quits (%m)br /,
-   Welcome to channel %c:,
+   Welcome to channel %6c:,
 %f,
-are in the channel %cbr /,
+are in the channel %6cbr /,
%f: user(%t) host(%c) real name(%m)br /,
%f: server(%c) server info(%m)br /,
%f has been idle for %m secondsbr /,
-   %f is on channel %cbr /,
+   %f is on channel %6cbr /,
End of whois for %fbr /,
-   %f sets voice flag of %t to %m on %cbr /,
-   %f sets channel operator flag of %t to %m on %cbr /,
-   banned from %c: %mbr /,
-   end of ban list for %cbr /,
+   %f sets voice flag of %t to %m on %6cbr /,
+   %f sets channel operator flag of %t to %m on %6cbr /,
+   banned from %6c: %mbr /,
+   end of ban list for %6cbr /,
You have been disconnectedbr /,
-   Channel %c has %t users and the topic is '%m'br /,
+   Channel %6c has %t users and the topic is '%m'br /,
End of LISTbr /,
Nickname %t has ident %f, realname '%m', hostname %c, ,
is on server %t, has flag %f, hopcount %m, and channel %c.br /,
-   end of whobr /,
-   %f is inviting %t to %cbr /,
-   [notice %c] %f: %mbr /,
+   End of WHObr /,
+   %f has invited %t to %6cbr /,
+   [notice %6c] %f: %mbr /,
notice from %f: %mbr /,
notice to %t: %mbr /,
%t users, %f services, %r serversbr /,
@@ -620,6 +620,7 @@
case '3': mode |= P_NOAUTO_LINKS; goto next;
case '4': mode |= P_CONV_BR; goto next;
case '5': mode |= P_COND_STOP; goto next;
+   case '6': mode |= P_HTML; goto next;
 
/* associate mode bits with each command where applicable */
case 'c': NEW_TOKEN(C_CHANNEL, v) = mode; break;
@@ -627,8 +628,8 @@
case 't': NEW_TOKEN(C_TO, v) = mode; break;
case 'f': NEW_TOKEN(C_FROM, v) = mode; break;
case 'r': NEW_TOKEN(C_MESSAGE, v) = mode; break;
-   case 'm': NEW_TOKEN(C_MESSAGE, v) = mode | P_MIRC; break;
-   case 'j': NEW_TOKEN(C_MESSAGE, v) = mode | P_MIRC | P_JS; break;
+   case 'm': NEW_TOKEN(C_MESSAGE, v) = mode | P_HTML; break;
+   case 'j': NEW_TOKEN(C_MESSAGE, v) = mode | P_HTML | P_JS; break;
 
case '%': NEW_TOKEN(C_PERCENT, v) = 0; break;
 
@@ -650,15 +651,14 @@
smart_str *to, smart_str *from, smart_str *msg, smart_str *result, 
const char *username, int username_len, int *status)
 {
-   smart_str encoded_msg = {0};
-   int encoded = 0;
int i = 0;
const token_t *t = fmt_msg-t;
int ntoken = fmt_msg-ntoken;
+   smart_str tmp = {0};

exec_fmt_msgs++;

-#define IRCG_APPEND(what)  \
+#define IRCG_APPEND(what, use_cache)  
 \
if (t[i].para.v  P_COND_STOP) {\
if (username_len != what-len || memcmp(what-c, username, 
username_len) != 0) \
goto stop; 
 \
@@ -685,37 +685,45 @@
  

[PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h

2003-07-07 Thread Brad House
bradmsswMon Jul  7 22:59:50 2003 EDT

  Modified files:  
/php-src/ext/mcve   mcve.c php_mcve.h 
  Log:
  sync functionality with libmcve 3.2
  Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.19 php-src/ext/mcve/mcve.c:1.20
--- php-src/ext/mcve/mcve.c:1.19Mon Jun 16 10:20:05 2003
+++ php-src/ext/mcve/mcve.c Mon Jul  7 22:59:50 2003
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: mcve.c,v 1.19 2003/06/16 14:20:05 andrey Exp $ */
+/* $Id: mcve.c,v 1.20 2003/07/08 02:59:50 bradmssw Exp $ */
 
 /* standard php include(s) */
 #include php.h
@@ -49,6 +49,7 @@
PHP_FE(mcve_setdropfile,NULL)
PHP_FE(mcve_setip,  NULL)
PHP_FE(mcve_setssl, NULL)
+   PHP_FE(mcve_setssl_files,   NULL)
PHP_FE(mcve_settimeout, NULL)
PHP_FE(mcve_setblocking,NULL)
PHP_FE(mcve_verifyconnection,   NULL)
@@ -190,6 +191,33 @@
REGISTER_LONG_CONSTANT(MC_ADMIN, MC_ADMIN, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_AUDITTYPE, MC_AUDITTYPE, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_CUSTOM, MC_CUSTOM, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_EXAMOUNT, MC_EXAMOUNT, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_EXCHARGES, MC_EXCHARGES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RATE, MC_RATE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RENTERNAME, MC_RENTERNAME, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNCITY, MC_RETURNCITY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNSTATE, MC_RETURNSTATE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNLOCATION, MC_RETURNLOCATION, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIORITY, MC_PRIORITY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_INQUIRY, MC_INQUIRY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_CARDTYPES, MC_CARDTYPES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_SUB, MC_SUB, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_MARKER, MC_MARKER, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DEVICETYPE, MC_DEVICETYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_ERRORCODE, MC_ERRORCODE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_NEWBATCH, MC_NEWBATCH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_CURR, MC_CURR, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DESCMERCH, MC_DESCMERCH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DESCLOC, MC_DESCLOC, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_ORIGTYPE, MC_ORIGTYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PIN, MC_PIN, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_VOIDORIGTYPE, MC_VOIDORIGTYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_TIMESTAMP, MC_TIMESTAMP, MCVE_CONST);
+
+   /* Args for priorities */
+   REGISTER_LONG_CONSTANT(MC_PRIO_HIGH, MC_PRIO_HIGH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIO_NORMAL, MC_PRIO_NORMAL, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIO_LOW, MC_PRIO_LOW, MCVE_CONST);
 
/* Args for adding a user */
REGISTER_LONG_CONSTANT(MC_USER_PROC, MC_USER_PROC, MCVE_CONST);
@@ -210,16 +238,87 @@
REGISTER_LONG_CONSTANT(MC_USER_MERCHLOC, MC_USER_MERCHLOC, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_USER_STATECODE, MC_USER_STATECODE, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_USER_PHONE, MC_USER_PHONE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_SUB, MC_USER_SUB, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_CARDTYPES, MC_USER_CARDTYPES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_MODE, MC_USER_MODE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_VNUMBER, MC_USER_VNUMBER, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_ROUTINGID, MC_USER_ROUTINGID, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_PPROPERTY, MC_USER_PPROPERTY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_PID, MC_USER_PID, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_PIDPWD, MC_USER_PIDPWD, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_SMID, MC_USER_SMID, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_SMIDPWD, MC_USER_SMIDPWD, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_USDDIV, MC_USER_USDDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_AUDDIV, MC_USER_AUDDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_DKKDIV, MC_USER_DKKDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_GBPDIV, MC_USER_GBPDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_HKDDIV, MC_USER_HKDDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_JPYDIV, MC_USER_JPYDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_NZDDIV, MC_USER_NZDDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_NOKDIV, MC_USER_NOKDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_SGDDIV, MC_USER_SGDDIV, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_ZARDIV, MC_USER_ZARDIV, MCVE_CONST);
+   

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mcve mcve.c php_mcve.h

2003-07-07 Thread Brad House
bradmsswMon Jul  7 23:16:38 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/mcve   mcve.c php_mcve.h 
  Log:
  update mcve ext from HEAD. Sync with libmcve-3.2 functionality
  Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.14.2.2 php-src/ext/mcve/mcve.c:1.14.2.3
--- php-src/ext/mcve/mcve.c:1.14.2.2Fri Jun  6 02:17:08 2003
+++ php-src/ext/mcve/mcve.c Mon Jul  7 23:16:38 2003
@@ -4,10 +4,10 @@
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
-   | This source file is subject to version 2.02 of the PHP license,  |
+   | This source file is subject to version 3.0 of the PHP license,   |
| that is bundled with this package in the file LICENSE, and is|
-   | available at through the world-wide-web at   |
-   | http://www.php.net/license/2_02.txt. |
+   | available through the world-wide-web at the following url:   |
+   | http://www.php.net/license/3_0.txt.  |
| If you did not receive a copy of the PHP license and are unable to   |
| obtain it through the world-wide-web, please send a note to  |
| [EMAIL PROTECTED] so we can mail you a copy immediately.   |
@@ -17,6 +17,8 @@
+--+
 */
 
+/* $Id: mcve.c,v 1.14.2.3 2003/07/08 03:16:38 bradmssw Exp $ */
+
 /* standard php include(s) */
 #include php.h
 #include ext/standard/head.h
@@ -47,6 +49,7 @@
PHP_FE(mcve_setdropfile,NULL)
PHP_FE(mcve_setip,  NULL)
PHP_FE(mcve_setssl, NULL)
+   PHP_FE(mcve_setssl_files,   NULL)
PHP_FE(mcve_settimeout, NULL)
PHP_FE(mcve_setblocking,NULL)
PHP_FE(mcve_verifyconnection,   NULL)
@@ -188,6 +191,33 @@
REGISTER_LONG_CONSTANT(MC_ADMIN, MC_ADMIN, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_AUDITTYPE, MC_AUDITTYPE, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_CUSTOM, MC_CUSTOM, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_EXAMOUNT, MC_EXAMOUNT, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_EXCHARGES, MC_EXCHARGES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RATE, MC_RATE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RENTERNAME, MC_RENTERNAME, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNCITY, MC_RETURNCITY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNSTATE, MC_RETURNSTATE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_RETURNLOCATION, MC_RETURNLOCATION, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIORITY, MC_PRIORITY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_INQUIRY, MC_INQUIRY, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_CARDTYPES, MC_CARDTYPES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_SUB, MC_SUB, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_MARKER, MC_MARKER, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DEVICETYPE, MC_DEVICETYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_ERRORCODE, MC_ERRORCODE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_NEWBATCH, MC_NEWBATCH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_CURR, MC_CURR, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DESCMERCH, MC_DESCMERCH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_DESCLOC, MC_DESCLOC, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_ORIGTYPE, MC_ORIGTYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PIN, MC_PIN, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_VOIDORIGTYPE, MC_VOIDORIGTYPE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_TIMESTAMP, MC_TIMESTAMP, MCVE_CONST);
+
+   /* Args for priorities */
+   REGISTER_LONG_CONSTANT(MC_PRIO_HIGH, MC_PRIO_HIGH, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIO_NORMAL, MC_PRIO_NORMAL, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_PRIO_LOW, MC_PRIO_LOW, MCVE_CONST);
 
/* Args for adding a user */
REGISTER_LONG_CONSTANT(MC_USER_PROC, MC_USER_PROC, MCVE_CONST);
@@ -208,16 +238,87 @@
REGISTER_LONG_CONSTANT(MC_USER_MERCHLOC, MC_USER_MERCHLOC, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_USER_STATECODE, MC_USER_STATECODE, MCVE_CONST);
REGISTER_LONG_CONSTANT(MC_USER_PHONE, MC_USER_PHONE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_SUB, MC_USER_SUB, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_CARDTYPES, MC_USER_CARDTYPES, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_MODE, MC_USER_MODE, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_VNUMBER, MC_USER_VNUMBER, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_ROUTINGID, MC_USER_ROUTINGID, MCVE_CONST);
+   REGISTER_LONG_CONSTANT(MC_USER_PPROPERTY, MC_USER_PPROPERTY, MCVE_CONST);
+   

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

2003-07-07 Thread Sara Golemon
pollita Mon Jul  7 23:38:00 2003 EDT

  Modified files:  
/php-src/ext/socketsconfig.m4 sockets.c 
  Log:
  Make php_set_inet6_addr happy with any environment.  Use getaddrinfo() if available, 
gethostbyname2() if not, and simply fail if neither is present.
  
Index: php-src/ext/sockets/config.m4
diff -u php-src/ext/sockets/config.m4:1.14 php-src/ext/sockets/config.m4:1.15
--- php-src/ext/sockets/config.m4:1.14  Thu Jun 19 04:41:51 2003
+++ php-src/ext/sockets/config.m4   Mon Jul  7 23:38:00 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.14 2003/06/19 08:41:51 derick Exp $
+dnl $Id: config.m4,v 1.15 2003/07/08 03:38:00 pollita Exp $
 dnl
 
 PHP_ARG_ENABLE(sockets, whether to enable sockets support,
@@ -30,3 +30,6 @@
 
   PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
 fi
+
+PHP_CHECK_FUNC(gethostbyname2)
+
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.144 php-src/ext/sockets/sockets.c:1.145
--- php-src/ext/sockets/sockets.c:1.144 Mon Jul  7 18:27:32 2003
+++ php-src/ext/sockets/sockets.c   Mon Jul  7 23:38:00 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.144 2003/07/07 22:27:32 pollita Exp $ */
+/* $Id: sockets.c,v 1.145 2003/07/08 03:38:00 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -378,12 +378,18 @@
 static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket 
*php_sock TSRMLS_DC)
 {
struct in6_addr tmp;
+#ifdef HAVE_GETADDRINFO
struct addrinfo hints;
struct addrinfo *addrinfo = NULL;
+#elif defined(HAVE_GETHOSTBYNAME2)
+   struct hostent *host_entry;
+#endif
 
if (inet_pton(AF_INET6, string, tmp)) {
memcpy((sin6-sin6_addr.s6_addr), (tmp.s6_addr), sizeof(struct 
in6_addr));
} else {
+#ifdef HAVE_GETADDRINFO
+
memset(hints, 0, sizeof(struct addrinfo));
hints.ai_family = PF_INET6;
getaddrinfo(string, NULL, hints, addrinfo);
@@ -403,6 +409,29 @@
 
memcpy((sin6-sin6_addr.s6_addr), ((struct 
sockaddr_in6*)(addrinfo-ai_addr))-sin6_addr.s6_addr, sizeof(struct in6_addr));
freeaddrinfo(addrinfo);
+
+#elif defined(HAVE_GETHOSTBYNAME2)
+
+   if (! (host_entry = gethostbyname2(string, AF_INET6))) {
+#ifdef PHP_WIN32
+   PHP_SOCKET_ERROR(php_sock, Host lookup failed, 
WSAGetLastError());
+#else
+   PHP_SOCKET_ERROR(php_sock, Host lookup failed, (-1 - 
h_errno));
+#endif
+   return 0;
+   }
+   if (host_entry-h_addrtype != AF_INET6) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup 
failed: Non AF_INET6 domain returned on AF_INET6 socket);
+   return 0;
+   }
+   memcpy((sin6-sin6_addr.s6_addr), host_entry-h_addr_list[0], 
host_entry-h_length);
+
+#else
+   /* No IPv6 specific hostname resolution is available on this system? */
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, No IPv6 compatable 
hostname resolution available on system.);
+   reurn 0;
+#endif
+
}
 
return 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) /ext/ircg ircg.c

2003-07-07 Thread Sascha Schumann
sas Tue Jul  8 00:25:41 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/ircg   ircg.c 
  Log:
  protos
  
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.137.2.14 php-src/ext/ircg/ircg.c:1.137.2.15
--- php-src/ext/ircg/ircg.c:1.137.2.14  Mon Jul  7 21:16:59 2003
+++ php-src/ext/ircg/ircg.c Tue Jul  8 00:25:40 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ircg.c,v 1.137.2.14 2003/07/08 01:16:59 sas Exp $ */
+/* $Id: ircg.c,v 1.137.2.15 2003/07/08 04:25:40 sas Exp $ */
 
 /* {{{ includes */
 
@@ -2237,8 +2237,8 @@
 }
 /* }}} */
 
-/* {{{ proto int ircg_pconnect(void)
-   ??? */
+/* {{{ proto int ircg_pconnect(string username [, string server [, int port [, string 
format-msg-set-name [, array ctcp-set [, array user-details [, bool 
bailout-on-trivial]])
+   Create a persistent IRC connection */
 PHP_FUNCTION(ircg_pconnect)
 {
/* This should become an array very soon */
@@ -2344,8 +2344,8 @@
 }
 /* }}} */
 
-/* {{{ proto bool ircg_disconnect(void)
-   ??? */
+/* {{{ proto bool ircg_disconnect(int connection, string reason)
+   Terminate IRC connection */
 PHP_FUNCTION(ircg_disconnect)
 {
zval **id, **reason;
@@ -2432,6 +2432,9 @@
 }
 /* }}} */
 
+/* {{{ proto array ircg_eval_ecmascript_params(string params)
+   Decodes a list of JS-encoded parameters into a native array */
+
 #define ADD_PARA() do { \
if (para.len) smart_str_0(para); \
add_next_index_stringl(return_value, \
@@ -2543,9 +2546,10 @@
smart_str_free(para);
}
 }
+/* }}} */
 
-/* {{{ proto bool ircg_msg(void)
-   ??? */
+/* {{{ proto bool ircg_msg(int connection, string recipient, string message [,bool 
loop-suppress])
+   Delivers a message to the IRC network */
 PHP_FUNCTION(ircg_msg)
 {
zval **id, **recipient, **msg, **suppress;
@@ -2696,7 +2700,7 @@
php_info_print_table_header(2, ircg support, enabled);

sprintf(buf, %d, getdtablesize());
-   php_info_print_table_row(2, Maximum number of open fds, buf);
+   php_info_print_table_row(2, Maximum number of open fds (system limit), buf);
sprintf(buf, %d, highest_fd);
php_info_print_table_row(2, Highest encountered fd, buf);
 



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



[PHP-CVS] cvs: php-src /ext/ircg ircg.c php_ircg.h php_ircg_private.h php_ircg_tokenizer.c php_ircg_tokenizer.h

2003-07-07 Thread Sascha Schumann
sas Tue Jul  8 00:59:48 2003 EDT

  Modified files:  
/php-src/ext/ircg   ircg.c php_ircg.h php_ircg_private.h 
php_ircg_tokenizer.c php_ircg_tokenizer.h 
  Log:
  * Added ircg_lusers(int connection)
  * Added ircg_names(int connection, string channel [, string target])
  * Added ircg_oper(int connection, string name, string password)
  * Added ircg_list(int connection, string channel)
  * Added support for RPL_LUSER*, RPL_YOUREOPER, various ERR_*
  * Added HTML-encoding of all data sources (%c etc.)
  * Added highest used fd/maximum open fds info to phpinfo()
  
  Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.192 php-src/ext/ircg/ircg.c:1.193
--- php-src/ext/ircg/ircg.c:1.192   Mon Jul  7 11:45:43 2003
+++ php-src/ext/ircg/ircg.c Tue Jul  8 00:59:47 2003
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: ircg.c,v 1.192 2003/07/07 15:45:43 sas Exp $ */
+/* $Id: ircg.c,v 1.193 2003/07/08 04:59:47 sas Exp $ */
 
 /* {{{ includes */
 
@@ -84,6 +84,8 @@
 /* initialized in the IRCG control process, so that we can avoid locking */
 struct cache_entry *php_ircg_cache_entries;
 
+#define SEEN_FD(fd) do { if ((fd)  php_ircg-highest_fd) php_ircg-highest_fd = 
(fd); } while (0)
+
 /* }}} */
 
 /* {{{ ircg_functions[] */
@@ -100,25 +102,15 @@
PHP_FE(ircg_msg, NULL)
PHP_FE(ircg_notice, NULL)
PHP_FE(ircg_nick, NULL)
-#if IRCG_API_VERSION - 0 = 20010226
PHP_FE(ircg_topic, NULL)
-#endif
-#if IRCG_API_VERSION - 0 = 20010227
PHP_FE(ircg_channel_mode, NULL)
-#endif 
PHP_FE(ircg_html_encode, NULL)
-#if IRCG_API_VERSION - 0 = 20010227
PHP_FE(ircg_whois, NULL)
-#endif
-#if IRCG_API_VERSION - 0 = 20010226
PHP_FE(ircg_kick, NULL)
-#endif
PHP_FE(ircg_nickname_escape, NULL)
PHP_FE(ircg_nickname_unescape, NULL)
-#if IRCG_API_VERSION - 0 = 20010402
PHP_FE(ircg_ignore_add, NULL)
PHP_FE(ircg_ignore_del, NULL)
-#endif
PHP_FE(ircg_disconnect, NULL)
PHP_FE(ircg_fetch_error_msg, NULL)
PHP_FE(ircg_is_conn_alive, NULL)
@@ -126,12 +118,12 @@
PHP_FE(ircg_register_format_messages, NULL)
PHP_FE(ircg_get_username, NULL)
PHP_FE(ircg_eval_ecmascript_params, NULL)
-#if IRCG_API_VERSION = 20021115
-   PHP_FE(ircg_who, NULL)
-#endif
-#if IRCG_API_VERSION = 20021117
+   PHP_FE(ircg_names, NULL)
PHP_FE(ircg_invite, NULL)
-#endif
+   PHP_FE(ircg_lusers, NULL)
+   PHP_FE(ircg_oper, NULL)
+   PHP_FE(ircg_who, NULL)
+   PHP_FE(ircg_list, NULL)
{NULL, NULL, NULL}  /* Must be the last line in ircg_functions[] */
 };
 /* }}} */
@@ -183,46 +175,46 @@
 /* {{{ Default format messages */
 
 static char *fmt_msgs_default[] = {
-   [%c] %f: %mbr /,
-   private from %f: %mbr /,
-   %f private to %t: %mbr /,
-   %f leaves %cbr /,
-   %f joins %cbr /,
-   %t was kicked by %f from %c (%m)br /,
-   %f changes topic on %c to %mbr /,
+   [EMAIL PROTECTED]: %mbr /,
+   %f: %mbr /,
+   To %t: %mbr /,
+   %f leaves %6cbr /,
+   %f joins %6cbr /,
+   %t was kicked by %f from %6c (%m)br /,
+   %f changes topic on %6c to %mbr /,
Error: %mbr /,
Fatal Error: %mbr /,
,
,
%f changes nick to %tbr /,
%f quits (%m)br /,
-   Users in channel %c:,
+   Welcome to channel %6c:,
 %f,
-in the channel %cbr /,
+are in the channel %6cbr /,
%f: user(%t) host(%c) real name(%m)br /,
%f: server(%c) server info(%m)br /,
%f has been idle for %m secondsbr /,
-   %f is on channel %cbr /,
+   %f is on channel %6cbr /,
End of whois for %fbr /,
-   %f sets voice flag of %t to %m on %cbr /,
-   %f sets channel operator flag of %t to %m on %cbr /,
-   banned from %c: %mbr /,
-   end of ban list for %cbr /,
+   %f sets voice flag of %t to %m on %6cbr /,
+   %f sets channel operator flag of %t to %m on %6cbr /,
+   banned from %6c: %mbr /,
+   end of ban list for %6cbr /,
You have been disconnectedbr /,
-   Channel %c has %t users and the topic is '%m'br /,
+   Channel %6c has %t users and the topic is '%m'br /,
End of LISTbr /,
Nickname %t has ident %f, realname '%m', hostname %c, ,
is on server %t, has flag %f, hopcount %m, and channel %c.br /,
-   end of whobr /,
-   %f is inviting %t to %cbr /,
-   [notice %c] %f: %mbr /,
+   End of WHObr /,
+   %f has invited %t to %6cbr /,
+   [notice %6c] %f: %mbr /,
notice from %f: %mbr /,
notice to %t: %mbr /,
-%t users, %f services, %r serversbr /,
-%r operatorsbr /,
-%r unknown connectionsbr /,
-%r formed channelsbr /,
-I have %t clients and %r serversbr /,
+   %t users, %f services, %r serversbr /,
+   %r 

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

2003-07-07 Thread Sara Golemon
pollita Tue Jul  8 01:00:15 2003 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  gethostbyname2() not thread safe.  Use getaddrinfo() or nothing at all.
  
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.145 php-src/ext/sockets/sockets.c:1.146
--- php-src/ext/sockets/sockets.c:1.145 Mon Jul  7 23:38:00 2003
+++ php-src/ext/sockets/sockets.c   Tue Jul  8 01:00:13 2003
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.145 2003/07/08 03:38:00 pollita Exp $ */
+/* $Id: sockets.c,v 1.146 2003/07/08 05:00:13 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -381,8 +381,6 @@
 #ifdef HAVE_GETADDRINFO
struct addrinfo hints;
struct addrinfo *addrinfo = NULL;
-#elif defined(HAVE_GETHOSTBYNAME2)
-   struct hostent *host_entry;
 #endif
 
if (inet_pton(AF_INET6, string, tmp)) {
@@ -410,25 +408,9 @@
memcpy((sin6-sin6_addr.s6_addr), ((struct 
sockaddr_in6*)(addrinfo-ai_addr))-sin6_addr.s6_addr, sizeof(struct in6_addr));
freeaddrinfo(addrinfo);
 
-#elif defined(HAVE_GETHOSTBYNAME2)
-
-   if (! (host_entry = gethostbyname2(string, AF_INET6))) {
-#ifdef PHP_WIN32
-   PHP_SOCKET_ERROR(php_sock, Host lookup failed, 
WSAGetLastError());
-#else
-   PHP_SOCKET_ERROR(php_sock, Host lookup failed, (-1 - 
h_errno));
-#endif
-   return 0;
-   }
-   if (host_entry-h_addrtype != AF_INET6) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup 
failed: Non AF_INET6 domain returned on AF_INET6 socket);
-   return 0;
-   }
-   memcpy((sin6-sin6_addr.s6_addr), host_entry-h_addr_list[0], 
host_entry-h_length);
-
 #else
/* No IPv6 specific hostname resolution is available on this system? */
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, No IPv6 compatable 
hostname resolution available on system.);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup failed: 
getaddrinfo() not available on system.);
reurn 0;
 #endif
 



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



[PHP-CVS] cvs: php-src(PHP_4) /scripts phpize.in

2003-07-07 Thread Sascha Schumann
sas Tue Jul  8 01:36:39 2003 EDT

  Modified files:  (Branch: PHP_4)
/php-src/scriptsphpize.in 
  Log:
  sync with PHP_4_3
  
  
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.1.2.2 php-src/scripts/phpize.in:1.1.2.2.2.1
--- php-src/scripts/phpize.in:1.1.2.2   Mon Jun 16 17:44:54 2003
+++ php-src/scripts/phpize.in   Tue Jul  8 01:36:39 2003
@@ -12,20 +12,36 @@
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \
config.log config.status Makefile Makefile.fragments Makefile.objects
 
-if test ! -r config.m4; then
-  echo Cannot find config.m4. 
-  echo Make sure that you run $0 in the top level source directory of the module
-  exit 1
-fi
-
-# Cleanup
-if test $1 = --clean; then
-  echo Cleaning..
-  for i in $CLEAN_FILES; do
-test -e  rm -rf $i
-  done
-  exit 0
-fi
+case $1 in 
+  # Cleanup
+  --clean)
+if test -r config.m4; then
+  echo Cleaning..
+  for i in $CLEAN_FILES; do
+test -e $i  rm -rf $i
+  done
+  exit 0
+else
+  echo Cannot find config.m4. 
+  echo Make sure that you run '$0 --clean' in the top level source directory of 
the module
+  echo 
+  exit 1
+fi
+;;
+  # Usage
+  --help)
+echo Usage: $0 [--clean|--help]
+exit 1
+;;
+  *)
+if test ! -r config.m4; then
+  echo Cannot find config.m4. 
+  echo Make sure that you run '$0' in the top level source directory of the 
module
+  echo 
+  exit 1
+fi
+;;
+esac
 
 test -d build || mkdir build
 
@@ -44,9 +60,9 @@
 libtoolize -f -c || exit 1
 
 # dumping API NOs:
-PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`
-ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO' 
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
-ZEND_EXTENSION_API_NO=`grep -E '#define ZEND_EXTENSION_API_NO' 
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
+PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO' 
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
+ZEND_EXTENSION_API_NO=`egrep '#define ZEND_EXTENSION_API_NO' 
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
 
 echo Configuring for:
 echo   PHP Api Version:  $PHP_API_VERSION



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



[PHP-CVS] cvs: php-src /scripts phpize.in

2003-07-07 Thread Sascha Schumann
sas Tue Jul  8 01:37:06 2003 EDT

  Modified files:  
/php-src/scriptsphpize.in 
  Log:
  grep -E - egrep
  
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.5 php-src/scripts/phpize.in:1.6
--- php-src/scripts/phpize.in:1.5   Tue Jul  1 12:20:32 2003
+++ php-src/scripts/phpize.in   Tue Jul  8 01:37:06 2003
@@ -60,9 +60,9 @@
 libtoolize -f -c || exit 1
 
 # dumping API NOs:
-PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`
-ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO' 
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
-ZEND_EXTENSION_API_NO=`grep -E '#define ZEND_EXTENSION_API_NO' 
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
+PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 
's/#define PHP_API_VERSION//'`
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO' 
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
+ZEND_EXTENSION_API_NO=`egrep '#define ZEND_EXTENSION_API_NO' 
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
 
 echo Configuring for:
 echo   PHP Api Version:  $PHP_API_VERSION



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