tony2001 Thu Dec 28 14:17:09 2006 UTC
Modified files:
/php-src/ext/sockets sockets.c
/php-src/ext/standard reg.c
Log:
minor improvements
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.185&r2=1.186&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.185 php-src/ext/sockets/sockets.c:1.186
--- php-src/ext/sockets/sockets.c:1.185 Mon Dec 25 19:34:00 2006
+++ php-src/ext/sockets/sockets.c Thu Dec 28 14:17:09 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.185 2006/12/25 19:34:00 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.186 2006/12/28 14:17:09 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1627,11 +1627,12 @@
{
zval *arg1, **arg4;
struct linger lv;
- struct timeval tv;
php_socket *php_sock;
int ov, optlen, retval;
#ifdef PHP_WIN32
int timeout;
+#else
+ struct timeval tv;
#endif
long level, optname;
void *opt_ptr;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.84&r2=1.85&diff_format=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.84 php-src/ext/standard/reg.c:1.85
--- php-src/ext/standard/reg.c:1.84 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/reg.c Thu Dec 28 14:17:09 2006
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: reg.c,v 1.84 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: reg.c,v 1.85 2006/12/28 14:17:09 tony2001 Exp $ */
#include <stdio.h>
#include <ctype.h>
@@ -425,7 +425,7 @@
buf = nbuf;
}
/* stick that last bit of string on our output */
- strcat(buf, &string[pos]);
+ strlcat(buf, &string[pos], buf_len);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
