Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: berb/java-web-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: basic
Choose a base ref
...
head repository: scottwakeling/java-web-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: basic
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 17 files changed
  • 2 contributors

Commits on Dec 21, 2010

  1. added Basic Authentication

    @berb
    berb committed Dec 21, 2010
    Configuration menu
    Copy the full SHA
    96bb307 View commit details
    Browse the repository at this point in the history

  2. added access logging using the "Combined Log Format"

    @berb
    berb committed Dec 21, 2010
    Configuration menu
    Copy the full SHA
    e4c0742 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2010

  1. added more loggers and buildfile

    @berb
    berb committed Dec 22, 2010
    Configuration menu
    Copy the full SHA
    a0da586 View commit details
    Browse the repository at this point in the history

  2. * added caching skeleton

    @berb
    berb committed Dec 22, 2010
    Configuration menu
    Copy the full SHA
    f321d56 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2010

  1. added simple LRU-based in memory cache

    @berb
    berb committed Dec 23, 2010
    Configuration menu
    Copy the full SHA
    7a6af4e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2011

  1. Merge branch 'in-memory-cache' of github.com:scottWakeling/java-web-s… 

    …erver into basic

Conflicts:
	src/de/ioexception/www/server/impl/BasicHttpServer.java
    @scottwakeling
    scottwakeling committed Mar 4, 2011
    Configuration menu
    Copy the full SHA
    2fa514c View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2011

  1. Merge remote-tracking branch 'origin/logging' into basic 

    Conflicts:
	src/de/ioexception/www/server/impl/BasicHttpServer.java
    @scottwakeling
    scottwakeling committed Mar 5, 2011
    Configuration menu
    Copy the full SHA
    b15d00b View commit details
    Browse the repository at this point in the history

  2. merged in 'logging' branch and added tasks to build.xml

    @scottwakeling
    scottwakeling committed Mar 5, 2011
    Configuration menu
    Copy the full SHA
    5e7382d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2011

  1. use the hashcode of cached entities as an ETag for conditional responses

    @scottwakeling
    scottwakeling committed Mar 6, 2011
    Configuration menu
    Copy the full SHA
    6dc5fb0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'in-memory-cache' into basic

    @scottwakeling
    scottwakeling committed Mar 6, 2011
    Configuration menu
    Copy the full SHA
    8710500 View commit details
    Browse the repository at this point in the history

  3. set sensible defaults in BasicHTTPResponse() and use Http statics ins… 

    …tead of local strings
    @scottwakeling
    scottwakeling committed Mar 6, 2011
    Configuration menu
    Copy the full SHA
    63a5ce5 View commit details
    Browse the repository at this point in the history

  4. reinstated http version in a basic response, use request's version 

    no need to set zero content length, it's in the default ctor now
    @scottwakeling
    scottwakeling committed Mar 6, 2011
    Configuration menu
    Copy the full SHA
    e2b1449 View commit details
    Browse the repository at this point in the history
Loading