diff options
| author | taca <taca@pkgsrc.org> | 2002-11-30 15:13:24 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2002-11-30 15:13:24 +0000 |
| commit | d38d3736fd3c307558f5260c95f4bf3449175759 (patch) | |
| tree | 65bb47d8b7c00364d5b7f761101787768d7696e3 /misc | |
| parent | 7ed38231091704e8450b1af55343ac374a33f879 (diff) | |
| download | pkgsrc-d38d3736fd3c307558f5260c95f4bf3449175759.tar.gz | |
Add some patch from PHP's cvs repositry (PHP_4_2_0 branch).
It should fix fatal problem on Japanese processing; trancated value
bug when array is used.
Bump to PKGREVISION to 1.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/php4-mbstring/Makefile | 4 | ||||
| -rw-r--r-- | misc/php4-mbstring/distinfo | 3 | ||||
| -rw-r--r-- | misc/php4-mbstring/patches/patch-aa | 36 |
3 files changed, 40 insertions, 3 deletions
diff --git a/misc/php4-mbstring/Makefile b/misc/php4-mbstring/Makefile index 2bedd26f3a6..e82d12b89a2 100644 --- a/misc/php4-mbstring/Makefile +++ b/misc/php4-mbstring/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/11/05 07:33:17 martti Exp $ +# $NetBSD: Makefile,v 1.5 2002/11/30 15:13:24 taca Exp $ MODNAME= mbstring CATEGORIES+= misc -PKGREVISION= # empty +PKGREVISION= 1 COMMENT= PHP4 extension for multibyte characters support (currently, Japanese only) USE_BUILDLINK2= YES diff --git a/misc/php4-mbstring/distinfo b/misc/php4-mbstring/distinfo index 769d7150f50..b158754717a 100644 --- a/misc/php4-mbstring/distinfo +++ b/misc/php4-mbstring/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 06:21:13 martti Exp $ +$NetBSD: distinfo,v 1.6 2002/11/30 15:13:25 taca Exp $ SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc Size (php-4.2.3.tar.gz) = 3413829 bytes +SHA1 (patch-aa) = be1c73e8b70ff6fcf60d312f3120312b718672a3 diff --git a/misc/php4-mbstring/patches/patch-aa b/misc/php4-mbstring/patches/patch-aa new file mode 100644 index 00000000000..7bc59ff4ba4 --- /dev/null +++ b/misc/php4-mbstring/patches/patch-aa @@ -0,0 +1,36 @@ +$NetBSD: patch-aa,v 1.1 2002/11/30 15:13:26 taca Exp $ + +--- mbstring.c.orig Thu Aug 1 14:47:56 2002 ++++ mbstring.c +@@ -1031,14 +1031,19 @@ php_mbstr_encoding_handler(zval *arg, ch + var = php_strtok_r(res, separator, &strtok_buf); + while (var) { + val = strchr(var, '='); +- val_list[n] = var; +- len_list[n] = php_url_decode(var, strlen(var)); +- n++; + if (val) { /* have a value */ ++ len_list[n] = php_url_decode(var, val-var); ++ val_list[n] = var; ++ n++; ++ + *val++ = '\0'; + val_list[n] = val; + len_list[n] = php_url_decode(val, strlen(val)); + } else { ++ len_list[n] = php_url_decode(var, strlen(var)); ++ val_list[n] = var; ++ n++; ++ + val_list[n] = ""; + len_list[n] = 0; + } +@@ -1375,7 +1380,7 @@ PHP_FUNCTION(mb_parse_str) + str_list[n] = var; + len_list[n] = php_url_decode(var, strlen(var)); + n++; +- str_list[n] = NULL; ++ str_list[n] = ""; + len_list[n] = 0; + } + n++; |