-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev…
….boringcrypto This is a git merge of master into dev.boringcrypto. The branch was previously based on release-branch.go1.9, so there are a handful of spurious conflicts that would also arise if trying to merge master into release-branch.go1.9 (which we never do). Those have all been resolved by taking the original file from master, discarding any Go 1.9-specific edits. all.bash passes on darwin/amd64, which is to say without actually using BoringCrypto. Go 1.10-related fixes to BoringCrypto itself will be in a followup CL. This CL is just the merge. Change-Id: I4c97711fec0fb86761913dcde28d25c001246c35
- Loading branch information
Showing
1,928 changed files
with
217,744 additions
and
72,030 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Code of Conduct | ||
|
||
Please read the [Go Community Code of Conduct](https://golang.org/conduct). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,27 @@ | ||
*** final.go 2015-06-14 23:59:22.000000000 +0200 | ||
--- final-test.go 2015-06-15 00:15:41.000000000 +0200 | ||
*************** | ||
*** 7,12 **** | ||
--- 7,14 ---- | ||
import ( | ||
"html/template" | ||
"io/ioutil" | ||
+ "log" | ||
+ "net" | ||
"net/http" | ||
"regexp" | ||
) | ||
*************** | ||
*** 85,89 **** | ||
http.HandleFunc("/edit/", makeHandler(editHandler)) | ||
http.HandleFunc("/save/", makeHandler(saveHandler)) | ||
|
||
! http.ListenAndServe(":8080", nil) | ||
} | ||
--- 87,101 ---- | ||
http.HandleFunc("/edit/", makeHandler(editHandler)) | ||
http.HandleFunc("/save/", makeHandler(saveHandler)) | ||
|
||
! l, err := net.Listen("tcp", "127.0.0.1:0") | ||
! if err != nil { | ||
! log.Fatal(err) | ||
! } | ||
! err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644) | ||
! if err != nil { | ||
! log.Fatal(err) | ||
! } | ||
! s := &http.Server{} | ||
! s.Serve(l) | ||
! return | ||
} | ||
--- final.go 2017-08-31 13:19:00.422925489 -0700 | ||
+++ final-test.go 2017-08-31 13:23:43.381391659 -0700 | ||
@@ -8,6 +8,7 @@ | ||
"html/template" | ||
"io/ioutil" | ||
"log" | ||
+ "net" | ||
"net/http" | ||
"regexp" | ||
) | ||
@@ -86,5 +87,15 @@ | ||
http.HandleFunc("/edit/", makeHandler(editHandler)) | ||
http.HandleFunc("/save/", makeHandler(saveHandler)) | ||
|
||
- log.Fatal(http.ListenAndServe(":8080", nil)) | ||
+ l, err := net.Listen("tcp", "127.0.0.1:0") | ||
+ if err != nil { | ||
+ log.Fatal(err) | ||
+ } | ||
+ err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644) | ||
+ if err != nil { | ||
+ log.Fatal(err) | ||
+ } | ||
+ s := &http.Server{} | ||
+ s.Serve(l) | ||
+ return | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.