diff options
| author | Stefan Eissing <icing@apache.org> | 2015-11-04 15:15:16 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2015-11-04 15:15:16 +0000 |
| commit | 8fbd8b191af5ec3218e91d3ae41a16d5813c7f5d (patch) | |
| tree | 1825b6e2554cd42453a0c143a808d2fad060a4aa /include/httpd.h | |
| parent | cf457d9cbd032c73332b6b339154828adb485f77 (diff) | |
| download | httpd-8fbd8b191af5ec3218e91d3ae41a16d5813c7f5d.tar.gz | |
merge of 1708107,1709587,1709602,1709995,1710231,1710419,1710572,1710583 from trunk, addition of master conn_rec*, minor bump of mmn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@1712567 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/httpd.h')
| -rw-r--r-- | include/httpd.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/httpd.h b/include/httpd.h index 4204cd0484..54bf838f4c 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1167,6 +1167,9 @@ struct conn_rec { #if APR_HAS_THREADS apr_thread_t *current_thread; #endif + + /** The "real" master connection. NULL if I am the master. */ + conn_rec *master; }; /** |