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
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
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
astaxie
d1bba02958
refact beego config
2015-12-09 23:35:04 +08:00
nkbai
e8fe859a58
格式调整
2015-12-09 09:03:10 +08:00
nkbai
82e0105d22
Revert "windows下静态文件映射找不到问题,"
...
windows下路径需要filepath.ToSlash
This reverts commit 2c8cb5693e
2015-12-04 23:15:06 +08:00
nkbai
ff0762cc19
Merge remote-tracking branch 'upstream/develop' into develop
2015-12-03 15:50:21 +08:00
astaxie
3d4ad560f8
Merge pull request #1423 from JessonChan/fargo
...
fix the accept encoding
2015-12-02 21:08:34 +08:00
astaxie
36664634f9
Merge pull request #1467 from astaxie/revert-1464-master
...
Revert "Update orm_querym2m.go"
2015-12-02 16:35:44 +08:00
astaxie
ed99c013a6
Revert "Update orm_querym2m.go"
2015-12-02 16:35:36 +08:00
astaxie
a1d5f958c5
Merge pull request #1464 from gobenon/master
...
Update orm_querym2m.go
2015-12-02 16:35:05 +08:00
astaxie
5d902264e5
Merge pull request #1459 from ryanchapman/develop
...
Log config parsing errors
2015-12-02 16:34:35 +08:00
gobenon
50f8f3bd20
Update orm_querym2m.go
2015-11-30 18:23:58 +02:00
nkbai
74ebcd28b2
grace init中的工作可以延后进行
...
实际上如果没有使用graceful启动,这些init的工作完全没用
当然其他模块也应该存在这样的工作,比如session中的sess_utils.go中的init工作
2015-11-30 16:15:35 +08:00
Ryan A. Chapman
7151b96465
Log config parsing errors
...
Beego currently handles the case of "conf/app.conf"
not existing, but all other errors are not logged.
This fixes that.
I ran into an issue where beego was not listening on the
correct port, and it turned out that the conf/app.conf file
had a colon ":" instead of an equal sign "=" (confusion of
INI vs YAML formats). When there was a parsing error, beego
would give up on parsing app.conf and not log anything to the
console.
2015-11-29 15:09:28 -07:00
nkbai
2c8cb5693e
windows下静态文件映射找不到问题,
...
path.Clean和filepath.Clean是有区别的
2015-11-27 12:10:39 +08:00
nkbai
d693ecf046
Revert "这种if型的初始化是有问题的"
...
This reverts commit 50132df809
2015-11-26 20:37:36 +08:00
nkbai
6aaca2eca8
router.go Header 毫无用处
...
context/output.go 简化一下代码,更清晰
2015-11-26 14:56:39 +08:00
nkbai
f0474214fe
GetInt等函数稍微简化一下,这样看上去更合理一些
2015-11-25 23:39:26 +08:00
astaxie
2c94d9eab2
Merge pull request #1451 from gobenon/master
...
fix issue 1438 opened by Ayelet Regev
2015-11-25 09:29:28 +08:00
JessonChan
40700a8532
Merge remote-tracking branch 'remotes/upstream/develop' into fargo
...
# Conflicts:
# memzipfile.go
2015-11-25 09:11:32 +08:00
astaxie
235b58504a
Merge pull request #1449 from nkbai/master
...
controller_test.go 既然叫test，那就按照go的规则进行test吧
2015-11-24 15:54:46 +08:00
nkbai
5e915cb614
controller_test.go 既然叫test，那就按照go的规则进行test吧
2015-11-24 14:55:59 +08:00
JessonChan
9170b91075
go style format (remove the blank after comments)
2015-11-21 08:46:19 +08:00
astaxie
25320bf86a
Merge pull request #1441 from nkbai/master
...
fix #1433
2015-11-20 21:50:55 +08:00
