| Log Message: |
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
|
httpd/httpd/branches/2.4.x/
httpd/httpd/branches/2.4.x/STATUS