diff --git a/Cargo.lock b/Cargo.lock index 060c83a8..7dfec10f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,15 +11,15 @@ dependencies = [ "foxbox_thinkerbell 0.1.2", "foxbox_users 0.1.0 (git+https://github.com/fxbox/users.git?rev=1033e08)", "get_if_addrs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "iron-cors 0.1.0 (git+https://github.com/fxbox/iron-cors.git?rev=96ede73)", - "iron-test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "iron-test 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.5.0 (git+https://github.com/carllerche/mio.git)", "mktemp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mount 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "mount 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "multicast_dns 0.1.0 (git+https://github.com/fxbox/multicast-dns.git?rev=a6e4bcc)", "nix 0.5.1-pre (git+https://github.com/nix-rust/nix.git?rev=138080)", "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -35,7 +35,7 @@ dependencies = [ "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "stainless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "staticfile 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "staticfile 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -278,27 +278,6 @@ name = "httparse" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "hyper" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "hyper" version = "0.8.1" @@ -310,6 +289,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -326,12 +306,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "iron" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.3.0" dependencies = [ "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -345,18 +324,7 @@ dependencies = [ name = "iron" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", -] +replace = "iron 0.3.0" [[package]] name = "iron-cors" @@ -369,11 +337,11 @@ dependencies = [ [[package]] name = "iron-test" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -462,15 +430,6 @@ dependencies = [ "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "mime" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mime" version = "0.2.0" @@ -519,15 +478,6 @@ name = "modifier" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mount" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sequence_trie 0.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mount" version = "0.1.0" @@ -866,14 +816,6 @@ name = "sequence_trie" version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "serde" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "serde" version = "0.7.0" @@ -935,10 +877,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "staticfile" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "iron 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mount 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index f0c7292d..923f6c8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,12 +31,12 @@ docopt = "0.6.78" docopt_macros = "0.6.80" env_logger = "0.3.2" get_if_addrs = "0.3.1" -hyper = "0.7.2" +hyper = "0.8.1" mktemp = "0.1.2" libc = "0.2.7" log = "0.3" mio = { git = "https://github.com/carllerche/mio.git" } -mount = "0.0.10" +mount = "0.1.0" nix = { git = "https://github.com/nix-rust/nix.git", rev = "138080" } # Until 0.5.1 is released openssl = "0.7.6" openssl-sys = "0.7.6" @@ -48,7 +48,7 @@ rusqlite = "0.6.0" serde = "0.7.0" serde_json = "0.7.0" serde_macros = "0.7.2" -staticfile = "0.1.0" +staticfile = "0.2.0" transformable_channels = "^0.1" unicase = "1.3.0" time = "0.1" @@ -59,13 +59,13 @@ ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" } xml-rs = "0.3.0" [dependencies.iron] -version = "0.2.6" +version = "0.3.0" default-features = true features = ["ssl"] [dev-dependencies] stainless = "0.1.4" -iron-test = "0.2.0" +iron-test = "0.3.0" regex = "0.1.55" rand = "0.3.14" tempdir = "0.3.4" diff --git a/iron-fork/Cargo.toml b/iron-fork/Cargo.toml index 2e642763..2a12d421 100644 --- a/iron-fork/Cargo.toml +++ b/iron-fork/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iron" -version = "0.2.6" +version = "0.3.0" description = "Extensible, Concurrency Focused Web Development in Rust." readme = "README.md" repository = "https://github.com/iron/iron" @@ -26,7 +26,7 @@ ssl = ["hyper/ssl"] [dependencies] typemap = "0.3" url = "0.5" -plugin = "0.2*" +plugin = "0.2" modifier = "0.1" error = "0.1" log = "0.3" @@ -35,8 +35,8 @@ lazy_static = "0.1" num_cpus = "0.2" [dependencies.hyper] -version = "0.7" +version = "0.8" default-features = false [dev-dependencies] -time = "*" +time = "0.1"