patch 031 not fully in -stable on CVS

[Kelsang Wangden <wngdn_(_at_)_src_(_dot_)_uchicago_(_dot_)_edu>]

(My apologies if this should go to a list other than misc.  I was
debating between misc and tech, and settled on misc without strong
conviction.)

I went to update our site's central checkout of the 2.7 stable branch
source, and discovered that patch 031 (httpd) isn't fully there.  It's
there just fine in -current, but not in the OPENBSD_2_7 branch.

The file is:

    src/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c

If you do a diff from OPENBSD_2_7 to HEAD, you will see that this diff
looks exactly like the patch of this file in patch 031 (at the
bottom).

You can see the diff I mean with CVSweb at this URL:

http://www.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/httpd/src/modules/standard/mod_vhost_alias.c?r1=1.1%3AOPENBSD_2_7&tr1=1.1&r2=1.2%3AHEAD&tr2=1.2&f=u

(that's all one line, for those with mailers that do extra wrapping)


Anyway, it looks to me like the change to this one file wasn't merged
into the OPENBSD_2_7 branch.  Could someone please do that?

Thanks,

Wangden