unicorn 5.4.1 → 6.1.0

data/NEWS

@@ -1,3 +1,200 @@
+=== unicorn 6.0.0 - no more recycling Rack env / 2021-03-17 06:38 UTC
+
+  This release allocates a new Rack `env' hash for every request.
+  This is done for safety with internally-(thread|event)-using Rack
+  apps which expect to use `env' after the normal Rack response is
+  complete, but without relying on rack.hijack[1].  Thanks to
+  Dirkjan Bussink <d.bussink@gmail.com> for the patch:
+
+    https://yhbt.net/unicorn-public/66A68DD8-83EF-4C7A-80E8-3F1F7AB31670@github.com/
+
+  The major version is bumped since:
+
+  1) there are performance regressions for some simple Rack apps
+
+  2) unsupported 3rd-party monkey patches which previously
+     relied on this behavior may be broken (our version of
+     OobGC was).
+
+  The test suite is also more reliable on multi-core systems
+  and Ruby 3.x.
+
+  [1] thread from 2017 around rack.hijack safety:
+      https://yhbt.net/unicorn-public/CAAtdryPG3nLuyo0jxfYW1YHu1Q+ZpkLkd4KdWC8vA46B5haZxw@mail.gmail.com/
+
+=== unicorn 5.8.0 - rack.after_reply support / 2020-12-24 20:39 UTC
+
+  This release supports env['rack.after_reply'] which allows
+  rack middleware to pass lambdas to be executed after the client
+  connection is closed, matching functionality in Puma.
+
+  Thanks to Blake Williams for this patch:
+  https://yhbt.net/unicorn-public/9873E53C-04D3-4759-9678-CA17DBAEF7B7@blakewilliams.me/
+
+  The top-level of our website is now simpler and no longer
+  redundant with the contents of https://yhbt.net/unicorn/README.html
+  (which contains the old content)
+
+=== unicorn 5.7.0 / 2020-09-08 08:41 UTC
+
+  Relaxed Ruby version requirements for Ruby 3.0.0dev.
+  Thanks to Jean Boussier for testing
+
+=== unicorn 5.6.0 - early_hints support / 2020-07-26 01:52 UTC
+
+  This release adds support for the early_hints configurator
+  directive for the 'rack.early_hints' API used by Rails 5.2+.
+
+  Thanks to Jean Boussier for the patch.
+
+  Link: https://yhbt.net/unicorn-public/242F0859-0F83-4F14-A0FF-5BE392BB01E6@shopify.com/
+
+=== unicorn 5.5.5 / 2020-04-27 02:48 UTC
+
+  This release fixes a bug for users of multiple listeners setups
+  where a busy listen socket could starve other listeners.
+
+  Thanks to Stan Hu for reporting and testing.
+
+  No need to upgrade if you're using a single listen socket.
+
+  Link: https://yhbt.net/unicorn-public/CAMBWrQ=Yh42MPtzJCEO7XryVknDNetRMuA87irWfqVuLdJmiBQ@mail.gmail.com/
+
+=== unicorn 5.5.4 / 2020-03-24 22:10 UTC
+
+  One change to improve RFC 7230 conformance in the HTTP parser:
+
+  https://yhbt.net/unicorn-public/20200319022823.32472-1-bofh@yhbt.net/
+
+=== unicorn 5.5.3 / 2020-01-31 20:39 UTC
+
+  Documentation updates to switch bogomips.org to yhbt.net since
+  the .org TLD won't be affordable in the near future.
+
+  There's also a few minor test cleanups.
+
+=== unicorn 5.5.2 / 2019-12-20 02:08 UTC
+
+  Thanks to Terry Scheingeld, we now workaround a Ruby bug
+  and can now run with taint checks enabled:
+  <https://bugs.ruby-lang.org/issues/14485>
+  <https://bogomips.org/unicorn-public/CABg1sXrvGv9G6CDQxePDUqTe6N-5UpLXm7eG3YQO=dda-Cgg7A@mail.gmail.com/>
+
+  There's also a few documentation updates and building packages
+  from source is easier since pandoc is no longer a dependency
+  (and I can no longer afford the bandwidth or space to install
+  it).
+
+  Eric Wong (7):
+        test/benchmark/ddstream: demo for slowly reading clients
+        test/benchmark/readinput: demo for slowly uploading clients
+        test/benchmark/uconnect: test for accept loop speed
+        examples/unicorn@.service: note the NonBlocking flag
+        Merge remote-tracking branch 'origin/ts/tmpio'
+        test_util: get rid of some unused variables in tests
+        doc: replace pandoc-"Markdown" with real manpages
+
+  Terry Scheingeld (1):
+        tmpio: workaround File#path being tainted on unlink
+
+=== unicorn 5.5.1 / 2019-05-06 06:40 UTC
+
+  This release fixes and works around issues from v5.5.0 (2019-03-04)
+
+  Stephen Demjanenko worked around a pipe resource accounting bug
+  present in old Linux kernels.  Linux 3.x users from 3.16.57 and
+  on are unaffected.  Linux 4.x users from 4.9 and on are
+  unaffected.
+
+  https://bogomips.org/unicorn-public/1556922018-24096-1-git-send-email-sdemjanenko@gmail.com/
+
+  Stan Pitucha reported a bug with the old `unicorn_rails' wrapper
+  (intended for Rails 2.x users) which was promptly fixed by
+  Jeremy Evans:
+
+  https://bogomips.org/unicorn-public/CAJ2_uEPifcv_ux4sX=t0C4zHTHGhqVfcLcSB2kTU3Rb_6pQ3nw@mail.gmail.com/
+
+  There's also some doc updates to warn users off `unicorn_rails';
+  the homepage is now energy-efficient for OLEDs and CRTs;
+  and I'm no longer advertising mailing list subscriptions
+  (because I hate centralization and mail archives are the priority)
+
+  Eric Wong (3):
+        doc: unicorn_rails: clarify that it is intended for rails <= 2.x
+        doc: stop advertising mailing list subscription
+        doc: switch homepage to dark216
+
+  Jeremy Evans (1):
+        unicorn_rails: fix regression with Rails >= 3.x in app build
+
+  Stephen Demjanenko (1):
+        Rescue failed pipe resizes due to permissions
+
+=== unicorn 5.5.0 / 2019-03-04 00:41 UTC
+
+  Mostly identical to 5.5.0.pre1, which I didn't hear any feedback
+  from:
+
+    https://bogomips.org/unicorn-public/20181220222842.GA27382@dcvr/
+
+  > Jeremy Evans contributed the "default_middleware" configuration option:
+  >
+  >   https://bogomips.org/unicorn-public/20180913192055.GD48926@jeremyevans.local/
+  >
+  > Jeremy also contributed the ability to use separate groups for the process
+  > and log files:
+  >
+  >   https://bogomips.org/unicorn-public/20180913192449.GE48926@jeremyevans.local/
+  >
+  > There's also a couple of uninteresting minor optimizations and
+  > documentation additions.
+
+  Otherwise, there's one extra change to use
+  rb_gc_register_mark_object which is finally a documented part of
+  the Ruby C-API, but has existed since the 1.9 days.
+
+=== unicorn 5.5.0.pre1 / 2018-12-20 20:11 UTC
+
+  Jeremy Evans contributed the "default_middleware" configuration option:
+
+    https://bogomips.org/unicorn-public/20180913192055.GD48926@jeremyevans.local/
+
+  Jeremy also contributed the ability to use separate groups for the process
+  and log files:
+
+    https://bogomips.org/unicorn-public/20180913192449.GE48926@jeremyevans.local/
+
+  There's also a couple of uninteresting minor optimizations and
+  documentation additions.
+
+  Eric Wong (10):
+        remove random seed reset atfork
+        use IO#wait instead of kgio_wait_readable
+        Merge branch '5.4-stable'
+        shrink pipes under Linux
+        socket_helper: add hint for FreeBSD users for accf_http(9)
+        tests: ensure -N/--no-default-middleware not supported in config.ru
+        doc: update more URLs to use HTTPS and avoid redirects
+        deduplicate strings VM-wide in Ruby 2.5+
+        doc/ISSUES: add links to git clone-able mail archives of our dependencies
+        README: minor updates and additional disclaimer
+
+  Jeremy Evans (2):
+        Make Worker#user support different process primary group and log file group
+        Support default_middleware configuration option
+
+=== unicorn 5.4.1 / 2018-07-23 17:13 UTC
+
+  This release quiets some warnings for Ruby 2.6 preview releases
+  and enables tests to pass under Ruby 1.9.3.  Otherwise, nothing
+  interesting for Ruby 2.0..2.5 users.  *YAWN*
+
+  Eric Wong (1):
+        quiet some mismatched indentation warnings
+
+  Fumiaki MATSUSHIMA (1):
+        Use IO#wait instead to fix test for Ruby 1.9
+
 === unicorn 5.4.0 / 2017-12-23 23:33 UTC
 
   Rack hijack support improves as the app code can capture and use

