Skip to content

bugfix: ensured the 'pcre_version' symbol is preserved and undefined when PCRE is statically linked. #1556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thibaultcha wants to merge 3 commits into from
Closed

bugfix: ensured the 'pcre_version' symbol is preserved and undefined when PCRE is statically linked. #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04633ac
api: bumped API version to 0.10.16.
thibaultcha May 23, 2019
12ba57d
bugfix: ensured the 'pcre_version()' symbol is preserved and undefine…
thibaultcha Jul 11, 2019
a3f07bb
[removeme] travis-ci: switched to the contributor's branch of lua-res…
thibaultcha Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ install:
- git clone https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module
- git clone https://github.com/openresty/srcache-nginx-module.git ../srcache-nginx-module
- git clone https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module
- git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
- git clone -b chore/bump-api https://github.com/thibaultcha/lua-resty-core.git ../lua-resty-core
- git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
- git clone https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql
- git clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module
Expand Down
2 changes: 1 addition & 1 deletion README.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Production ready.
Version
=======

This document describes ngx_lua [v0.10.15](https://github.com/openresty/lua-nginx-module/tags) released on March 14th, 2019.
This document describes ngx_lua [v0.10.16](https://github.com/openresty/lua-nginx-module/tags), which is not released yet.

Synopsis
========
Expand Down
22 changes: 22 additions & 0 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,5 +588,27 @@ else
CORE_LIBS="$CORE_LIBS $ngx_module_libs"
fi

# ----------------------------------------

if [ $PCRE != NO -a $PCRE != YES ]; then
Copy link
Copy Markdown
Member Author

@thibaultcha thibaultcha Jul 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When dynamically linked, $PCRE will be YES or NO. If it is neither, it is statically linked. https://github.com/nginx/nginx/blob/master/auto/lib/pcre/conf#L6

# force pcre_version symbol to be undefined when PCRE is statically linked

ngx_feature="force undefined symbols (--undefined)"
ngx_feature_libs="-Wl,--undefined=printf"
ngx_feature_name=
ngx_feature_run=no
ngx_feature_incs="#include <stdio.h>"
ngx_feature_path=
ngx_feature_test='printf("hello");'

. auto/feature

if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS -Wl,--undefined=pcre_version"
fi
fi

# ----------------------------------------

#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"
2 changes: 1 addition & 1 deletion doc/HttpLuaModule.wiki
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Production ready.

= Version =

This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.15] released on March 14th, 2019.
This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.10.16], which is not released yet.

= Synopsis =
<geshi lang="nginx">
Expand Down
2 changes: 1 addition & 1 deletion src/api/ngx_http_lua_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/* Public API for other Nginx modules */


#define ngx_http_lua_version 10015
#define ngx_http_lua_version 10016


typedef struct {
Expand Down