Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
张磊
/
FileStorageBeego
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
b3906673
authored
2014-08-22 17:39:57 +0800
by
JessonChan
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts: httplib/httplib.go
2 parents
f684de23
35b4022e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
httplib/httplib.go
utils/slice.go
httplib/httplib.go
View file @
b390667
...
...
@@ -83,6 +83,9 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest {
var
resp
http
.
Response
req
.
Method
=
method
req
.
Header
=
http
.
Header
{}
req
.
Proto
=
"HTTP/1.1"
req
.
ProtoMajor
=
1
req
.
ProtoMinor
=
1
return
&
BeegoHttpRequest
{
url
,
&
req
,
map
[
string
]
string
{},
map
[
string
]
string
{},
defaultSetting
,
&
resp
,
nil
}
}
...
...
utils/slice.go
View file @
b390667
...
...
@@ -106,10 +106,10 @@ func SliceDiff(slice1, slice2 []interface{}) (diffslice []interface{}) {
return
}
// SliceIntersect returns
diff slice of slice1 -
slice2.
// SliceIntersect returns
slice that are present in all the slice1 and
slice2.
func
SliceIntersect
(
slice1
,
slice2
[]
interface
{})
(
diffslice
[]
interface
{})
{
for
_
,
v
:=
range
slice1
{
if
!
InSliceIface
(
v
,
slice2
)
{
if
InSliceIface
(
v
,
slice2
)
{
diffslice
=
append
(
diffslice
,
v
)
}
}
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment