51 Commits

Author SHA1 Message Date
Gelareh Taban 6b8cd8b092 Remove code that crept back because of the rebase. 2018-01-10 14:26:45 -06:00
Carl Brown 30344ad3f0 Move TLS config to the HTTPServer.Options object 2018-01-08 15:29:21 -06:00
Gelareh Taban 9b64bc21d8 TLS integration with tests - runs OK on macOS and OK on Linux 2018-01-08 12:47:44 -06:00
Carl Brown 3739ce6037 Remove TODO comment for thing I'd already done. 2018-01-08 11:07:29 -06:00
Carl Brown 36adb9f32f Remove Logging variable no longer used and fixed typo
Thanks @gtaban for the feedback.
2018-01-08 10:57:54 -06:00
Carl Brown 66c6b6a06d Semaphores to fix TSAN warnings
Semaphores to track if abort() has been called

Semaphores to track if cleanup() has been called and only let it get called once
2018-01-03 14:06:30 -06:00
George 92dcc60699 Any informational header (1XX) should be allowed to be written prior to actual response headers.
Previously, this honor was only bestowed upon status 100 "Continue".
2017-11-12 12:45:59 -08:00
Gelareh Taban 2e987e181c remove arguments from HTTPServer start function and put it in an option class and pass in init. 2017-11-10 16:50:33 -06:00
Carl Brown 4d2c2b55f7 Merge branch 'develop' into feature/no-http-serving 2017-11-10 15:23:14 -06:00
Arjun Nayini 2c4336880d [Code Style] Some code style changes (#92)
* [Code Style] Some code style changes

Minor changes to make some code Swiftier

* Fixes for PR feedback
2017-11-09 19:58:39 +00:00
Chris Amanse b624e39530 Fix readBuffer leak when do block catches an error (#77) 2017-11-09 19:57:34 +00:00
Carl Brown 630bd0bfc9 Handle blocking failure (#62) 2017-11-07 12:18:19 -08:00
Arjun Nayini 728b66d569 Lint and Clean up code (#84) 2017-11-07 11:34:33 -08:00
Helge Hess 88ab09d047 Drop HTTPServing
The API is concrete, this protocol serves no purpose.
2017-11-05 23:51:45 +01:00
Shane Vitarana 473177815d Fixed typo in comments (#80) 2017-10-30 10:10:21 +00:00
Helge Hess 34cd525151 Typo: it is mkcol, not mkol
As another option we could write an RFC to introduce

  MKOL - Make Outline

Not quite sure what that would do, though.
2017-10-23 14:57:41 +02:00
Carl Brown d9dbb40531 Sockets aren't idle if response not completed (#63) 2017-10-07 18:18:11 +01:00
Carl Brown ec6087c2a1 dealloc (#68) 2017-10-07 13:19:06 +01:00
nixzhu fb6df9b933 Better code style (#67)
* Indent return

* Auto infer URLSessionConfiguration.default

* Better define of `testString`
2017-10-07 13:17:09 +01:00
Chris Bailey 811940bb05 Update Jazzy docs with handler example and other minor improvements (#59) 2017-10-02 11:00:25 +01:00
Aaron Liberatore 3aa8b03c06 Keep alive override (#57)
* Overridable keep alive timeout

* removes whitespace
2017-09-28 22:01:29 +01:00
Carl Brown 2ab754e00f Swift 4 support (#56) 2017-09-26 17:05:12 +01:00
Carl Brown defd4c7005 Push completion block to queueSocketWrite (#55)
* Push completion block to queueSocketWrite

* Fix test assert

I had put this fix in the PR for Swift 4 instead of the PR for this when I split them up. Sorry.
2017-09-26 17:04:52 +01:00
Aaron Liberatore 00adc53d0f Closes requests with Connection: close header (#52)
* Closes requests with Connection: close header

* Fixes whitespace and merge mistake
2017-09-24 13:27:14 +01:00
Carl Brown 280caad31d Honor &stopProcessingBody flag, with tests (#51)
Issue #48
2017-09-22 08:50:20 +01:00
David Jones a8205d2b7a Remove Keep-Alive header 2017-09-19 14:21:40 +01:00
David Jones 62aba99de0 Revise naming and type for requests remaining var 2017-09-19 14:17:30 +01:00
David Jones ee4b4d9620 Correct function of keepalive header 2017-09-19 14:17:13 +01:00
Chris Bailey fee5702695 Fix port configuration being ignored (#42) 2017-09-11 13:59:04 +01:00
Chris Bailey 055a757e15 Update README.md and Jazzy annotations (#43) 2017-09-10 16:21:20 +01:00
Carl Brown 6b5b27edf0 Remove BlueSocket dependency (#39) 2017-09-08 11:46:08 +01:00
Chris Bailey d53f9432ce Perf: read connectionCount only when needed (#23) 2017-08-29 12:48:12 +01:00
Chris Bailey 75f022c06d Remove need for utils.* in CHTTPParser (#35) 2017-08-27 10:14:35 +01:00
Ian Partridge 6c0317d239 Add .swiftlint.yml and clean up project (#33) 2017-08-24 18:15:50 +01:00
Ian Partridge ab8f280798 Remove API docs (#29)
* Update API docs

* Remove docs directory and update .gitignore
2017-08-23 14:17:00 +01:00
Ian Partridge 92f3ee4dc0 Add HTTPServer API (#26) 2017-08-23 10:44:04 +01:00
Chris Bailey 8f1f900474 Add initial set of Jazzy docs (#24) 2017-08-13 08:03:55 +01:00
Aleksey Mashanov 6e6ffe2124 Simplification of HTTPResponse/HTTPResponseWriter (#19)
* Simplification of HTTPResponse/HTTPResponseWriter

* `HTTPResponse` is redundent. Its `status` and `headers` properties
  are moved to parameters of `writeHeader` method of `HTTPResponseWriter`
  instance. `transferEncoding` handling is moved to `HTTPHeaders` - it
  is not as simple as an enum and depends on used HTTP protocol version
  and capabilites set by a client in its request headers.
  `httpVersion` should not be configured by an outer scope - a server should
  use the HTTP version which was requested by a client.

* `writeResponse` and `writeContinue` are replaced by `writeHeader`.

* `writeTrailer` accepts trailers as `HTTPHeaders` struct.

* All `write*` methods accept a completion handler.

* `writeBody` accepts `UnsafeHTTPResponseBody` instead of just `Data`
  and `Dispatch`. It should be used only in the scope of a call and a
  copy should be made or value should be checked for `HTTPResponseBody`
  conformance before storing it anythere. This approch allows to reduce
  memory copying.

* `Result<POSIXError, Void>` enum is replaced with `Result`. In the
  first case `POSIXError` and `Void` are generic parameters names, not
  types. I think this behaviour was unintended.

* Always respond with HTTP/1.1 for any HTTP/1.x requests

* Get back HTTPResponse for possible use in the client
2017-07-17 14:06:47 +01:00
Carl Brown 0da680a181 Fix for exclusive access issue in Swift 4 (#21) 2017-07-15 11:15:44 +01:00
seabaylea 48d155f3ed discardBody() should call done() 2017-06-30 17:34:54 +01:00
Chris Bailey 43702318d4 Convert HTTPMethod to a struct (#17)
* Convert HTTPMethod to a struct

* Compare on rawValue rather than description

* Remove RawRepresentable and add ExpressibleByStringLiteral conformance
2017-06-30 17:11:20 +01:00
Chris Bailey 8ad751d04d Add Comparable conformance to HTTPVersion (#15)
* Add Comparable conformance to HTTPVersion

* Remove superfluous comparable operators and clean up hash collisions

* Remove unnecessary != implementation
2017-06-30 17:11:00 +01:00
aleksey-mashanov 7e366e4687 Make HTTPHeaders more user-friendly (#14)
* Make HTTPHeaders more user-friendly

* Header name is a struct conforming to `ExpressibleByStringLiteral`.
  Standard header names are available through static constants.
  This allows to save some CPU on lowercasing and hash value
  calculation.

* Original headers are stored until first modification. Iterator
  of `HTTPHeaders` iterates over original headers while they are actual,
  in other case it iterates over underlying mutable dictionary.

* Default subscript returns values of all headers with the same
  name concatenated with comma [RFC7230, section 3.2.2], except
  for "Set-Cookie" for which only first value is returned.

* As-is values of all headers with same name can be accessed
  through subscript with label `valuesFor`.

* append() method is modified to accept dictionary literal.
  replace() method is added.

* Split HTTPHeaders implementation to separate extensions
2017-06-28 12:54:41 +01:00
aleksey-mashanov 002d9ce17b Convert HTTPResponseStatus to a struct (#12)
* Convert HTTPResponseStatus to a struct

* `HTTPResponseStatus` is a struct now. It is better then an enum
  in this case because it could be possible to provide an alternative
  reason phrase as allowed by RFC7231:
  "The reason phrases listed here are only recommendations -- they
  can be replaced by local equivalents without affecting the protocol."

* `HTTPResponseStatus` struct is smaller then enum. Struct's size(stride)
  are 32(32) whereas enum's are 33(40).

* Removed conformance to protocol `RawRepresentable` because custom
  reason phrases conflict with the message of `RawRepresentable`:
  "With a RawRepresentable type, you can switch back and forth between a
  custom type and an associated RawValue type without losing the value
  of the original RawRepresentable type."

* Added conformance to `CustomStringConvertble` to provide an easy
  conversion to HTTP status line.

* Added conformance to `ExpressibleByIntegerLiteral` to provide an
  easy way to pass numeric value instead of `.humanReadable`.
  For many server-side developers 200, 404 and 500 have much more
  meaning then `.ok`, `.notFound` and `.internalServerError`.

* Added `class` property in conformance with RFC7231 recommendation:
  "HTTP clients are not required to understand the meaning of all
  registered status codes, though such understanding is obviously
  desirable.  However, a client MUST understand the class of any
  status code, as indicated by the first digit, and treat an
  unrecognized status code as being equivalent to the x00 status
  code of that class..."

* Update API documentation for HTTPResponseStatus

* Modify type of HTTP status-code: UInt16 -> Int

`Int` better match Swift API guidelines then `UInt16` and
requires the same memory in struct because of alignment.

* Swiftify HTTPResponseStatus initializers
2017-06-22 13:04:46 +01:00
Tanner 5a16db4ccb move response write convenience methods to extension (#10) 2017-06-20 16:56:04 +01:00
Tanner 3a21866782 rename Request to HTTPRequest 2017-06-16 11:51:32 +01:00
tanner0101 9691a6a526 spacing fixes 2017-06-14 18:59:07 +01:00
tanner0101 02ef28a81e resolve merge conflicts with HTTPVersion updates 2017-06-14 18:56:20 +01:00
tanner0101 205a2652fc Merge branch 'develop' into just-modules 2017-06-14 18:55:29 +01:00
tanner0101 990a38227a clean up modules 2017-06-14 18:42:36 +01:00