pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php5 add patch for WDDX non-ASCII serializer/dese...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1873ca90d857
branches:  trunk
changeset: 513287:1873ca90d857
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Tue May 23 22:55:22 2006 +0000

description:
add patch for WDDX non-ASCII serializer/deserializer problem, reported
as PHP Bug 37569 and 37571

diffstat:

 lang/php5/distinfo         |   3 ++-
 lang/php5/patches/patch-au |  14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r b7bfdcc08144 -r 1873ca90d857 lang/php5/distinfo
--- a/lang/php5/distinfo        Tue May 23 20:51:44 2006 +0000
+++ b/lang/php5/distinfo        Tue May 23 22:55:22 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2006/05/17 06:20:00 reed Exp $
+$NetBSD: distinfo,v 1.23 2006/05/23 22:55:22 jdolecek Exp $
 
 SHA1 (php-5.1.4/php-5.1.4.tar.bz2) = 83d4c5a4a3e8f3bcb0da841edd8d55893dbf5394
 RMD160 (php-5.1.4/php-5.1.4.tar.bz2) = d4ab11884a3a899f21eef777767a553cf81584ce
@@ -10,3 +10,4 @@
 SHA1 (patch-ao) = 60fec83647ca5924a38bf4d5e8abb51feba1620e
 SHA1 (patch-as) = 217c06efe5912570fab64f205d0b4faa07cda063
 SHA1 (patch-at) = d1dd8decd0e5528e9166bd313bc382e3e138a82f
+SHA1 (patch-au) = 90264101db6c2f000c30d1f513392acec781202b
diff -r b7bfdcc08144 -r 1873ca90d857 lang/php5/patches/patch-au
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-au        Tue May 23 22:55:22 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.1 2006/05/23 22:55:23 jdolecek Exp $
+
+--- ext/wddx/wddx.c.orig       2006-05-24 00:39:34.000000000 +0200
++++ ext/wddx/wddx.c
+@@ -399,7 +399,8 @@ static void php_wddx_serialize_string(wd
+                                       break;
+ 
+                               default:
+-                                      if (iscntrl((int)*(unsigned char *)p)) {
++                                      if (iscntrl((int)*(unsigned char *)p)
++                                          && isascii((int)*(unsigned char *)p)) {
+                                               FLUSH_BUF();
+                                               sprintf(control_buf, WDDX_CHAR, *p);
+                                               php_wddx_add_chunk(packet, control_buf);



Home | Main Index | Thread Index | Old Index