]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4400fb3) | patch
Merge r1630947, r1645670 from trunk
authorChristophe Jaillet <jailletc36@apache.org>
Fri, 9 Jan 2015 20:51:03 +0000 (20:51 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Fri, 9 Jan 2015 20:51:03 +0000 (20:51 +0000)
commit63068880fa02194d3ddc0862a335524fbb5da39a
tree01e7d87e54425345a3b2833c1c4ef51f1d785f26tree | snapshot
parent4400fb3ea378b40bbffe55bf8bc8fe39e980485bcommit | diff
Merge r1630947, r1645670 from trunk

   * mod_ssl: Check if we are having an SSL connection before looking up SSL
              related variables during expression evaluation to avoid a crash.
              If not return NULL as ssl_var_lookup_ssl does by default.  PR 57070

Submitted by: rpluem
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1650659 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | history
STATUS diff | blob | history
modules/ssl/ssl_engine_vars.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.