lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity
2,064 Commits 3 Branches 32 Tags 9.4 MiB
Commit Graph

2064 Commits

Author SHA1 Message Date
astaxie 5336e83469 Merge pull request #1506 from fuxiaohei/develop 
clean code in docs.go, error.go, filter.go and hooks.go
 2015-12-23 12:12:08 +08:00
Yandong Yao da39082d4f Retrieve session identifier from cookie and query parameters 2015-12-22 10:30:44 +08:00
fud cd514803a4 simplify filter.go hooks.go 2015-12-22 10:02:59 +08:00
fud 2ddda59605 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-12-22 09:57:47 +08:00
astaxie 25337aec27 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-12-21 22:54:22 +08:00
astaxie 351dfac653 context.Response should implement Hijack/Flush/CloseNotify 2015-12-21 22:51:18 +08:00
astaxie 9105fee453 Merge pull request #1503 from fuxiaohei/develop 
simplfy config.go and controller.go
 2015-12-21 19:49:22 +08:00
fud bbd42ce152 simplify docs.go and error.go, use http.StatusText instead of string codes 2015-12-21 17:16:58 +08:00
fud 92711e80a3 refactor controller.go 2015-12-21 16:23:31 +08:00
fud c43e3d6684 fix type mismatch error 2015-12-21 16:05:26 +08:00
fud f6c508f138 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-12-21 15:49:23 +08:00
astaxie 130ce7eb1f Merge pull request #1501 from nkbai/develop 
cors test benchmark doesn't use b.N
 2015-12-19 13:45:04 +08:00
nkbai 083c155079 cors test benchmark doesn't use b.N 2015-12-19 10:29:12 +08:00
astaxie a71c4283e8 Merge pull request #1498 from JessonChan/develop 
compress level test fixed
 2015-12-18 10:18:42 +08:00
JessonChan 80ac8aa40e compress level test fixed 2015-12-18 09:28:40 +08:00
astaxie 5e249772d5 reduce loop 2015-12-18 00:14:28 +08:00
astaxie a4f674e7f4 Merge pull request #1483 from nkbai/develop 
为orm接口添加注释
 2015-12-17 22:23:32 +08:00
astaxie ae52d4aa18 improve the splitPath 2015-12-17 21:31:44 +08:00
fuxiaohei f9138c5a99 simplify config.go 2015-12-17 20:05:00 +08:00
astaxie e5096be32b Merge pull request #1490 from pjoe/orm_pk_rel_many 
Fix joins for reverse(many) with custom pk
 2015-12-17 14:56:06 +08:00
astaxie 9b87f528ec Merge pull request #1494 from astaxie/revert-1489-develop 
Revert "go test fixed"
 2015-12-17 14:45:17 +08:00
astaxie c3d1e4d088 Revert "go test fixed" 2015-12-17 14:45:10 +08:00
astaxie 77113e843c Merge pull request #1489 from JessonChan/develop 
go test fixed
 2015-12-17 14:44:29 +08:00
astaxie 46aa340b1d Merge pull request #1478 from fuxiaohei/develop 
clean compliated codes, refactor if sections in app.go
 2015-12-17 14:44:14 +08:00
JessonChan 8771634fe4 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2015-12-17 09:25:15 +08:00
astaxie 2aa50c240f Merge pull request #1486 from KilledKenny/oomDos 
Added MaxMemory limit to CopyBody() Supersedes #1484
 2015-12-16 23:44:42 +08:00
astaxie dbc4ac6945 reduce the slicegrow 2015-12-16 23:43:32 +08:00
astaxie 29752e2575 refactor router 2015-12-16 23:11:03 +08:00
Simon Rawet 52c4c1fb98 Added MaxMemory limit to CopyBody() 
Beego only uses the MaxMemory flag when using go's built in functions
for parsing forms. However the CopyBody() function have no limit an will
coppy anny amount of data into memory using ioutil.ReedAll() on the
request body whitout anny size validation or limit.

This fix wrapps input.Requst.Body in a LimitedReader using the same
memory limit as ParseFormOrMulitForm()
 2015-12-16 10:37:21 +01:00
Pelle Johnsen 906637ae8b Fix issue with reverse(many) for models with custom pk 
- Also add test covering the issue
 2015-12-15 17:39:08 +01:00
nkbai 3daaaeb32b add commit for orm/types.go 2015-12-15 19:48:28 +08:00
JessonChan ccc008c257 compress fixed 2015-12-15 14:29:07 +08:00
JessonChan fd9a6ff7bb Merge remote-tracking branch 'remotes/upstream/develop' into develop 2015-12-15 14:27:43 +08:00
JessonChan e63d24637d go test fixed 2015-12-15 14:08:58 +08:00
astaxie 7dcbcf0748 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-12-15 14:05:58 +08:00
astaxie 1576add9a2 Merge pull request #1488 from astaxie/revert-1487-develop 
Revert "compress method fixed"
 2015-12-15 14:05:43 +08:00
astaxie 58aa0545b6 Revert "compress method fixed" 2015-12-15 14:05:33 +08:00
astaxie 10cbe7a867 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2015-12-15 13:18:09 +08:00
astaxie d6f23afdbb Merge pull request #1487 from JessonChan/develop 
compress method fixed
 2015-12-15 11:49:19 +08:00
JessonChan 499e2b59e4 compress method fixed 
in http,the deflate is zlib compress method accoding to the sec
http://tools.ietf.org/html/rfc2616#section-3.5
The "zlib" format defined in RFC 1950 [31] in combination with
        the "deflate" compression mechanism described in RFC 1951 [29].
 2015-12-15 11:34:26 +08:00
nkbai d99c62df1f Merge remote-tracking branch 'upstream/develop' into develop 2015-12-14 15:09:06 +08:00
nkbai b079456fcf add comments for orm/types.go 2015-12-14 15:04:17 +08:00
fuxiaohei a06022f75c clean compliated codes, refactor if sections in app.go 2015-12-12 14:10:02 +08:00
astaxie 2b651fbae2 reuse map in tree.Match 2015-12-11 13:51:01 +08:00
astaxie 80bc372f17 pool.Put 2015-12-11 00:20:17 +08:00
astaxie f70f338025 use sync.Pool to reuse Context 2015-12-10 21:59:54 +08:00
astaxie f2edfbe7ae make the other three beauty 2015-12-10 00:12:52 +08:00
astaxie 4f829af7aa gofmt the config default 2015-12-10 00:11:24 +08:00
astaxie 9f2a2507fd fmt it and remove the init var 2015-12-09 23:47:44 +08:00
astaxie be60f47488 Merge pull request #1455 from nkbai/develop 
windows下静态文件映射找不到问题以及 grace init延后
 2015-12-09 23:44:45 +08:00