On May 22, 2014, at 9:05 AM, a...@apache.org wrote: > Repository: trafficserver > Updated Branches: > refs/heads/master 2dd94936e -> f230e610c > > > TS-2381 Add SPDY stream count statistic. > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f230e610 > Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f230e610 > Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f230e610 > > Branch: refs/heads/master > Commit: f230e610cc144b1798229c004217d7bdff8d2dac > Parents: 2dd9493 > Author: Alan M. Carroll <a...@network-geographics.com> > Authored: Wed May 21 19:21:28 2014 -0700 > Committer: Alan M. Carroll <a...@network-geographics.com> > Committed: Thu May 22 09:05:15 2014 -0700 > > ---------------------------------------------------------------------- > CHANGES | 2 ++ > proxy/Main.cc | 4 ++++ > proxy/spdy/SpdySessionAccept.cc | 3 --- > 3 files changed, 6 insertions(+), 3 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f230e610/CHANGES > ---------------------------------------------------------------------- > diff --git a/CHANGES b/CHANGES > index 0e81b9b..3fce1ff 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -1,6 +1,8 @@ > -*- coding: utf-8 -*- > Changes with Apache Traffic Server 5.0.0 > > + *) [TS-2831] Add SPDY stream count statistic. > + > *) [TS-1665] Remove the old traffic_shell (R.I.P.). > > *) [TS-2830] Make SPDY configurable. > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f230e610/proxy/Main.cc > ---------------------------------------------------------------------- > diff --git a/proxy/Main.cc b/proxy/Main.cc > index e6fd0cb..bd74d66 100644 > --- a/proxy/Main.cc > +++ b/proxy/Main.cc > @@ -1531,6 +1531,10 @@ main(int /* argc ATS_UNUSED */, char **argv) > SplitDNSConfig::startup(); > #endif > > +# if TS_HAS_SPDY > + extern int spdy_config_load (); > + spdy_config_load(); // must be before HttpProxyPort init. > +# endif
This seems really fragile, is it going to stay, or do you have a plan to remove it? > // Load HTTP port data. getNumSSLThreads depends on this. > if (!HttpProxyPort::loadValue(http_accept_port_descriptor)) > HttpProxyPort::loadConfig(); > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f230e610/proxy/spdy/SpdySessionAccept.cc > ---------------------------------------------------------------------- > diff --git a/proxy/spdy/SpdySessionAccept.cc b/proxy/spdy/SpdySessionAccept.cc > index 79b465d..6da5608 100644 > --- a/proxy/spdy/SpdySessionAccept.cc > +++ b/proxy/spdy/SpdySessionAccept.cc > @@ -31,9 +31,6 @@ > SpdySessionAccept::SpdySessionAccept(Continuation *ep) > : SessionAccept(new_ProxyMutex()), endpoint(ep) > { > -#if TS_HAS_SPDY > - spdy_config_load(); > -#endif > SET_HANDLER(&SpdySessionAccept::mainEvent); > } > >
