]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1830816, r1830836, r1842882, r1842884 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 11 Dec 2018 14:14:40 +0000 (14:14 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 11 Dec 2018 14:14:40 +0000 (14:14 +0000)
commitae46c54ae785aabba43610d8a210c05d9600dfa4
tree56bf53818e9b3e7f094cfc247ca758d46ac8f81b
parent1e2fb82e408aae793763de30d30a6c6a8cd44921
Merge r1830816, r1830836, r1842882, r1842884 from trunk:

* modules/ssl: Add some missing logno tags.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
  Simplify code, no functional change.

* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
  redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF
  case assigns rv to APR_EOF and then to APR_SUCCESS after already.

* modules/mappers/mod_negotiation.c (set_language_quality): Remove
  redundant branch (warning from Coverity).

Submitted by: jorton
Reviewed by: jailletc36, icing, jorton, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1848685 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/mappers/mod_negotiation.c
modules/slotmem/mod_slotmem_shm.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_engine_pphrase.c