mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check nginx.pm version

Browse Source
This commit is contained in:
Igor Sysoev 2006-10-12 19:55:15 +00:00
parent d79b21d1c6
commit 8a444aa724
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/GNUmakefile
View File

@ -1,6 +1,6 @@
VER= $(shell grep NGINX_VER src/core/nginx.h \ VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
| sed -e 's%^.*\"nginx/\(.*\)\"%\1%') | sed -e 's/^.*\"\(.*\)\"/\1/')
NGINX= nginx-$(VER) NGINX= nginx-$(VER)
TEMP= tmp TEMP= tmp
CP= $(HOME)/java CP= $(HOME)/java

4
misc/GNUmakefile
View File

@ -1,6 +1,6 @@
VER= $(shell grep NGINX_VER src/core/nginx.h \ VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
| sed -e 's%^.*\"nginx/\(.*\)\"%\1%') | sed -e 's/^.*\"\(.*\)\"/\1/')
NGINX= nginx-$(VER) NGINX= nginx-$(VER)
TEMP= tmp TEMP= tmp

3
src/core/nginx.h
View File

@ -8,7 +8,8 @@
#define _NGINX_H_INCLUDED_ #define _NGINX_H_INCLUDED_
#define NGINX_VER "nginx/0.4.9" #define NGINX_VERSION "0.4.9"
#define NGINX_VER "nginx/" NGINX_VERSION
#define NGINX_VAR "NGINX" #define NGINX_VAR "NGINX"
#define NGX_OLDPID_EXT ".oldbin" #define NGX_OLDPID_EXT ".oldbin"

2
src/http/modules/perl/nginx.pm
View File

@ -17,7 +17,7 @@ our @EXPORT = qw(
HTTP_SERVER_ERROR HTTP_SERVER_ERROR
); );
our $VERSION = '0.4.0'; our $VERSION = '0.4.9';
require XSLoader; require XSLoader;
XSLoader::load('nginx', $VERSION); XSLoader::load('nginx', $VERSION);

14
src/http/modules/perl/ngx_http_perl_module.c
View File

@ -565,7 +565,9 @@ ngx_http_perl_create_interpreter(ngx_http_perl_main_conf_t *pmcf,
ngx_log_t *log) ngx_log_t *log)
{ {
int n; int n;
char *embedding[6]; STRLEN len;
SV *sv;
char *ver, *embedding[6];
PerlInterpreter *perl; PerlInterpreter *perl;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "create perl interpreter"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "create perl interpreter");
@ -634,6 +636,16 @@ ngx_http_perl_create_interpreter(ngx_http_perl_main_conf_t *pmcf,
goto fail; goto fail;
} }
sv = get_sv("nginx::VERSION", FALSE);
ver = SvPV(sv, len);
if (ngx_strcmp(ver, NGINX_VERSION) != 0) {
ngx_log_error(NGX_LOG_ALERT, log, 0,
"version " NGINX_VERSION " of nginx.pm is required, "
"but %s was found", ver);
goto fail;
}
if (ngx_http_perl_run_requires(aTHX_ &pmcf->requires, log) != NGX_OK) { if (ngx_http_perl_run_requires(aTHX_ &pmcf->requires, log) != NGX_OK) {
goto fail; goto fail;
} }

1
src/http/modules/perl/ngx_http_perl_module.h
View File

@ -11,6 +11,7 @@
#include <ngx_config.h> #include <ngx_config.h>
#include <ngx_core.h> #include <ngx_core.h>
#include <ngx_http.h> #include <ngx_http.h>
#include <nginx.h>
#include <EXTERN.h> #include <EXTERN.h>
#include <perl.h> #include <perl.h>