From: Eric Wong Date: Tue, 26 Feb 2013 02:52:37 +0000 (+0000) Subject: http: avoid frozen string bug in filter_body X-Git-Tag: v4.6.2~1 X-Git-Url: https://repo.or.cz/w/unicorn.git/commitdiff_plain/f7ee06592d7709e96f64efb5e7a9485b54415c9d http: avoid frozen string bug in filter_body Our rb_str_modify() became no-ops due to incomplete reverts of workarounds for old Rubinius, causing rb_str_set_len to fail with: can't set length of shared string (RuntimeError) This bug was introduced due to improper workarounds for old versions of Rubinius in 2009 and 2010: commit 5e8979ad38efdc4de3a69cc53aea33710d478406 ("http: cleanups for latest Rubinius") commit f37c23704cb73d57e9e478295d1641df1d9104c7 ("http: no-op rb_str_modify() for Rubies without it") --- diff --git a/ext/unicorn_http/ext_help.h b/ext/unicorn_http/ext_help.h index 0968080d..c87c2720 100644 --- a/ext/unicorn_http/ext_help.h +++ b/ext/unicorn_http/ext_help.h @@ -52,10 +52,6 @@ static void rb_18_str_set_len(VALUE str, long len) # endif #endif /* ! defined(NUM2SIZET) */ -#ifndef HAVE_RB_STR_MODIFY -# define rb_str_modify(x) do {} while (0) -#endif /* ! defined(HAVE_RB_STR_MODIFY) */ - static inline int str_cstr_eq(VALUE val, const char *ptr, long len) { return (RSTRING_LEN(val) == len && !memcmp(ptr, RSTRING_PTR(val), len));