Conversation
The old "mod_geoip" used to set _both_ environment _and_ notes.
This commit makes the setting of the notes optional.
This enables an Apache mod_perl running with:
<Location "/">
SetHandler perl-script
PerlOptions -ParseHeaders -SetupEnv -GlobalRequest
PerlResponseHandler ...
</Location>
... and with a MaxMind configuration of:
LoadModule maxminddb_module /usr/lib/apache2/modules/mod_maxminddb.so
<IfModule mod_maxminddb.c>
# See https://github.com/maxmind/mod_maxminddb
MaxMindDBEnable On
MaxMindDBSetNotes On
MaxMindDBFile COUNTRY_DB /path/to/GeoLite2-Country.mmdb
MaxMindDBEnv MM_GEOIP_COUNTRY_CODE COUNTRY_DB/country/iso_code
MaxMindDBEnv MM_GEOIP_CONTINENT_CODE COUNTRY_DB/continent/code
</IfModule>
... to get the client's country code & continent code as an Apache
"note", without having to involve the environment.
The reason one usually wants to disable SetupEnv (via "-SetupEnv") for
mod_perl handlers is one of performance; from the docs at:
https://perl.apache.org/docs/2.0/user/config/config.html#C_SetupEnv_c
> But %ENV population is expensive. Those who have moved to the Perl
> Apache API no longer need this extra %ENV population, and can gain
> by disabling it.
horgh
requested changes
Jan 24, 2020
t/notes.t
Outdated
| use JSON::XS qw( decode_json ); | ||
| use Test::ModMaxMindDB; | ||
|
|
||
| my $url = '/cgi-bin/valid-db/json-env'; |
Contributor
There was a problem hiding this comment.
Should this be hitting /notes? I don't see us actually hitting the new path, nor checking what the test package is doing.
Member
Author
There was a problem hiding this comment.
That explains why it surprisingly passed right away. 🤣
src/mod_maxminddb.c
Outdated
| maxminddb_register_hooks /* register hooks */ | ||
| }; | ||
|
|
||
| static void maxminddb_kv_set(maxminddb_config *conf, |
Contributor
There was a problem hiding this comment.
There's a call to apr_table_set() in set_network_environment_variable() - should we use this function there too?
Member
Author
There was a problem hiding this comment.
Good call. I missed that on rebase.
This doesn't matter, but everywhere else used the same ordering.
oschwald
force-pushed
the
greg/notes
branch
8 times, most recently
from
5ce2af8 to
d0b655a
Compare
horgh
approved these changes
Jan 27, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #76.