search

google / earthenterprise

Google Earth Enterprise - Open Source
Apache License 2.0
2.67k stars 888 forks source link

1885: Upgrade Apache to 2.4.46 #1889

Closed tst-jlarocco closed 3 years ago

tst-jlarocco commented 3 years ago

This is straightforward replacement of 2.4.39 with 2.4.46.

The only non-trivial change was to remove apache-ge-configure.patch, which patched the configure script to turn on "socache-shmcb". I removed the patch and added the '--enable-socache-shmcb' flag to the SConscript file that calls Apache's configure script.

tst-jlarocco commented 3 years ago

I don't have permission to delete it, but this replaces https://github.com/google/earthenterprise/pull/1888

tst-lsavoie commented 3 years ago

Minor note: there are a couple of references to Apache 2.2 in earth_enterprise/src/third_party/apache2/gehttpd_error_handler.conf. Looking over them, it may be best to leave them as-is.

tst-lsavoie commented 3 years ago

With the latest changes the code looks good. I still need to run some tests.