diff options
author | Jim Jagielski <jim@apache.org> | 2018-05-31 13:19:12 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2018-05-31 13:19:12 +0000 |
commit | 4c1d0422ecadad4c283a2d64c41b83957e1721a6 (patch) | |
tree | 56823bebc4189e1808b33445c0b0f636ea76a8e9 /support | |
parent | 9bb448835a45a4f36368ecbdd3be3438f7115473 (diff) | |
download | httpd-4c1d0422ecadad4c283a2d64c41b83957e1721a6.tar.gz |
Merge r1490294, r1734635, r1749403, r1813116, r1816179, r1817598, r1832198, r1832200, r1832277, r1832317 from trunk:
Note that the function will be available in APR.
Silent a smatch warning:
mod_auth_form.c:626 get_form_auth() warn: variable dereferenced before check 'sent_user' (see line 616)
Use 'memcpy' instead of 'strcpy' when the size of the string has already been computed.
Fix compilation failure :
unixd.c: In function ‘ap_unixd_mpm_set_signals’:
unixd.c:579:5: error: implicit declaration of function ‘apr_signal’; did you mean ‘strsignal’? [-Werror=implicit-function-declaration]
apr_signal(SIGPIPE, SIG_IGN);
^~~~~~~~~~
strsignal
Not sure where it comes from, maybe related to r1812301.
mod_substitute: add runtime traces. PR 61132.
In verify_ocsp_status in ssl_engine_ocsp.c, the log message, "OCSP response not successful: %d" should print the value of r instead of rc.
The value of rc will always be 0.
PR 61876 [sam <sam.eastman.4114 gmail.com>]
Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.
/!\ This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available)
See PR 60086.
Axe some dead code.
See PR 60086.
Fix typo
Fix a potential un-intialized variable usage warning.
This can not be a runtime ixsue, because, in such a case, we would assert and abort before.
PR 59819.
Submitted by: minfrin, jailletc36, jailletc36, jailletc36, ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed by: jailletc36, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832607 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
-rw-r--r-- | support/win32/ApacheMonitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c index 26b54a00db..841b4ab236 100644 --- a/support/win32/ApacheMonitor.c +++ b/support/win32/ApacheMonitor.c @@ -912,7 +912,7 @@ LRESULT CALLBACK ConnectDlgProc(HWND hDlg, UINT message, WM_SETTEXT, (WPARAM) NULL, (LPARAM) szCmp); } - if (SHGetMalloc(&pMalloc)) { + if (SUCCEEDED(SHGetMalloc(&pMalloc))) { pMalloc->lpVtbl->Free(pMalloc, il); pMalloc->lpVtbl->Release(pMalloc); } |