diff --git a/README.rst b/README.rst index 11deca99..6faee5b5 100644 --- a/README.rst +++ b/README.rst @@ -179,7 +179,7 @@ https://nghttp2.org/documentation/ Unit tests ---------- -Unit tests are done by simply running `make check`. +Unit tests are done by simply running ``make check``. Integration tests ----------------- @@ -1364,7 +1364,7 @@ original creator(s) or those who have been assigned copyright by the original author(s). By submitting a patch to the nghttp2 project, you (or your employer, as -the case may be) agree to assign the copyright of your submission to us. +the case may be) agree to assign the copyright of your submission to us. .. the above really needs to be reworded to pass legal muster. We will credit you for your changes as far as possible, to give credit but also to keep a trace diff --git a/configure.ac b/configure.ac index 0d2220b3..5d349cb3 100644 --- a/configure.ac +++ b/configure.ac @@ -25,13 +25,13 @@ dnl Do not change user variables! dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html AC_PREREQ(2.61) -AC_INIT([nghttp2], [0.7.14-DEV], [t-tujikawa@users.sourceforge.net]) +AC_INIT([nghttp2], [0.7.15-DEV], [t-tujikawa@users.sourceforge.net]) LT_PREREQ([2.2.6]) LT_INIT() dnl See versioning rule: dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html AC_SUBST(LT_CURRENT, 13) -AC_SUBST(LT_REVISION, 2) +AC_SUBST(LT_REVISION, 3) AC_SUBST(LT_AGE, 8) major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"` diff --git a/contrib/.gitignore b/contrib/.gitignore index a08baf90..85acde38 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -1 +1,3 @@ nghttpx-init +nghttpx.service +nghttpx-upstart.conf diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 6727a846..07a3bf8b 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -21,19 +21,24 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -EXTRA_DIST = nghttpx-init.in nghttpx-logrotate +configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf + +EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate edit = sed -e 's|@bindir[@]|$(bindir)|g' -nghttpx-init: Makefile +nghttpx-init: %: $(srcdir)/%.in rm -f $@ $@.tmp - $(edit) $(srcdir)/$@.in > $@.tmp + $(edit) $< > $@.tmp chmod +x $@.tmp mv $@.tmp $@ -nghttpx-init: $(srcdir)/nghttpx-init.in +nghttpx.service nghttpx-upstart.conf: %: $(srcdir)/%.in + $(edit) $< > $@ -all-local: nghttpx-init +$(configfiles): Makefile + +all-local: $(configfiles) clean-local: - -rm -f nghttpx-init nghttpx-init.tmp + -rm -f nghttpx-init.tmp $(configfiles) diff --git a/contrib/nghttpx-logrotate b/contrib/nghttpx-logrotate index 56b37be6..f1002bd6 100644 --- a/contrib/nghttpx-logrotate +++ b/contrib/nghttpx-logrotate @@ -1,18 +1,11 @@ /var/log/nghttpx/*.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 0640 www-data adm - sharedscripts - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi \ - endscript - postrotate - [ -s /run/nghttpx.pid ] && kill -USR1 `cat /run/nghttpx.pid` - endscript + weekly + rotate 52 + missingok + compress + delaycompress + notifempty + postrotate + killall -USR1 nghttpx 2> /dev/null || true + endscript } diff --git a/contrib/nghttpx-upstart.conf.in b/contrib/nghttpx-upstart.conf.in new file mode 100644 index 00000000..0b799160 --- /dev/null +++ b/contrib/nghttpx-upstart.conf.in @@ -0,0 +1,8 @@ +# vim: ft=upstart: + +description "HTTP/2 reverse proxy" + +start on runlevel [2] +stop on runlevel [016] + +exec @bindir@/nghttpx diff --git a/contrib/nghttpx.service.in b/contrib/nghttpx.service.in new file mode 100644 index 00000000..9c7f851e --- /dev/null +++ b/contrib/nghttpx.service.in @@ -0,0 +1,10 @@ +[Unit] +Description=HTTP/2 experimental proxy +After=network.target + +[Service] +Type=simple +ExecStart=@bindir@/nghttpx --errorlog-syslog + +[Install] +WantedBy=multi-user.target diff --git a/doc/_themes/sphinx_rtd_theme/__init__.py b/doc/_themes/sphinx_rtd_theme/__init__.py index fcce3bfc..95ddc52a 100644 --- a/doc/_themes/sphinx_rtd_theme/__init__.py +++ b/doc/_themes/sphinx_rtd_theme/__init__.py @@ -5,7 +5,7 @@ From https://github.com/ryan-roemer/sphinx-bootstrap-theme. """ import os -VERSION = (0, 1, 7) +VERSION = (0, 1, 8) __version__ = ".".join(str(v) for v in VERSION) __version_full__ = __version__ diff --git a/doc/_themes/sphinx_rtd_theme/breadcrumbs.html b/doc/_themes/sphinx_rtd_theme/breadcrumbs.html index af4f55a4..0028421e 100644 --- a/doc/_themes/sphinx_rtd_theme/breadcrumbs.html +++ b/doc/_themes/sphinx_rtd_theme/breadcrumbs.html @@ -6,14 +6,16 @@ {% endfor %}
  • {{ title }}
  • - {% if display_github %} - Edit on GitHub - {% elif display_bitbucket %} - Edit on Bitbucket - {% elif show_source and source_url_prefix %} - View page source - {% elif show_source and has_source and sourcename %} - View page source + {% if pagename != "search" %} + {% if display_github %} + Edit on GitHub + {% elif display_bitbucket %} + Edit on Bitbucket + {% elif show_source and source_url_prefix %} + View page source + {% elif show_source and has_source and sourcename %} + View page source + {% endif %} {% endif %}
    • diff --git a/doc/_themes/sphinx_rtd_theme/footer.html b/doc/_themes/sphinx_rtd_theme/footer.html index 0123a5de..6347a440 100644 --- a/doc/_themes/sphinx_rtd_theme/footer.html +++ b/doc/_themes/sphinx_rtd_theme/footer.html @@ -2,10 +2,10 @@ {% if next or prev %} {% endif %} diff --git a/doc/_themes/sphinx_rtd_theme/layout.html b/doc/_themes/sphinx_rtd_theme/layout.html index 0ddf6ee8..9481d8b4 100644 --- a/doc/_themes/sphinx_rtd_theme/layout.html +++ b/doc/_themes/sphinx_rtd_theme/layout.html @@ -107,7 +107,7 @@