From 7f31d933a8ec490c89d297daccfbacfd54846209 Mon Sep 17 00:00:00 2001 From: George Xie Date: Fri, 3 Jan 2020 17:43:16 -0800 Subject: [PATCH] fixes some typos, for CREDITS change (#8743) --- CREDITS | 46 +++++++++++++++++++++++----------------------- SECURITY.md | 6 +++--- cmd/server-main.go | 2 +- cmd/server_test.go | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CREDITS b/CREDITS index 1585a220e..e6728dcf6 100644 --- a/CREDITS +++ b/CREDITS @@ -11366,28 +11366,28 @@ SOFTWARE. github.com/klauspost/readahead https://github.com/klauspost/readahead ---------------------------------------------------------------- -The MIT License (MIT) - -Copyright (c) 2015 Klaus Post - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - +The MIT License (MIT) + +Copyright (c) 2015 Klaus Post + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + ================================================================ @@ -16208,7 +16208,7 @@ github.com/pascaldekloe/goe https://github.com/pascaldekloe/goe ---------------------------------------------------------------- To the extent possible under law, Pascal S. de Kloe has waived all -copyright and related or neighboring rights to Go Enterprice. This +copyright and related or neighboring rights to Go Enterprise. This work is published from The Netherlands. https://creativecommons.org/publicdomain/zero/1.0/legalcode diff --git a/SECURITY.md b/SECURITY.md index 95e3b2e8a..2736ccc77 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -13,7 +13,7 @@ and you'll receive a more detailed response to your email within 72 hours indica in handling your report. Please, provide a detailed explanation of the issue. In particular, outline the type of the security -issue (DoS, authentication bypass, information disclouse, ...) and the assumptions you're making (e.g. do +issue (DoS, authentication bypass, information disclose, ...) and the assumptions you're making (e.g. do you need access credentials for a successful exploit). If you have not received a reply to your email within 48 hours or you have not heard from the security team @@ -28,8 +28,8 @@ MinIO uses the following disclosure process: 1. Once the security report is received one member of the security team tries to verify and reproduce the issue and determines the impact it has. -2. A member of the security team will respond and either confrim or reject the security report. - If the report is rejected the repsonse explains why. +2. A member of the security team will respond and either confirm or reject the security report. + If the report is rejected the response explains why. 3. Code is audited to find any potential similar problems. 4. Fixes are prepared for the latest release. 5. On the date that the fixes are applied a security advisory will be published on https://blog.min.io. diff --git a/cmd/server-main.go b/cmd/server-main.go index 531ff5b43..434d467ef 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -134,7 +134,7 @@ func serverHandleCmdArgs(ctx *cli.Context) { // On macOS, if a process already listens on LOCALIPADDR:PORT, net.Listen() falls back // to IPv6 address ie minio will start listening on IPv6 address whereas another // (non-)minio process is listening on IPv4 of given port. - // To avoid this error sutiation we check for port availability. + // To avoid this error situation we check for port availability. logger.FatalIf(checkPortAvailability(globalMinioHost, globalMinioPort), "Unable to start the server") globalIsXL = (setupType == XLSetupType) diff --git a/cmd/server_test.go b/cmd/server_test.go index f9ff6a689..9086ab0b6 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -353,7 +353,7 @@ func (s *TestSuiteCommon) TestBucketPolicy(c *check) { bucketPolicyReadBuf, err := ioutil.ReadAll(response.Body) c.Assert(err, nil) - // Verify if downloaded policy matches with previousy uploaded. + // Verify if downloaded policy matches with previously uploaded. expectedPolicy, err := policy.ParseConfig(strings.NewReader(bucketPolicyStr), bucketName) c.Assert(err, nil) gotPolicy, err := policy.ParseConfig(bytes.NewReader(bucketPolicyReadBuf), bucketName) @@ -521,7 +521,7 @@ func (s *TestSuiteCommon) TestListenBucketNotificationHandler(c *check) { } } -// Test deletes multple objects and verifies server resonse. +// Test deletes multiple objects and verifies server response. func (s *TestSuiteCommon) TestDeleteMultipleObjects(c *check) { // generate a random bucket name. bucketName := getRandomBucketName() @@ -1014,7 +1014,7 @@ func (s *TestSuiteCommon) TestHeader(c *check) { func (s *TestSuiteCommon) TestPutBucket(c *check) { // generate a random bucket name. bucketName := getRandomBucketName() - // Block 1: Testing for racey access + // Block 1: Testing for racy access // The assertion is removed from this block since the purpose of this block is to find races // The purpose this block is not to check for correctness of functionality // Run the test with -race flag to utilize this @@ -1369,7 +1369,7 @@ func (s *TestSuiteCommon) TestPutObjectLongName(c *check) { c.Assert(response.StatusCode, http.StatusBadRequest) verifyError(c, response, "XMinioInvalidObjectName", "Object name contains a leading slash.", http.StatusBadRequest) - //make object name as unsuported + //make object name as unsupported longObjName = fmt.Sprintf("%0256d", 1) buffer = bytes.NewReader([]byte("hello world")) request, err = newTestSignedRequest("PUT", getPutObjectURL(s.endPoint, bucketName, longObjName), @@ -1818,7 +1818,7 @@ func (s *TestSuiteCommon) TestPutBucketErrors(c *check) { func (s *TestSuiteCommon) TestGetObjectLarge10MiB(c *check) { // generate a random bucket name. bucketName := getRandomBucketName() - // form HTTP reqest to create the bucket. + // form HTTP request to create the bucket. request, err := newTestSignedRequest("PUT", getMakeBucketURL(s.endPoint, bucketName), 0, nil, s.accessKey, s.secretKey, s.signer) c.Assert(err, nil) @@ -2005,7 +2005,7 @@ func (s *TestSuiteCommon) TestGetPartialObjectMisAligned(c *check) { {"1-", putContent[1:]}, // request for object data after the first byte. {"6-", putContent[6:]}, - // request for last 2 bytes of th object. + // request for last 2 bytes of the object. {"-2", putContent[len(putContent)-2:]}, // request for last 7 bytes of the object. {"-7", putContent[len(putContent)-7:]}, @@ -2159,7 +2159,7 @@ func (s *TestSuiteCommon) TestGetPartialObjectLarge10MiB(c *check) { request.Header.Add("Range", "bytes=2048-2058") client = http.Client{Transport: s.transport} - // execute the HTTP request to download the partila content. + // execute the HTTP request to download the partial content. response, err = client.Do(request) c.Assert(err, nil) // Since only part of the object is requested, expecting response status to be http.StatusPartialContent . @@ -2424,11 +2424,11 @@ func (s *TestSuiteCommon) TestBucketMultipartList(c *check) { // The reason to duplicate this structure here is to verify if the // unmarshalling works from a client perspective, specifically // while unmarshalling time.Time type for 'Initiated' field. - // time.Time does not honor xml marshaler, it means that we need + // time.Time does not honor xml marshaller, it means that we need // to encode/format it before giving it to xml marshaling. // This below check adds client side verification to see if its - // truly parseable. + // truly parsable. // listMultipartUploadsResponse - format for list multipart uploads response. type listMultipartUploadsResponse struct {