Nginx [PATCH] Fix error when building a Nginx source RPM with custom Zlib - Nginx 1.13.7

made some changes and renumber/versioned cloudflare zlib from 1.2.8 to 1.3.0 so it's library gets picked up first - seems to be alphanumerically the last version is picked if there's more than one version i.e. 1.2.11 over 1.2.8 or 1.3.0 over 1.2.8 so can keep previous version in place too

Code (Text):

ls -lahrt /usr/local/lib | grep libz
-rwxr-xr-x   1 root root 115K Dec 13 03:54 libz.so.1.2.8
-rw-r--r--   1 root root 143K Dec 13 05:48 libz.a
-rwxr-xr-x   1 root root 111K Dec 13 05:48 libz.so.1.3.0
lrwxrwxrwx   1 root root   13 Dec 13 05:48 libz.so.1 -> libz.so.1.3.0
lrwxrwxrwx   1 root root   13 Dec 13 05:48 libz.so -> libz.so.1.3.0

lsof | grep nginx | grep -v php-fpm | grep libz
nginx     11733           root  mem       REG                9,2     113536   12089322 /usr/local/lib/libz.so.1.3.0
nginx     11734          nginx  mem       REG                9,2     113536   12089322 /usr/local/lib/libz.so.1.3.0
nginx     11735          nginx  mem       REG                9,2     113536   12089322 /usr/local/lib/libz.so.1.3.0
nginx     11737          nginx  mem       REG                9,2     113536   12089322 /usr/local/lib/libz.so.1.3.0
nginx     11738          nginx  mem       REG                9,2     113536   12089322 /usr/local/lib/libz.so.1.3.0

still more testing though

---

 

Interesting testing between standard zlib 1.2.11 and cloudflare zlib 1.2.8 renamed 1.3.0, encountered where nginx recompiles via centmin.sh menu option 4 will not pick up the correct zlib version if you test one version after the other out of the box. It seems the library directory containing libz.so.1.2.11 or libz.so.1.3.0 has 2 symlinks to them for libz.so and libz.so.1 but seems on subsequent recompiles symlink for libz.so.1 isn't updated and stuck on previous version symlink
i.e. if i compiled with cloudflare zlib 1.2.8 renamed 1.3.0 and then recompile with zlib 1.2.11, the resulting directory would have

Code (Text):

ls -lahrt /usr/local/lib | grep libz
-rwxr-xr-x   1 root root 111K Dec 13 07:14 libz.so.1.2.8
-rwxr-xr-x   1 root root 111K Dec 13 07:35 libz.so.1.3.0
-rw-r--r--   1 root root 144K Dec 13 07:38 libz.a
-rwxr-xr-x   1 root root 115K Dec 13 07:38 libz.so.1.2.11
lrwxrwxrwx   1 root root   14 Dec 13 07:40 libz.so.1 -> libz.so.1.3.0
lrwxrwxrwx   1 root root   14 Dec 13 07:40 libz.so -> libz.so.1.2.11

and nginx lsof output would report incorrectly zlib 1.3.0 in use when it should be 1.2.11

so if i correct the libz.so.1 symlink on each zlib version recompiles, it is now reporting correct version

Code (Text):

ls -lahrt /usr/local/lib | grep libz
-rwxr-xr-x   1 root root 111K Dec 13 07:14 libz.so.1.2.8
-rwxr-xr-x   1 root root 111K Dec 13 07:35 libz.so.1.3.0
-rw-r--r--   1 root root 144K Dec 13 07:38 libz.a
-rwxr-xr-x   1 root root 115K Dec 13 07:38 libz.so.1.2.11
lrwxrwxrwx   1 root root   14 Dec 13 07:40 libz.so.1 -> libz.so.1.2.11
lrwxrwxrwx   1 root root   14 Dec 13 07:40 libz.so -> libz.so.1.2.11

 

cheers @bassie Beta Branch - add optional Cloudflare zlib performance fork support in 123.09beta01

 

thanks made change to tack on a version number at end add CLOUDFLARE_ZLIBVER variable · centminmod/centminmod@577f71d · GitHub but strangest thing on make install part of zlib my SSH session always terminates at

Code (Text):

+ make install
cp libz.a /usr/local/lib
chmod 644 /usr/local/lib/libz.a

weirdest thing !

make install debug log https://gist.github.com/centminmod/...7d2ef1f62902a5dccc4e2d/z-make-install-exit.md

edit: seems ldconfig picks up /usr/local/lib path so means sshd service which uses zlib ends up using cloudflare zlib version and when you recompile nginx within same SSH session, the make install stage reaps/terminates the processes using that cloudflare zlib version = SSH session terminates. Workaround now is to set CLOUDFLARE_ZLIB='n', recompile nginx via centmin.sh menu option 4 to get zlib 1.2.11 version in place at /usr/local/lib path and then restart SSH service (service sshd restart) and then exit the existing SSH session before logging back into SSH to set CLOUDFLARE_ZLIB='y' and then recompile nginx via centmin.sh menu option 4. Not sure why this only happens for cloudflare zlib version and not my custom compiled zlib 1.2.11 standard version.

 

so far haven't ran into it.

true.. probably best way forward

more testing

 

brotli won't be used by anything else AFAIK.

but zlib updated fix is going to need some testing as I would need to dynamically restart any services relying on zlib previously built the old way heh. Testing CentOS 7 systems looks fine. Need to test CentOS 6.

 

no no, testing switching to zlib for nginx only and restoring system zlib for all other services

outlined at Beta Branch - add optional Cloudflare zlib performance fork support in 123.09beta01

 

Yeah the patch comments out the configure/make install stuff for both custom zlib 1.2.11 and cloudflare zlib. I left it commented out for now instead of total removal code wise

 

yeah good idea

 

cheers updated the patch with SSE4.2 detection now too https://gist.githubusercontent.com/...0f5b2d968d9ebd61e0a/raw/removezlib-patch.diff

 

thanks @bassie your heads up on cloudflare zlib forced me to figure out my flawed Nginx zlib routine implementation which I have now fixed. Full details for Nginx zlib routine update at 123.09beta01 Updated Nginx zlib routine with optional Cloudflare zlib support