diff --git a/objs/Makefile b/objs/Makefile index 21cce0c..5cb5008 100755 --- a/objs/Makefile +++ b/objs/Makefile @@ -257,6 +257,7 @@ $(SRC): ./src/http/modules/ngx_http_index_module.o \ ./src/http/modules/ngx_http_mirror_module.o \ ./src/http/modules/ngx_http_try_files_module.o \ + ./src/http/modules/ngx_http_auth_basic_module.o \ ./src/http/modules/ngx_http_access_module.o \ ./src/http/modules/ngx_http_limit_conn_module.o \ ./src/http/modules/ngx_http_limit_req_module.o \ @@ -277,6 +278,7 @@ $(SRC): ./src/http/modules/ngx_http_upstream_random_module.o \ ./src/http/modules/ngx_http_upstream_keepalive_module.o \ ./src/http/modules/ngx_http_upstream_zone_module.o \ + ./src/http/modules/ngx_http_stub_status_module.o \ ./ngx_modules.o $(CC) -r -o ./nginx_app.o \ @@ -376,6 +378,7 @@ $(SRC): ./src/http/modules/ngx_http_index_module.o \ ./src/http/modules/ngx_http_mirror_module.o \ ./src/http/modules/ngx_http_try_files_module.o \ + ./src/http/modules/ngx_http_auth_basic_module.o \ ./src/http/modules/ngx_http_access_module.o \ ./src/http/modules/ngx_http_limit_conn_module.o \ ./src/http/modules/ngx_http_limit_req_module.o \ @@ -396,7 +399,9 @@ $(SRC): ./src/http/modules/ngx_http_upstream_random_module.o \ ./src/http/modules/ngx_http_upstream_keepalive_module.o \ ./src/http/modules/ngx_http_upstream_zone_module.o \ - ./ngx_modules.o + ./src/http/modules/ngx_http_stub_status_module.o \ + ./ngx_modules.o \ + -lcrypt modules: @@ -1085,6 +1090,13 @@ modules: $(SRC)/src/http/modules/ngx_http_try_files_module.c +./src/http/modules/ngx_http_auth_basic_module.o: $(CORE_DEPS) $(HTTP_DEPS) \ + $(SRC)/src/http/modules/ngx_http_auth_basic_module.c + $(CC) -c $(CFLAGS) $(CORE_INCS) $(HTTP_INCS) \ + -o ./src/http/modules/ngx_http_auth_basic_module.o \ + $(SRC)/src/http/modules/ngx_http_auth_basic_module.c + + ./src/http/modules/ngx_http_access_module.o: $(CORE_DEPS) $(HTTP_DEPS) \ $(SRC)/src/http/modules/ngx_http_access_module.c $(CC) -c $(CFLAGS) $(CORE_INCS) $(HTTP_INCS) \ @@ -1224,6 +1236,12 @@ modules: -o ./src/http/modules/ngx_http_upstream_zone_module.o \ $(SRC)/src/http/modules/ngx_http_upstream_zone_module.c +./src/http/modules/ngx_http_stub_status_module.o: $(CORE_DEPS) $(HTTP_DEPS) \ + $(SRC)/src/http/modules/ngx_http_stub_status_module.c + $(CC) -c $(CFLAGS) $(CORE_INCS) $(HTTP_INCS) \ + -o ./src/http/modules/ngx_http_stub_status_module.o \ + $(SRC)/src/http/modules/ngx_http_stub_status_module.c + manpage: ./nginx.8 diff --git a/objs/nginx.8 b/objs/nginx.8 deleted file mode 100755 index 2adfa70..0000000 --- a/objs/nginx.8 +++ /dev/null @@ -1,214 +0,0 @@ -.\" -.\" Copyright (C) 2010, 2019 Sergey A. Osokin -.\" Copyright (C) Nginx, Inc. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" -.Dd November 5, 2020 -.Dt NGINX 8 -.Os -.Sh NAME -.Nm nginx -.Nd "HTTP and reverse proxy server, mail proxy server" -.Sh SYNOPSIS -.Nm -.Op Fl ?hqTtVv -.Op Fl c Ar file -.Op Fl e Ar file -.Op Fl g Ar directives -.Op Fl p Ar prefix -.Op Fl s Ar signal -.Sh DESCRIPTION -.Nm -(pronounced -.Dq engine x ) -is an HTTP and reverse proxy server, a mail proxy server, and a generic -TCP/UDP proxy server. -It is known for its high performance, stability, rich feature set, simple -configuration, and low resource consumption. -.Pp -The options are as follows: -.Bl -tag -width ".Fl d Ar directives" -.It Fl ?\& , h -Print help. -.It Fl c Ar file -Use an alternative configuration -.Ar file . -.It Fl e Ar file -Use an alternative error log -.Ar file . -Special value -.Cm stderr -indicates that the standard error output should be used. -.It Fl g Ar directives -Set global configuration directives. -See -.Sx EXAMPLES -for details. -.It Fl p Ar prefix -Set the prefix path. -The default value is -.Pa /nginx . -.It Fl q -Suppress non-error messages during configuration testing. -.It Fl s Ar signal -Send a signal to the master process. -The argument -.Ar signal -can be one of: -.Cm stop , quit , reopen , reload . -The following table shows the corresponding system signals: -.Pp -.Bl -tag -width ".Cm reopen" -compact -.It Cm stop -.Dv SIGTERM -.It Cm quit -.Dv SIGQUIT -.It Cm reopen -.Dv SIGUSR1 -.It Cm reload -.Dv SIGHUP -.El -.It Fl T -Same as -.Fl t , -but additionally dump configuration files to standard output. -.It Fl t -Do not run, just test the configuration file. -.Nm -checks the configuration file syntax and then tries to open files -referenced in the configuration file. -.It Fl V -Print the -.Nm -version, compiler version, and -.Pa configure -script parameters. -.It Fl v -Print the -.Nm -version. -.El -.Sh SIGNALS -The master process of -.Nm -can handle the following signals: -.Pp -.Bl -tag -width ".Dv SIGINT , SIGTERM" -compact -.It Dv SIGINT , SIGTERM -Shut down quickly. -.It Dv SIGHUP -Reload configuration, start the new worker process with a new -configuration, and gracefully shut down old worker processes. -.It Dv SIGQUIT -Shut down gracefully. -.It Dv SIGUSR1 -Reopen log files. -.It Dv SIGUSR2 -Upgrade the -.Nm -executable on the fly. -.It Dv SIGWINCH -Shut down worker processes gracefully. -.El -.Pp -While there is no need to explicitly control worker processes normally, -they support some signals too: -.Pp -.Bl -tag -width ".Dv SIGINT , SIGTERM" -compact -.It Dv SIGTERM -Shut down quickly. -.It Dv SIGQUIT -Shut down gracefully. -.It Dv SIGUSR1 -Reopen log files. -.El -.Sh DEBUGGING LOG -To enable a debugging log, reconfigure -.Nm -to build with debugging: -.Pp -.Dl "./configure --with-debug ..." -.Pp -and then set the -.Cm debug -level of the -.Va error_log : -.Pp -.Dl "error_log /path/to/log debug;" -.Pp -It is also possible to enable the debugging for a particular IP address: -.Bd -literal -offset indent -events { - debug_connection 127.0.0.1; -} -.Ed -.Sh ENVIRONMENT -The -.Ev NGINX -environment variable is used internally by -.Nm -and should not be set directly by the user. -.Sh FILES -.Bl -tag -width indent -.It Pa /nginx/logs/nginx.pid -Contains the process ID of -.Nm . -The contents of this file are not sensitive, so it can be world-readable. -.It Pa /nginx/conf/nginx.conf -The main configuration file. -.It Pa /nginx/logs/error.log -Error log file. -.El -.Sh EXIT STATUS -Exit status is 0 on success, or 1 if the command fails. -.Sh EXAMPLES -Test configuration file -.Pa ~/mynginx.conf -with global directives for PID and quantity of worker processes: -.Bd -literal -offset indent -nginx -t -c ~/mynginx.conf \e - -g "pid /var/run/mynginx.pid; worker_processes 2;" -.Ed -.Sh SEE ALSO -.\"Xr nginx.conf 5 -.\"Pp -Documentation at -.Pa http://nginx.org/en/docs/ . -.Pp -For questions and technical support, please refer to -.Pa http://nginx.org/en/support.html . -.Sh HISTORY -Development of -.Nm -started in 2002, with the first public release on October 4, 2004. -.Sh AUTHORS -.An -nosplit -.An Igor Sysoev Aq Mt igor@sysoev.ru . -.Pp -This manual page was originally written by -.An Sergey A. Osokin Aq Mt osa@FreeBSD.org.ru -as a result of compiling many -.Nm -documents from all over the world. diff --git a/objs/ngx_auto_config.h b/objs/ngx_auto_config.h index e4552af..8eed963 100755 --- a/objs/ngx_auto_config.h +++ b/objs/ngx_auto_config.h @@ -2,10 +2,9 @@ --prefix=/nginx \ --with-http_sub_module \ --with-select_module \ + --with-http_stub_status_module \ --without-http_gzip_module \ --without-pcre \ - --without-http_rewrite_module \ - --without-http_auth_basic_module \ --without-http-cache" #ifndef NGX_DEBUG @@ -110,11 +109,9 @@ #define NGX_HAVE_STATVFS 1 #endif -#ifdef CONFIG_LIBNGINX_HTTP_UPSTREAM_RANDOM #ifndef NGX_STAT_STUB #define NGX_STAT_STUB 1 #endif -#endif #ifndef NGX_HAVE_DLOPEN #define NGX_HAVE_DLOPEN 1 @@ -365,15 +362,9 @@ #endif #endif -#ifdef CONFIG_LIBCRYPTO #ifndef NGX_CRYPT #define NGX_CRYPT 1 #endif -#else -#ifndef NGX_CRYPT -#define NGX_CRYPT 0 -#endif -#endif #ifndef NGX_HTTP_X_FORWARDED_FOR #define NGX_HTTP_X_FORWARDED_FOR 1 diff --git a/objs/ngx_modules.c b/objs/ngx_modules.c index 0fb06cc..5df5c49 100755 --- a/objs/ngx_modules.c +++ b/objs/ngx_modules.c @@ -20,6 +20,7 @@ extern ngx_module_t ngx_http_autoindex_module; extern ngx_module_t ngx_http_index_module; extern ngx_module_t ngx_http_mirror_module; extern ngx_module_t ngx_http_try_files_module; +extern ngx_module_t ngx_http_auth_basic_module; extern ngx_module_t ngx_http_access_module; extern ngx_module_t ngx_http_limit_conn_module; extern ngx_module_t ngx_http_limit_req_module; @@ -40,6 +41,7 @@ extern ngx_module_t ngx_http_upstream_least_conn_module; extern ngx_module_t ngx_http_upstream_random_module; extern ngx_module_t ngx_http_upstream_keepalive_module; extern ngx_module_t ngx_http_upstream_zone_module; +extern ngx_module_t ngx_http_stub_status_module; extern ngx_module_t ngx_http_write_filter_module; extern ngx_module_t ngx_http_header_filter_module; extern ngx_module_t ngx_http_chunked_filter_module; @@ -71,6 +73,7 @@ ngx_module_t *ngx_modules[] = { &ngx_http_index_module, &ngx_http_mirror_module, &ngx_http_try_files_module, + &ngx_http_auth_basic_module, &ngx_http_access_module, &ngx_http_limit_conn_module, &ngx_http_limit_req_module, @@ -91,6 +94,7 @@ ngx_module_t *ngx_modules[] = { &ngx_http_upstream_random_module, &ngx_http_upstream_keepalive_module, &ngx_http_upstream_zone_module, + &ngx_http_stub_status_module, &ngx_http_write_filter_module, &ngx_http_header_filter_module, &ngx_http_chunked_filter_module, @@ -124,6 +128,7 @@ char *ngx_module_names[] = { "ngx_http_index_module", "ngx_http_mirror_module", "ngx_http_try_files_module", + "ngx_http_auth_basic_module", "ngx_http_access_module", "ngx_http_limit_conn_module", "ngx_http_limit_req_module", @@ -144,6 +149,7 @@ char *ngx_module_names[] = { "ngx_http_upstream_random_module", "ngx_http_upstream_keepalive_module", "ngx_http_upstream_zone_module", + "ngx_http_stub_status_module", "ngx_http_write_filter_module", "ngx_http_header_filter_module", "ngx_http_chunked_filter_module",