iliaa           Thu Nov 13 19:32:31 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/yp     yp.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #26235 (yp_first/yp_next do not specify correct key length).
  
  
Index: php-src/ext/yp/yp.c
diff -u php-src/ext/yp/yp.c:1.31.8.4 php-src/ext/yp/yp.c:1.31.8.5
--- php-src/ext/yp/yp.c:1.31.8.4        Fri Sep 26 06:13:30 2003
+++ php-src/ext/yp/yp.c Thu Nov 13 19:32:29 2003
@@ -16,7 +16,7 @@
    |          Fredrik Ohrn                                                |
    +----------------------------------------------------------------------+
  */
-/* $Id: yp.c,v 1.31.8.4 2003/09/26 10:13:30 hholzgra Exp $ */
+/* $Id: yp.c,v 1.31.8.5 2003/11/14 00:32:29 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -182,7 +182,7 @@
                RETURN_FALSE;
        }
        array_init(return_value);
-       add_assoc_stringl_ex(return_value,outkey,outkeylen,outval,outvallen,1);
+       add_assoc_stringl_ex(return_value,outkey,outkeylen+1,outval,outvallen,1);
 
        /* Deprecated */
        add_assoc_stringl(return_value,"key",outkey,outkeylen,1);
@@ -212,7 +212,7 @@
        }
        
        array_init(return_value);
-       add_assoc_stringl_ex(return_value,outkey,outkeylen,outval,outvallen,1);
+       add_assoc_stringl_ex(return_value,outkey,outkeylen+1,outval,outvallen,1);
 }
 /* }}} */
 
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.468 php-src/NEWS:1.1247.2.469
--- php-src/NEWS:1.1247.2.468   Thu Nov 13 04:00:48 2003
+++ php-src/NEWS        Thu Nov 13 19:32:30 2003
@@ -3,6 +3,7 @@
 ?? ??? 2003, Version 4.3.5
 - Fixed header handler in NSAPI SAPI module (header->replace was ignored,
   send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26235 (yp_first/yp_next do not specify correct key length). (Ilia)
 - Fixed bug #26216 ("getimagesize(): stream does not support seeking" when
   using remote files). (Marcus)
 - Fixed bug #26201 (crash in ibase_trans() on invalid link handle). (Ilia)

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

Reply via email to