[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sockets sockets.c /ext/standard reg.c

[Antony Dovgal]

tony2001                Thu Dec 28 14:17:39 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       reg.c 
    /php-src/ext/sockets        sockets.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.82.2.3&r2=1.82.2.3.2.1&diff_format=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.82.2.3 
php-src/ext/standard/reg.c:1.82.2.3.2.1
--- php-src/ext/standard/reg.c:1.82.2.3 Sun Feb 26 10:49:50 2006
+++ php-src/ext/standard/reg.c  Thu Dec 28 14:17:38 2006
@@ -17,7 +17,7 @@
    |          Jaakko Hyvätti <[EMAIL PROTECTED]>                      | 
    +----------------------------------------------------------------------+
  */
-/* $Id: reg.c,v 1.82.2.3 2006/02/26 10:49:50 helly Exp $ */
+/* $Id: reg.c,v 1.82.2.3.2.1 2006/12/28 14:17:38 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);
                }
        }
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.4&r2=1.171.2.9.2.5&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.4 
php-src/ext/sockets/sockets.c:1.171.2.9.2.5
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.4 Tue Oct  3 19:51:01 2006
+++ php-src/ext/sockets/sockets.c       Thu Dec 28 14:17:38 2006
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.171.2.9.2.4 2006/10/03 19:51:01 iliaa Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.5 2006/12/28 14:17:38 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1600,11 +1600,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;

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