Permalink
Browse files

sync CHANGES and bump to 1.1.4

  • Loading branch information...
1 parent 7f256fb commit 587e97846dc1b81d3fe90e1c807839132706602c @avsm avsm committed Jun 3, 2014
Showing with 84 additions and 79 deletions.
  1. +5 −0 CHANGES
  2. +1 −1 _oasis
  3. +17 −17 lib/META
  4. +10 −10 myocamlbuild.ml
  5. +51 −51 setup.ml
View
@@ -1,3 +1,8 @@
+1.1.4 (03-June-2014):
+* [tcp] Fully process the last `ACK` in a 3-way handshake for server connections.
+ This ensures that a `FIN` is correctly transmitted upon application-initiated
+ connection close. (fix from Mindy Preston in #51).
+
1.1.3 (01-April-2014):
* Expose IPV4 through the STACKV4 interface.
View
2 _oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: tcpip
-Version: 1.1.3
+Version: 1.1.4
Synopsis: Ethernet, TCP/IPv4 and DHCPv4 library
Authors: Anil Madhavapeddy, Balraj Singh, Richard Mortier
License: ISC
View
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 44c2b003682b7dda9d6862a6204e4a17)
-version = "1.1.3"
+# DO NOT EDIT (digest: ad7ce68613bd14bc1d9b5d0283b8fd16)
+version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct"
archive(byte) = "tcpip.cma"
@@ -9,7 +9,7 @@ archive(native) = "tcpip.cmxa"
archive(native, plugin) = "tcpip.cmxs"
exists_if = "tcpip.cma"
package "udpv4-unix" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.udpv4 tcpip.ipv4-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -21,7 +21,7 @@ package "udpv4-unix" (
)
package "udpv4-socket" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.udpv4 lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
archive(byte) = "udpv4-socket.cma"
@@ -32,7 +32,7 @@ package "udpv4-socket" (
)
package "udpv4" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip"
@@ -44,7 +44,7 @@ package "udpv4" (
)
package "tcpv4-unix" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.tcpv4 tcpip.ipv4-unix tcpip.channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -56,7 +56,7 @@ package "tcpv4-unix" (
)
package "tcpv4-socket" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
archive(byte) = "tcpv4-socket.cma"
@@ -67,7 +67,7 @@ package "tcpv4-socket" (
)
package "tcpv4" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip tcpip.ipv4"
@@ -79,7 +79,7 @@ package "tcpv4" (
)
package "stack-unix" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.udpv4-unix tcpip.tcpv4-unix tcpip.stack-direct lwt lwt.unix ipaddr.unix mirage-unix mirage-clock-unix mirage-console-unix mirage-types.lwt io-page.unix"
@@ -91,7 +91,7 @@ package "stack-unix" (
)
package "stack-socket" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.udpv4-socket tcpip.tcpv4-socket lwt lwt.unix ipaddr.unix io-page.unix"
@@ -103,7 +103,7 @@ package "stack-socket" (
)
package "stack-direct" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip.ethif tcpip.udpv4 tcpip.tcpv4 tcpip.dhcpv4"
@@ -115,7 +115,7 @@ package "stack-direct" (
)
package "ipv4-unix" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.ethif-unix tcpip.ipv4 lwt lwt.unix"
archive(byte) = "ipv4-unix.cma"
@@ -126,7 +126,7 @@ package "ipv4-unix" (
)
package "ipv4" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip"
@@ -138,7 +138,7 @@ package "ipv4" (
)
package "ethif-unix" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
archive(byte) = "ethif-unix.cma"
@@ -149,7 +149,7 @@ package "ethif-unix" (
)
package "ethif" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt"
@@ -161,7 +161,7 @@ package "ethif" (
)
package "dhcpv4" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip.udpv4"
@@ -173,7 +173,7 @@ package "dhcpv4" (
)
package "channel" (
- version = "1.1.3"
+ version = "1.1.4"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct lwt.syntax lwt"
archive(byte) = "channel.cma"
View
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: e615104a42d8df514031b4eeb670aa0f) *)
+(* DO NOT EDIT (digest: 3f54e83ea5cdb75a192558906c5f4c9c) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)
@@ -39,10 +39,10 @@ module OASISExpr = struct
open OASISGettext
- type test = string
+ type test = string
- type flag = string
+ type flag = string
type t =
@@ -52,10 +52,10 @@ module OASISExpr = struct
| EOr of t * t
| EFlag of flag
| ETest of test * string
-
- type 'a choices = (t * 'a) list
+
+ type 'a choices = (t * 'a) list
let eval var_get t =
@@ -430,10 +430,10 @@ module MyOCamlbuildBase = struct
module OC = Ocamlbuild_pack.Ocaml_compiler
- type dir = string
- type file = string
- type name = string
- type tag = string
+ type dir = string
+ type file = string
+ type name = string
+ type tag = string
(* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
@@ -448,7 +448,7 @@ module MyOCamlbuildBase = struct
* directory.
*)
includes: (dir * dir list) list;
- }
+ }
let env_filename =
Oops, something went wrong.

0 comments on commit 587e978

Please sign in to comment.