diff options
| author | Eric Wong <e@80x24.org> | 2022-12-15 20:52:52 +0000 |
|---|---|---|
| committer | Eric Wong <mwrap-perl@80x24.org> | 2022-12-16 09:27:47 +0000 |
| commit | cf2e3db35163031206e94e9e76b23acc2136d1a1 (patch) | |
| tree | b6adb38933e045741891ad620b94c3251a64d199 | |
| parent | 58b34da4511bbf12735dd852191c84ba4d00d10f (diff) | |
| download | mwrap-cf2e3db35163031206e94e9e76b23acc2136d1a1.tar.gz | |
No need to prefix our project name into every individual source file, especially since it's an auxilliary component.
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | Mwrap.xs | 2 | ||||
| -rw-r--r-- | httpd.h (renamed from mwrap_httpd.h) | 0 | ||||
| -rw-r--r-- | lib/Devel/Mwrap/PSGI.pm | 2 | ||||
| -rw-r--r-- | lib/Devel/Mwrap/Rproxy.pm | 4 | ||||
| -rw-r--r-- | mwrap_core.h | 2 | ||||
| -rw-r--r-- | mymalloc.h | 2 | ||||
| -rw-r--r-- | t/httpd.t (renamed from t/mwrap-httpd.t) | 0 |
8 files changed, 8 insertions, 8 deletions
@@ -8,12 +8,12 @@ check.h dlmalloc_c.h examples/mwrap.psgi gcc.h +httpd.h jhash.h lib/Devel/Mwrap.pm lib/Devel/Mwrap/PSGI.pm lib/Devel/Mwrap/Rproxy.pm mwrap_core.h -mwrap_httpd.h mymalloc.h picohttpparser.h picohttpparser_c.h @@ -21,7 +21,7 @@ ppport.h script/mwrap-perl script/mwrap-rproxy t/httpd-unit.t -t/mwrap-httpd.t +t/httpd.t t/mwrap.t t/source_location.perl t/test_common.perl @@ -12,7 +12,7 @@ */ typedef struct src_loc * Devel__Mwrap__SrcLoc; -/* keep this consistent with mwrap_httpd.h write_loc_name */ +/* keep this consistent with httpd.h write_loc_name */ static SV *location_string(struct src_loc *l) { SV *ret = newSV(0); diff --git a/lib/Devel/Mwrap/PSGI.pm b/lib/Devel/Mwrap/PSGI.pm index 3e8795e..f2be733 100644 --- a/lib/Devel/Mwrap/PSGI.pm +++ b/lib/Devel/Mwrap/PSGI.pm @@ -1,7 +1,7 @@ # Copyright (C) all contributors <mwrap@80x24.org> # License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt> # -# Note: this is deprecated, use mwrap_httpd.h instead +# Note: this is deprecated, use httpd.h instead package Devel::Mwrap::PSGI; use v5.12; # strict use warnings; diff --git a/lib/Devel/Mwrap/Rproxy.pm b/lib/Devel/Mwrap/Rproxy.pm index f7f8a82..76b7d7f 100644 --- a/lib/Devel/Mwrap/Rproxy.pm +++ b/lib/Devel/Mwrap/Rproxy.pm @@ -1,7 +1,7 @@ # Copyright (C) mwrap hackers <mwrap-perl@80x24.org> # License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt> -# minimal reverse proxy to expose the embedded mwrap_httpd.h UNIX sockets +# minimal reverse proxy to expose the embedded httpd.h UNIX sockets # via PSGI (and thus TCP HTTP/1.x). This does not have a hard dependency # on Mwrap.so. # @@ -69,7 +69,7 @@ sub call { # PSGI entry point my $h = "$method $uri HTTP/1.0\n\n"; $s = send($c, $h, MSG_NOSIGNAL) // return r(500, "send: $!"); $s == length($h) or return r(500, "send $s <".length($h)); - # this only expects mwrap_httpd.h output, so no continuation lines: + # this only expects httpd.h output, so no continuation lines: $h = do { local $/ = "\r\n\r\n"; <$c> } // return r(500, "read: $!"); my ($code, @hdr) = split(/\r\n/, $h); (undef, $code, undef) = split(/ /, $code); diff --git a/mwrap_core.h b/mwrap_core.h index d798b79..1b3d98f 100644 --- a/mwrap_core.h +++ b/mwrap_core.h @@ -958,7 +958,7 @@ static struct src_loc *mwrap_get_bin(const char *buf, size_t len) } static const char *mwrap_env; -#include "mwrap_httpd.h" +#include "httpd.h" __attribute__((constructor)) static void mwrap_ctor(void) { @@ -126,7 +126,7 @@ ATTR_COLD static void mstate_tsd_dtor(void *p) CHECK(int, 0, pthread_mutex_unlock(&global_mtx)); } -/* see mwrap_httpd.h */ +/* see httpd.h */ static void h1d_atfork_prepare(void); static void h1d_atfork_parent(void); static void h1d_start(void); diff --git a/t/mwrap-httpd.t b/t/httpd.t index ca90cf0..ca90cf0 100644 --- a/t/mwrap-httpd.t +++ b/t/httpd.t |