1. 26 Sep, 2014 1 commit
  2. 25 Sep, 2014 8 commits
    • Phillip Webb's avatar
      Add `server.tomcat.port-header` support · bff39e95
      Phillip Webb authored
      Update Tomcat ServerProperties to support the RemoteIpValve portHeader
      property.
      
      Fixes gh-1616
      bff39e95
    • Phillip Webb's avatar
      Drop protocolHeader and remoteIpHeader defaults · 0dc46a2f
      Phillip Webb authored
      The `protocolHeader` and `remoteIpHeader` no longer have default values
      and must be opt-in.
      
      Fixes gh-1624
      0dc46a2f
    • Andy Wilkinson's avatar
      Update ErrorPageFilter so it won’t try to forward a committed response · 72ef1d65
      Andy Wilkinson authored
      In some scenarios, the ErrorPageFilter will want to forward the request
      to an error page but the response has already been committed. One common
      cause of this is when the filter’s running on WAS. WAS calls
      flushBuffer() (which commits the response), upon a clean exit from a
      servlet’s service method.
      
      Previously, the filter would attempt the forward, even if the response
      was committed. This would result in an IllegalStateException and a
      possibly incomplete response that may also have an incorrect status
      code.
      
      This commit updates the ErrorPageFilter to check to see if the response
      has already been committed before it attempts to forward the request to
      the error page. If the response has already been committed, the filter
      logs an error and allows the container’s normal handling to kick in.
      This prevents an IllegalStateException from being thrown.
      
      This commit also updates the response wrapper to keep track of when
      sendError has been called. Now, when flushBuffer is called, if
      sendError has been called, the wrapper calls sendError on the wrapped
      response. This prevents the wrapper from suppressing an error when the
      response is committed before the request handling returns to the error
      page filter.
      
      Closes gh-1575
      72ef1d65
    • Phillip Webb's avatar
      Fix failing ThymeleafAutoConfigurationTests · 258059ea
      Phillip Webb authored
      Remove accidental addition of a 1.2 test.
      258059ea
    • Dave Syer's avatar
      Tidy some Javadocs · c1404b1e
      Dave Syer authored
      c1404b1e
    • Dave Syer's avatar
      Copy server customization to management context · 336b96b8
      Dave Syer authored
      If the actuator endpoints are configured on a different port then there
      are some settings in the main ServerProperties that we would like to
      re-use (e.g. the access log). The easiest way to do that is to just
      configure the management server using the same ServerProperties instance
      and then overwrite the things that are different (and stored in
      ManagementServerProperties).
      
      Fixes gh-1581
      336b96b8
    • Dave Syer's avatar
      Make Thymeleaf @ConditionalOnWebApplication · 304920df
      Dave Syer authored
      If user creates a Thymeleaf app with a parent-child context then the
      child should contain all the web-specific pieces (and they are likely
      to fail fast if they need to be ServletContextAware, or slower if they
      try to locate a WebApplicationContext at runtime). This can't happen
      if the view resolver is being added to the parent.
      
      Freemarker and Velocity already have similar tests because it is assumed
      that they should be usable outside a web app, so this change just does the
      same for Thymeleaf.
      
      Fixes gh-1611
      304920df
    • Stéphane DERACO's avatar
      Fix broken documentation links · 68ff7d45
      Stéphane DERACO authored
      Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.
      
      Fixes gh-1613
      68ff7d45
  3. 24 Sep, 2014 3 commits
    • Phillip Webb's avatar
      Support String to char[] bindings · 0b50fe4e
      Phillip Webb authored
      Update RelaxedConversionService to also support String to char[]
      conversion. Primarily to support the `password` field in
      MongoProperties.
      
      Fixes gh-1572
      0b50fe4e
    • Phillip Webb's avatar
      Add debug logging to ConfigFileApplicationListener · 23ff7c91
      Phillip Webb authored
      Update ConfigFileApplicationListener to include more debug level output.
      Debug messages are recorded during onApplicationEnvironmentPreparedEvent
      but not actually output until onApplicationPreparedEvent. This is
      because the logging level might not have been correctly set until the
      context is completely prepared.
      
      Fixes gh-1584
      23ff7c91
    • Phillip Webb's avatar
      Polish formatting · 14221640
      Phillip Webb authored
      14221640
  4. 23 Sep, 2014 3 commits
  5. 22 Sep, 2014 3 commits
  6. 20 Sep, 2014 1 commit
  7. 19 Sep, 2014 1 commit
    • Dave Syer's avatar
      A few tweaks that might improve performance on startup · d6165d97
      Dave Syer authored
      ... or couldn't hurt anyway.
      
      1. Extends the definition of a web application for @ConditionalOnWebapp
      so that a StandardEnvironment can be used (cutting out JNDI failures
      for Environment properties)
      
      2. Doesn't bother using StandardServletEnvironment in integration tests
      
      3. Make the NON_ENUMERABLE_ENUMERABLES in PropertySourcesPropertyValues
      static so they only get initialized once (not a huge issue at all)
      d6165d97
  8. 18 Sep, 2014 2 commits
  9. 17 Sep, 2014 7 commits
  10. 16 Sep, 2014 2 commits
    • Andy Wilkinson's avatar
      Improve error handling in EnableAutoConfigurationImportSelector · eed58eec
      Andy Wilkinson authored
      Previously, EnableAutoConfigurationImportSelector assumed that it
      would always find auto-configuration attributes from an
      @EnableAutoConfiguration annotation. This assumption does not hold
      true in certain circumstances, although exactly what those
      circumstances are is unclear. It could occur if the import selector
      were used directly, but it's package-private making that unlikey. In
      such circumstances a NullPointerException was being thrown.
      
      This commit asserts that the attributes are non-null and, should the
      assertion fail, produces an error that is more helpful than an NPE.
      
      Closes gh-1512
      eed58eec
    • Andy Wilkinson's avatar
      Add support for configuring RemoteIpValve’s internalProxies · 468b6cb1
      Andy Wilkinson authored
      Closes gh-1522
      468b6cb1
  11. 15 Sep, 2014 4 commits
  12. 13 Sep, 2014 5 commits
    • Dave Syer's avatar
      Update docs on metrics names · 7828f2a5
      Dave Syer authored
      7828f2a5
    • Dave Syer's avatar
      Blitz some more special characters from the metric names · deef7844
      Dave Syer authored
      When MVC path matchers are used as metric keys, they can still contain
      invalid characters and patterns (like asterisks). This change removes
      some more special characters and also tidies up the names a bit so
      no key part starts or ends with "-" (which is ugly).
      
      Fixes gh-1528
      deef7844
    • Dave Syer's avatar
      Add /error to ignored paths for security autoconfig · 437fb754
      Dave Syer authored
      Protecting /error doesn't make a great deal of sense and if it is
      protected you don't get the ErrorPageFilter for the attempt at loading
      it, so Tomcat renders its own HTML error page (when deployed as WAR).
      
      Fixes gh-1548
      437fb754
    • Dave Syer's avatar
      Remove JDBC from secure-web sample · bf0c8fc8
      Dave Syer authored
      Fixes gh-1534
      bf0c8fc8
    • Dave Syer's avatar
      Ensure the AuthenticationManager is created when needed · 9902f98a
      Dave Syer authored
      There was too much state really in the old implementation of
      AuthenticationManagerConfiguration, and it was leading occasionally
      to null pointers when method A assumed that method B had already
      been called and it hadn't. This change manages to concentrate all the
      references to an AuthenticationManagerBuilder into a single method
      call, removoing the need for storing it at all.
      
      Fixes gh-1556
      9902f98a