From 83d2331a032b18346b967a6bdf6f336c0e2a26ef Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 8 Mar 2019 10:50:08 +0000 Subject: Fix an "unknown pragma" warning on Windows. --- src/modules/m_httpd.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/modules/m_httpd.cpp') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 168e09bb8..e5d0a08e4 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -40,7 +40,9 @@ #endif // Fix warnings about shadowing in http_parser. -#pragma GCC diagnostic ignored "-Wshadow" +#ifdef _GNUC +# pragma GCC diagnostic ignored "-Wshadow" +#endif #include -- cgit v1.3.1-10-gc9f91 From f97c88f6f64e66fe2abb38860ab1e3f8c0702439 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 8 Mar 2019 10:50:53 +0000 Subject: m_httpd: use http_response_str() instead of Response(). Lets not reinvent the wheel pointlessly. --- src/modules/m_httpd.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/modules/m_httpd.cpp') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index e5d0a08e4..78c25f6d9 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -224,24 +224,12 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru AddToCull(); } - const char* Response(unsigned int response) - { - switch (response) - { -#define HTTP_STATUS_CASE(n, m, s) case n: return #s; - HTTP_STATUS_MAP(HTTP_STATUS_CASE) - default: - return "WTF"; - break; - } - } - void SendHTTPError(unsigned int response) { HTTPHeaders empty; std::string data = InspIRCd::Format( "Server error %u: %s
" - "Powered by InspIRCd", response, Response(response)); + "Powered by InspIRCd", response, http_status_str((http_status)response)); SendHeaders(data.length(), response, empty); WriteData(data); @@ -250,7 +238,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru void SendHeaders(unsigned long size, unsigned int response, HTTPHeaders &rheaders) { - WriteData(InspIRCd::Format("HTTP/%u.%u %u %s\r\n", parser.http_major ? parser.http_major : 1, parser.http_major ? parser.http_minor : 1, response, Response(response))); + WriteData(InspIRCd::Format("HTTP/%u.%u %u %s\r\n", parser.http_major ? parser.http_major : 1, parser.http_major ? parser.http_minor : 1, response, http_status_str((http_status)response))); rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true)); rheaders.CreateHeader("Server", INSPIRCD_BRANCH); -- cgit v1.3.1-10-gc9f91 From 42c7f479b2aebdec4fd190ba06097b7c5bca42a9 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 9 Mar 2019 09:54:48 +0000 Subject: m_httpd: GCC is __GNUC__ not _GNUC. --- src/modules/m_httpd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/m_httpd.cpp') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 78c25f6d9..2e67b1551 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -40,7 +40,7 @@ #endif // Fix warnings about shadowing in http_parser. -#ifdef _GNUC +#ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wshadow" #endif -- cgit v1.3.1-10-gc9f91 From ac0d5abaace6521643b213423bf57625abe9dd41 Mon Sep 17 00:00:00 2001 From: Robby Date: Tue, 12 Mar 2019 15:37:18 +0100 Subject: Update most URLs to use HTTPS and fix some dead links. --- .github/ISSUE_TEMPLATE.md | 2 +- configure | 2 +- docs/conf/modules.conf.example | 6 +++--- docs/conf/services/anope.conf.example | 2 +- docs/conf/services/atheme.conf.example | 3 ++- locales/readme.txt | 2 +- make/template/main.mk | 2 +- src/modules/extra/README | 2 +- src/modules/m_httpd.cpp | 2 +- src/modules/m_nationalchars.cpp | 4 ++-- vendor/README.md | 2 +- win/CMakeLists.txt | 2 +- win/NSIS.template.in | 2 +- win/README.txt | 8 ++++---- 14 files changed, 21 insertions(+), 20 deletions(-) (limited to 'src/modules/m_httpd.cpp') diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6fdf33bba..ea6121d99 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -14,7 +14,7 @@ Example configs: 3.0 (alpha) - https://github.com/inspircd/inspircd/tree/master/docs/conf Wiki: -https://wiki.inspircd.org/ +https://wiki.inspircd.org --> **Description** diff --git a/configure b/configure index 81e742b09..048975f41 100755 --- a/configure +++ b/configure @@ -268,7 +268,7 @@ not been tested as heavily and may contain various faults which could seriously affect the running of your server. It is recommended that you use a stable version instead. -You can obtain the latest stable version from http://www.inspircd.org/ or by +You can obtain the latest stable version from https://www.inspircd.org or by running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp3)|>` if you are installing from Git. EOW diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 3f7e5a9f0..bfad0cc17 100644 --- a/docs/conf/modules.conf.example +++ b/docs/conf/modules.conf.example @@ -342,7 +342,7 @@ # The webirc method is the recommended way to allow gateways to forward # IP/host information. When using this method the gateway sends a WEBIRC # message to the server on connection. For more details please read the -# IRCv3 WebIRC specification at http://ircv3.net/specs/extensions/webirc.html. +# IRCv3 WebIRC specification at: https://ircv3.net/specs/extensions/webirc.html # # When using this method you must specify a wildcard mask or CIDR range # to allow gateway connections from and at least one of either a SSL @@ -1080,7 +1080,7 @@ # # Further information on these extensions can be found at the IRCv3 # working group website: -# http://ircv3.net/irc/ +# https://ircv3.net/irc/ # # # The following block can be used to control which extensions are @@ -1292,7 +1292,7 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Map hiding module: replaces /MAP and /LINKS output to users with a # -# message to see a website, set by maphide="http://test.org/map" in # +# message to see a website, set by maphide="https://test.org/map" in # # the tag, instead. # # diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf.example index 603bb538d..4068871c8 100644 --- a/docs/conf/services/anope.conf.example +++ b/docs/conf/services/anope.conf.example @@ -1,5 +1,5 @@ # This file contains aliases and nickname reservations which are used -# by Anope. See https://www.anope.org/ for more information on Anope. +# by Anope. See https://www.anope.org for more information on Anope. # This file inherits from the generic config to avoid repetition. diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf.example index 037087998..ac87399c2 100644 --- a/docs/conf/services/atheme.conf.example +++ b/docs/conf/services/atheme.conf.example @@ -1,5 +1,6 @@ # This file contains aliases and nickname reservations which are used -# by Atheme. See http://atheme.net for more information on Atheme. +# by Atheme. See https://atheme.github.io/atheme.html for more +# information on Atheme. # This file inherits from the generic config to avoid repetition. diff --git a/locales/readme.txt b/locales/readme.txt index 069e664b5..5e366d606 100755 --- a/locales/readme.txt +++ b/locales/readme.txt @@ -1,6 +1,6 @@ Here you can find locales configuration files. -(!) The idea and several locale files are derived from Bynets UnrealIRCd distribution (See http://www.bynets.org/) +(!) The idea and several locale files are derived from Bynets UnrealIRCd distribution (See https://bynets.org) *** File structure *** diff --git a/make/template/main.mk b/make/template/main.mk index d33627519..9c7ee9449 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -184,7 +184,7 @@ std-header: @echo "* *" @echo "* This will take a *long* time. *" @echo "* Why not read our wiki at *" - @echo "* http://wiki.inspircd.org *" + @echo "* https://wiki.inspircd.org *" @echo "* while you wait for Make to run? *" @echo "*************************************" diff --git a/src/modules/extra/README b/src/modules/extra/README index b59494df9..630ab3e85 100644 --- a/src/modules/extra/README +++ b/src/modules/extra/README @@ -2,7 +2,7 @@ This directory stores modules which require external libraries to compile. For example, m_filter_pcre requires the PCRE libraries. To compile any of these modules first ensure you have the required dependencies -(read the online documentation at https://wiki.inspircd.org/) and then symlink +(read the online documentation at https://wiki.inspircd.org) and then symlink the .cpp file from this directory into the parent directory (src/modules/). Alternatively, use the command: ./configure --enable-extras=m_extra.cpp, which will diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 2e67b1551..f9e5bc0fd 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -229,7 +229,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru HTTPHeaders empty; std::string data = InspIRCd::Format( "Server error %u: %s
" - "Powered by InspIRCd", response, http_status_str((http_status)response)); + "Powered by InspIRCd", response, http_status_str((http_status)response)); SendHeaders(data.length(), response, empty); WriteData(data); diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 81c2d2959..2b7e66a50 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -20,8 +20,8 @@ */ -/* Contains a code of Unreal IRCd + Bynets patch ( http://www.unrealircd.com/ and http://www.bynets.org/ ) - Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ ) +/* Contains a code of Unreal IRCd + Bynets patch (https://www.unrealircd.org and https://bynets.org) + Original patch is made by Dmitry "Killer{R}" Kononko. (http://killprog.com) Changed at 2008-06-15 - 2009-02-11 by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */ diff --git a/vendor/README.md b/vendor/README.md index c233d6dae..0eb3961db 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -10,7 +10,7 @@ This directory contains vendored dependencies that are shipped with InspIRCd to **License** — Public Domain -**Website** — [http://openwall.com/crypt/](http://openwall.com/crypt/) +**Website** — [https://www.openwall.com/crypt/](https://www.openwall.com/crypt/) ## http_parser diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 107102281..be6617b8b 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -104,7 +104,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_NSIS_MUI_ICON "${INSPIRCD_BASE}/win\\\\inspircd.ico") set(CPACK_NSIS_MUI_UNIICON "${INSPIRCD_BASE}/win\\\\inspircd.ico") set(CPACK_NSIS_INSTALLED_ICON_NAME "inspircd.exe") - set(CPACK_NSIS_URL_INFO_ABOUT "http://www.inspircd.org/") + set(CPACK_NSIS_URL_INFO_ABOUT "https://www.inspircd.org") set(CPACK_NSIS_COMPRESSOR "/SOLID zlib") include(CPack) diff --git a/win/NSIS.template.in b/win/NSIS.template.in index 0b74cc98f..2e6abd784 100644 --- a/win/NSIS.template.in +++ b/win/NSIS.template.in @@ -43,7 +43,7 @@ ;--- Component support macros: --- ; The code for the add/remove functionality is from: -; http://nsis.sourceforge.net/Add/Remove_Functionality +; https://nsis.sourceforge.io/Add/Remove_Functionality ; It has been modified slightly and extended to provide ; inter-component dependencies. Var AR_SecFlags diff --git a/win/README.txt b/win/README.txt index f5b2d8c83..437ff7e4f 100644 --- a/win/README.txt +++ b/win/README.txt @@ -1,9 +1,9 @@ Building InspIRCd for Windows: Prerequisites: - Visual Studio 2015 or newer (https://www.visualstudio.com/) - CMake 2.8 or newer (http://www.cmake.org/) - If building the installer, NSIS http://nsis.sourceforge.net/ + Visual Studio 2015 or newer (https://www.visualstudio.com) + CMake 2.8 or newer (https://cmake.org) + If building the installer, NSIS (https://nsis.sourceforge.io) Configuring: First copy any extra modules from extras (such as m_mysql) to the modules directory that you want to build. @@ -53,4 +53,4 @@ Building the installer: Locate the PACKAGE project on Visual Studio's Solution Explorer and build it. This will generate an InspIRCd-x.x.x.exe installer in the build directory which is ready to be distributed. - If you are building using NMake Makefiles or do not want to build the installer in Visual Studio, simply use "cpack". \ No newline at end of file + If you are building using NMake Makefiles or do not want to build the installer in Visual Studio, simply use "cpack". -- cgit v1.3.1-10-gc9f91