data/README

@@ -10,10 +10,9 @@ both the the request and response in between unicorn and slow clients.
 
 * Designed for Rack, Unix, fast clients, and ease-of-debugging.  We
   cut out everything that is better supported by the operating system,
-  {nginx}[http://nginx.org/] or {Rack}[http://rack.github.io/].
+  {nginx}[https://nginx.org/] or {Rack}[https://rack.github.io/].
 
-* Compatible with Ruby 1.9.3 and later.
-  unicorn 4.x remains supported for Ruby 1.8 users.
+* Compatible with Ruby 2.0.0 and later.
 
 * Process management: unicorn will reap and restart workers that
   die from broken apps.  There is no need to manage multiple processes
@@ -37,12 +36,15 @@ both the the request and response in between unicorn and slow clients.
   You can upgrade unicorn, your entire application, libraries
   and even your Ruby interpreter without dropping clients.
 
+* transparent upgrades using systemd socket activation is
+  supported since unicorn 5.0
+
 * before_fork and after_fork hooks in case your application
   has special needs when dealing with forked processes.  These
   should not be needed when the "preload_app" directive is
   false (the default).
 
-* Can be used with copy-on-write-friendly memory management
+* Can be used with copy-on-write-friendly GC in Ruby 2.0+
   to save memory (by setting "preload_app" to true).
 
 * Able to listen on multiple interfaces including UNIX sockets,
@@ -55,7 +57,7 @@ both the the request and response in between unicorn and slow clients.
 
 == License
 
-unicorn is copyright 2009-2016 by all contributors (see logs in git).
+unicorn is copyright 2009-2018 by all contributors (see logs in git).
 It is based on Mongrel 1.1.5.
 Mongrel is copyright 2007 Zed A. Shaw and contributors.
 
@@ -77,13 +79,13 @@ You may install it via RubyGems on RubyGems.org:
 You can get the latest source via git from the following locations
 (these versions may not be stable):
 
-  git://bogomips.org/unicorn.git
-  git://repo.or.cz/unicorn.git (mirror)
+  https://yhbt.net/unicorn.git
+  https://repo.or.cz/unicorn.git (mirror)
 
 You may browse the code from the web:
 
-* https://bogomips.org/unicorn.git
-* http://repo.or.cz/w/unicorn.git (gitweb)
+* https://yhbt.net/unicorn.git
+* https://repo.or.cz/w/unicorn.git (gitweb)
 
 See the HACKING guide on how to contribute and build prerelease gems
 from git.
@@ -122,17 +124,28 @@ unicorn is designed to only serve fast clients either on the local host
 or a fast LAN.  See the PHILOSOPHY and DESIGN documents for more details
 regarding this.
 
+Due to its ability to tolerate crashes and isolate clients, unicorn
+is unfortunately known to prolong the existence of bugs in applications
+and libraries which run on top of it.
+
 == Contact
 
 All feedback (bug reports, user/development dicussion, patches, pull
 requests) go to the mailing list/newsgroup.  See the ISSUES document for
-information on the {mailing list}[mailto:unicorn-public@bogomips.org].
+information on the {mailing list}[mailto:unicorn-public@yhbt.net].
+
+The mailing list is archived at https://yhbt.net/unicorn-public/
 
-The mailing list is archived at https://bogomips.org/unicorn-public/
 Read-only NNTP access is available at:
-nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
-nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general
+nntps://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
+nntp://news.gmane.io/gmane.comp.lang.ruby.unicorn.general
+
+Read-only IMAP access is also avaialble at:
+imaps://yhbt.net/inbox.comp.lang.ruby.unicorn.0 and
+imap://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.lang.ruby.unicorn.0
+The AUTH=ANONYMOUS mechanism is supported, as is any username+password
+combination.
 
 For the latest on unicorn releases, you may also finger us at
-unicorn@bogomips.org or check our NEWS page (and subscribe to our Atom
+unicorn@yhbt.net or check our NEWS page (and subscribe to our Atom
 feed).

data/SIGNALS

@@ -8,7 +8,7 @@ should be possible to easily share process management scripts between
 Unicorn and nginx.
 
 One example init script is distributed with unicorn:
-https://bogomips.org/unicorn/examples/init.sh
+https://yhbt.net/unicorn/examples/init.sh
 
 === Master Process
 

data/Sandbox

@@ -3,7 +3,7 @@
 Since unicorn includes executables and is usually used to start a Ruby
 process, there are certain caveats to using it with tools that sandbox
 RubyGems installations such as
-{Bundler}[http://bundler.io/] or
+{Bundler}[https://bundler.io/] or
 {Isolate}[https://github.com/jbarnette/isolate].
 
 == General deployment
@@ -34,7 +34,7 @@ is the primary issue with sandboxing tools such as Bundler and Isolate.
 If you're bundling unicorn, use "bundle exec unicorn" (or "bundle exec
 unicorn_rails") to start unicorn with the correct environment variables
 
-ref: https://bogomips.org/unicorn-public/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us/
+ref: https://yhbt.net/unicorn-public/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us/
 
 Otherwise (if you choose to not sandbox your unicorn installation), we
 expect the tips for Isolate (below) apply, too.
@@ -44,7 +44,7 @@ expect the tips for Isolate (below) apply, too.
 This is no longer be an issue as of bundler 0.9.17
 
 ref:
-https://bogomips.org/unicorn-public/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com/
+https://yhbt.net/unicorn-public/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com/
 
 === BUNDLE_GEMFILE for Capistrano users
 
@@ -66,7 +66,7 @@ before_exec hook as illustrated by https://gist.github.com/534668
 Ruby 2.0.0 enforces FD_CLOEXEC on file descriptors by default.  unicorn
 has been prepared for this behavior since unicorn 4.1.0, and bundler
 needs the "--keep-file-descriptors" option for "bundle exec":
-http://bundler.io/man/bundle-exec.1.html
+https://bundler.io/man/bundle-exec.1.html
 
 == Isolate
 
@@ -87,7 +87,7 @@ For now workarounds include doing one of the following:
 
 3. Explicitly setting RUBYLIB or $LOAD_PATH to include any gem path
    where the unicorn gem is installed
-   (e.g. /usr/lib/ruby/gems/1.9.3/gems/unicorn-VERSION/lib)
+   (e.g. /usr/lib/ruby/gems/3.0.0/gems/unicorn-VERSION/lib)
 
 === RUBYOPT pollution from SIGUSR2 upgrades
 

data/archive/slrnpull.conf

@@ -1,4 +1,4 @@
 # group_name                         max        expire     headers_only
 gmane.comp.lang.ruby.unicorn.general 1000000000 1000000000 0
 
-# usage: slrnpull -d $PWD -h news.gmane.org --no-post
+# usage: slrnpull -d $PWD -h news.gmane.io --no-post

data/bin/unicorn

@@ -6,6 +6,7 @@ require 'optparse'
 ENV["RACK_ENV"] ||= "development"
 rackup_opts = Unicorn::Configurator::RACKUP
 options = rackup_opts[:options]
+set_no_default_middleware = true
 
 op = OptionParser.new("", 24, '  ') do |opts|
   cmd = File.basename($0)
@@ -60,7 +61,7 @@ op = OptionParser.new("", 24, '  ') do |opts|
 
   opts.on("-N", "--no-default-middleware",
           "do not load middleware implied by RACK_ENV") do |e|
-    rackup_opts[:no_default_middleware] = true
+    rackup_opts[:no_default_middleware] = true if set_no_default_middleware
   end
 
   opts.on("-D", "--daemonize", "run daemonized in the background") do |d|
@@ -110,6 +111,7 @@ op = OptionParser.new("", 24, '  ') do |opts|
   opts.parse! ARGV
 end
 
+set_no_default_middleware = false
 app = Unicorn.builder(ARGV[0] || 'config.ru', op)
 op = nil
 

data/bin/unicorn_rails

@@ -132,11 +132,11 @@ def rails_builder(ru, op, daemonize)
 
   # this lambda won't run until after forking if preload_app is false
   # this runs after config file reloading
-  lambda do ||
+  lambda do |x, server|
     # Rails 3 includes a config.ru, use it if we find it after
     # working_directory is bound.
     ::File.exist?('config.ru') and
-      return Unicorn.builder('config.ru', op).call
+      return Unicorn.builder('config.ru', op).call(x, server)
 
     # Load Rails and (possibly) the private version of Rack it bundles.
     begin

data/examples/big_app_gc.rb

@@ -1,2 +1,2 @@
-# see {Unicorn::OobGC}[https://bogomips.org/unicorn/Unicorn/OobGC.html]
+# see {Unicorn::OobGC}[https://yhbt.net/unicorn/Unicorn/OobGC.html]
 # Unicorn::OobGC was broken in Unicorn v3.3.1 - v3.6.1 and fixed in v3.6.2

data/examples/logrotate.conf

@@ -2,10 +2,10 @@
 # /etc/logrotate.d/unicorn_app on my Debian systems
 #
 # See the logrotate(8) manpage for more information:
-#    http://linux.die.net/man/8/logrotate
+#    https://linux.die.net/man/8/logrotate
 #
 # public logrotate-related discussion in our archives:
-#    https://bogomips.org/unicorn-public/?q=logrotate
+#    https://yhbt.net/unicorn-public/?q=logrotate
 
 # Modify the following glob to match the logfiles your app writes to:
 /var/log/unicorn_app/*.log {
@@ -33,7 +33,7 @@
 		systemctl kill -s SIGUSR1 unicorn@2.service
 
 		# Examples for other process management systems appreciated
-		# Mail us at unicorn-public@bogomips.org
+		# Mail us at unicorn-public@yhbt.net
 		# (see above for archives)
 
 		# If you use a pid file and assuming your pid file

data/examples/nginx.conf

@@ -56,7 +56,8 @@ http {
   # to configure it all in one place here for static files and also
   # to disable gzip for clients who don't get gzip/deflate right.
   # There are other gzip settings that may be needed used to deal with
-  # bad clients out there, see http://wiki.nginx.org/NginxHttpGzipModule
+  # bad clients out there, see
+  # https://nginx.org/en/docs/http/ngx_http_gzip_module.html
   gzip on;
   gzip_http_version 1.0;
   gzip_proxied any;
@@ -112,12 +113,12 @@ http {
     # try_files directive appeared in in nginx 0.7.27 and has stabilized
     # over time.  Older versions of nginx (e.g. 0.6.x) requires
     # "if (!-f $request_filename)" which was less efficient:
-    # https://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
+    # https://yhbt.net/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
     try_files $uri/index.html $uri.html $uri @app;
 
     location @app {
       # an HTTP header important enough to have its own Wikipedia entry:
-      #   http://en.wikipedia.org/wiki/X-Forwarded-For
+      #   https://en.wikipedia.org/wiki/X-Forwarded-For
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
       # enable this if you forward HTTPS traffic to unicorn,

data/examples/unicorn.conf.minimal.rb

@@ -1,9 +1,9 @@
 # Minimal sample configuration file for Unicorn (not Rack) when used
 # with daemonization (unicorn -D) started in your working directory.
 #
-# See https://bogomips.org/unicorn/Unicorn/Configurator.html for complete
+# See https://yhbt.net/unicorn/Unicorn/Configurator.html for complete
 # documentation.
-# See also https://bogomips.org/unicorn/examples/unicorn.conf.rb for
+# See also https://yhbt.net/unicorn/examples/unicorn.conf.rb for
 # a more verbose configuration using more features.
 
 listen 2007 # by default Unicorn listens on port 8080

data/examples/unicorn.conf.rb

@@ -2,10 +2,10 @@
 #
 # This configuration file documents many features of Unicorn
 # that may not be needed for some applications. See
-# https://bogomips.org/unicorn/examples/unicorn.conf.minimal.rb
+# https://yhbt.net/unicorn/examples/unicorn.conf.minimal.rb
 # for a much simpler configuration file.
 #
-# See https://bogomips.org/unicorn/Unicorn/Configurator.html for complete
+# See https://yhbt.net/unicorn/Unicorn/Configurator.html for complete
 # documentation.
 
 # Use at least one worker per core if you're on a dedicated server,

data/examples/unicorn@.service

@@ -14,7 +14,14 @@ After = unicorn.socket
 # bundler users must use the "--keep-file-descriptors" switch, here:
 # ExecStart = bundle exec --keep-file-descriptors unicorn -c ...
 ExecStart = /usr/bin/unicorn -c /path/to/unicorn.conf.rb /path/to/config.ru
+
+# NonBlocking MUST be true if using socket activation with unicorn.
+# Otherwise, there's a small window in-between when the non-blocking
+# flag is set by us and our accept4 call where systemd can momentarily
+# make the socket blocking, causing us to block on accept4:
+NonBlocking = true
 Sockets = unicorn.socket
+
 KillSignal = SIGQUIT
 User = nobody
 Group = nogroup

data/ext/unicorn_http/c_util.h

@@ -8,23 +8,15 @@
 
 #include <unistd.h>
 #include <assert.h>
+#include <limits.h>
 
 #define MIN(a,b) (a < b ? a : b)
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
-#ifndef SIZEOF_OFF_T
-#  define SIZEOF_OFF_T 4
-#  warning SIZEOF_OFF_T not defined, guessing 4.  Did you run extconf.rb?
-#endif
-
-#if SIZEOF_OFF_T == 4
-#  define UH_OFF_T_MAX 0x7fffffff
-#elif SIZEOF_OFF_T == 8
-#  if SIZEOF_LONG == 4
-#    define UH_OFF_T_MAX 0x7fffffffffffffffLL
-#  else
-#    define UH_OFF_T_MAX 0x7fffffffffffffff
-#  endif
+#if SIZEOF_OFF_T == SIZEOF_INT
+#  define UH_OFF_T_MAX INT_MAX
+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
+#  define UH_OFF_T_MAX LLONG_MAX
 #else
 #  error off_t size unknown for this platform!
 #endif /* SIZEOF_OFF_T check */

data/ext/unicorn_http/common_field_optimization.h

@@ -58,26 +58,43 @@ static struct common_field common_http_fields[] = {
 
 #define HTTP_PREFIX "HTTP_"
 #define HTTP_PREFIX_LEN (sizeof(HTTP_PREFIX) - 1)
+static ID id_uminus;
+
+/* this dedupes under Ruby 2.5+ (December 2017) */
+static VALUE str_dd_freeze(VALUE str)
+{
+  if (STR_UMINUS_DEDUPE)
+    return rb_funcall(str, id_uminus, 0);
+
+  /* freeze,since it speeds up older MRI slightly */
+  OBJ_FREEZE(str);
+  return str;
+}
+
+static VALUE str_new_dd_freeze(const char *ptr, long len)
+{
+  return str_dd_freeze(rb_str_new(ptr, len));
+}
 
 /* this function is not performance-critical, called only at load time */
-static void init_common_fields(VALUE mark_ary)
+static void init_common_fields(void)
 {
   int i;
   struct common_field *cf = common_http_fields;
   char tmp[64];
+
   memcpy(tmp, HTTP_PREFIX, HTTP_PREFIX_LEN);
 
   for(i = ARRAY_SIZE(common_http_fields); --i >= 0; cf++) {
     /* Rack doesn't like certain headers prefixed with "HTTP_" */
     if (!strcmp("CONTENT_LENGTH", cf->name) ||
         !strcmp("CONTENT_TYPE", cf->name)) {
-      cf->value = rb_str_new(cf->name, cf->len);
+      cf->value = str_new_dd_freeze(cf->name, cf->len);
     } else {
       memcpy(tmp + HTTP_PREFIX_LEN, cf->name, cf->len + 1);
-      cf->value = rb_str_new(tmp, HTTP_PREFIX_LEN + cf->len);
+      cf->value = str_new_dd_freeze(tmp, HTTP_PREFIX_LEN + cf->len);
     }
-    cf->value = rb_obj_freeze(cf->value);
-    rb_ary_push(mark_ary, cf->value);
+    rb_gc_register_mark_object(cf->value);
   }
 }
 
@@ -105,7 +122,7 @@ static VALUE uncommon_field(const char *field, size_t flen)
   memcpy(RSTRING_PTR(f) + HTTP_PREFIX_LEN, field, flen);
   assert(*(RSTRING_PTR(f) + RSTRING_LEN(f)) == '\0' &&
          "string didn't end with \\0"); /* paranoia */
-  return rb_obj_freeze(f);
+  return HASH_ASET_DEDUPE ? f : str_dd_freeze(f);
 }
 
 #endif /* common_field_optimization_h */