Kentaro Hayashi
null+****@clear*****
Thu Sep 29 00:21:25 JST 2016
Kentaro Hayashi 2016-09-29 00:21:25 +0900 (Thu, 29 Sep 2016) New Revision: 1062efafb5993b8294cd63174132c1cefda27eaf https://github.com/groonga/groonga/commit/1062efafb5993b8294cd63174132c1cefda27eaf Message: groonga-httpd: use pcre related code when pcre library is enabled regex_locations is a optional member variable of ngx_http_core_loc_conf_t when pcre library is enabled. Modified files: src/httpd/nginx-module/config src/httpd/nginx-module/ngx_http_groonga_module.c Modified: src/httpd/nginx-module/config (+3 -0) =================================================================== --- src/httpd/nginx-module/config 2016-09-01 17:46:18 +0900 (b79eef6) +++ src/httpd/nginx-module/config 2016-09-29 00:21:25 +0900 (7ceb128) @@ -10,6 +10,9 @@ if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then groonga_cflags="-I${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" groonga_cflags="${groonga_cflags} -DNGX_HTTP_GROONGA_LOG_PATH=\\\"\"${GROONGA_HTTPD_GROONGA_LOG_PATH}\"\\\"" groonga_cflags="${groonga_cflags} -DNGX_HTTP_GROONGA_QUERY_LOG_PATH=\\\"\"${GROONGA_HTTPD_GROONGA_QUERY_LOG_PATH}\"\\\"" + if [ "${GROONGA_HTTPD_WITH_PCRE}" = "yes" ]; then + groonga_cflags="${groonga_cflags} -DNGX_GRN_SUPPORT_PCRE" + fi groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH}" if [ "${GROONGA_HTTPD_WITH_ONIGMO}" = "yes" ]; then groonga_libs="$groonga_libs -L${GROONGA_HTTPD_ONIGMO_IN_TREE_LINK_PATH}" Modified: src/httpd/nginx-module/ngx_http_groonga_module.c (+2 -0) =================================================================== --- src/httpd/nginx-module/ngx_http_groonga_module.c 2016-09-01 17:46:18 +0900 (20a739e) +++ src/httpd/nginx-module/ngx_http_groonga_module.c 2016-09-29 00:21:25 +0900 (4c6e6d0) @@ -1330,6 +1330,7 @@ ngx_http_groonga_each_loc_conf(ngx_http_conf_ctx_t *http_conf, callback, user_data); +#ifdef NGX_GRN_SUPPORT_PCRE if (location_conf->regex_locations) { ngx_uint_t j; for (j = 0; location_conf->regex_locations[j]; j++) { @@ -1342,6 +1343,7 @@ ngx_http_groonga_each_loc_conf(ngx_http_conf_ctx_t *http_conf, } } } +#endif } } -------------- next part -------------- HTML����������������������������...Download