Index: ossp-pkg/uuid/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v
rcsdiff -q -kk '-r1.142' '-r1.143' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v' 2>/dev/null
--- ChangeLog	2007/01/01 18:14:54	1.142
+++ ChangeLog	2007/01/01 18:39:52	1.143
@@ -13,6 +13,11 @@
 
   Changes between 1.5.1 and 1.6.0 (31-Jul-2006 to 05-Oct-2006)
 
+   o Fix "uuid_export" function in PHP bindings under
+     UUID_FMT_SIV, UUID_FMT_STR and UUID_FMT_TXT where the
+     NUL-termination character should be not passed back to PHP.
+     [Neil Caunt <retardis@gmail.com>, Ralf S. Engelschall]
+
    o Adjust copyright messages for new year 2007.
      [Ralf S. Engelschall]
 
Index: ossp-pkg/uuid/THANKS
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/THANKS,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/THANKS,v' 2>/dev/null
--- THANKS	2006/10/06 08:32:40	1.12
+++ THANKS	2007/01/01 18:39:52	1.13
@@ -12,6 +12,7 @@
   bugfixes, hints, gave platform feedback, etc. (in alphabetical order):
 
     o  Matthias Andree             <matthias.andree@gmx.de>
+    o  Neil Caunt                  <retardis@gmail.com> 
     o  Neil Conway                 <neilc@samurai.com>
     o  M. Daniel                   <mdaniel@scdi.com>
     o  Simon "janus" Dassow        <janus@errornet.de>
Index: ossp-pkg/uuid/php/uuid.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/php/Attic/uuid.c,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/uuid/php/Attic/uuid.c,v' 2>/dev/null
--- uuid.c	2007/01/01 18:14:58	1.9
+++ uuid.c	2007/01/01 18:39:52	1.10
@@ -458,6 +458,10 @@
         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: %s", uuid_error(rc));
         RETURN_LONG((long)rc);
     }
+    if (fmt == UUID_FMT_SIV)
+        data_len = strlen((char *)data_ptr);
+    else if (fmt == UUID_FMT_STR || fmt == UUID_FMT_TXT)
+        data_len--; /* PHP doesn't wish NUL-termination on strings */
     ZVAL_STRINGL(z_data, data_ptr, data_len, 1);
     free(data_ptr);