Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
b3906673
Commit
b3906673
authored
Aug 22, 2014
by
JessonChan
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts: httplib/httplib.go
parents
f684de23
35b4022e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
httplib.go
httplib/httplib.go
+3
-0
slice.go
utils/slice.go
+2
-2
No files found.
httplib/httplib.go
View file @
b3906673
...
@@ -83,6 +83,9 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest {
...
@@ -83,6 +83,9 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest {
var
resp
http
.
Response
var
resp
http
.
Response
req
.
Method
=
method
req
.
Method
=
method
req
.
Header
=
http
.
Header
{}
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
}
return
&
BeegoHttpRequest
{
url
,
&
req
,
map
[
string
]
string
{},
map
[
string
]
string
{},
defaultSetting
,
&
resp
,
nil
}
}
}
...
...
utils/slice.go
View file @
b3906673
...
@@ -106,10 +106,10 @@ func SliceDiff(slice1, slice2 []interface{}) (diffslice []interface{}) {
...
@@ -106,10 +106,10 @@ func SliceDiff(slice1, slice2 []interface{}) (diffslice []interface{}) {
return
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
{})
{
func
SliceIntersect
(
slice1
,
slice2
[]
interface
{})
(
diffslice
[]
interface
{})
{
for
_
,
v
:=
range
slice1
{
for
_
,
v
:=
range
slice1
{
if
!
InSliceIface
(
v
,
slice2
)
{
if
InSliceIface
(
v
,
slice2
)
{
diffslice
=
append
(
diffslice
,
v
)
diffslice
=
append
(
diffslice
,
v
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment