mark_story
446dd408bb
Renew the session even the session id is '0'.
...
This fixes AuthComponent not being able to log a user in when they
inadvertently change their session id to 0.
Refs #6053
2015-03-29 21:42:43 -04:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -04:00
mark_story
4c61b579c4
Merge branch 'issue-2057' into 2.6
...
Fix HttpSocket not working for SSL requests over a non-SSL proxy.
Fixes #2057
Closes #6146
2015-03-23 22:47:53 -04:00
mark_story
b80e02c114
Fix coding standards errors.
...
* Line lengths
* Whitespace.
Refs #2057
2015-03-23 22:31:09 -04:00
Richard van den Berg
1d0d20e974
Account for SNI changes in HttpSocketTest
2015-03-23 22:31:08 -04:00
Richard van den Berg
1f7b787236
Use $host parameter
2015-03-23 22:31:08 -04:00
Richard van den Berg
9e6b1b6930
Support for SSL Server Name Indication
2015-03-23 22:31:08 -04:00
Richard van den Berg
23d4d1155a
Do not use full uri in request line for HTTPS requests via proxy
2015-03-23 22:31:08 -04:00
Richard van den Berg
15c80f7c3d
Move proxy code inside if (->connected)
2015-03-23 22:31:05 -04:00
Richard van den Berg
7704efdb28
Use feof() in while loop
2015-03-23 22:31:05 -04:00
Richard van den Berg
3995c70046
Strict === and space
2015-03-23 22:31:04 -04:00
Richard van den Berg
bb8e0ae835
Use enableCrypto()
2015-03-23 22:31:01 -04:00
Richard van den Berg
54a3f8724b
Addapted quick hack from issue #2057 for 2.6.3
2015-03-23 22:31:01 -04:00
mark_story
07de23a692
Fix global plugin path regression added in 2.6.3
...
Merge branch 'davehensley-master' into master which fixes the regression
added in 2.6.3, which was trying to fix paths for composer based
installs.
Fixes #6125
2015-03-20 20:36:06 -04:00
mark_story
5a6a74e2f8
Fix failing tests.
...
The test was taking the wrong index when creating mock path choices.
Refs #6125
2015-03-20 20:35:43 -04:00
Dave Hensley
0003296f42
Add CAKE directory fallthrough for plugins/vendors
...
Fixes issue #6124 .
2015-03-20 17:35:19 -04:00
mark_story
744952e344
Fix FormHelper::create() dropping 0 value parameter.
...
When 0 is the first passed parameter we shouldn't drop it.
Fixes #6107
2015-03-19 21:15:20 -04:00
ceeram
af65067b50
Merge pull request #6105 from dakota/fix-memcache
...
Fix issue with memcache and domains starting with letter "u"
2015-03-19 12:02:45 +01:00
Walther Lalk
359c0ab816
Fix issue with memcache and domains starting with letter "u"
2015-03-19 11:42:14 +02:00
José Lorenzo Rodríguez
277f641108
Merge pull request #6064 from robmcvey/jsonView
...
2.6 jsonView should throw exception if json_encode fails
2015-03-18 10:01:40 +01:00
José Lorenzo Rodríguez
e607548fce
Merge pull request #6093 from cakephp/issue-6090
...
Fix notice errors in pagination link generation.
2015-03-18 09:33:39 +01:00
mark_story
6df7bf9c21
Fix notice errors in pagination link generation.
...
No errors should be emitted when creating links for models that were not
paginated.
Refs #6090
2015-03-17 22:19:17 -04:00
Mark Story
c3e1ba1dc9
Merge pull request #6089 from garas/2.6-i18n-ExtractTask-function-warnings
...
Do not warn about i18n functions definitions on extract task
2015-03-17 10:21:26 -04:00
Edgaras Janušauskas
b444fe7b81
Do not warn about i18n functions definitions on extract task
2015-03-16 23:16:50 +02:00
mark_story
02c40d5ca5
Update version number to 2.6.3
2015-03-15 22:06:30 -04:00
Rob McVey
4741abcd63
Remove whitespace
2015-03-15 11:14:49 +00:00
Rob McVey
d94e05cf76
Assert exception msg contains UTF-8
...
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
2015-03-15 11:01:51 +00:00
Rob McVey
a59a057133
assert correct exception msg thrown
2015-03-15 10:36:06 +00:00
mark_story
827465fa30
Merge branch 'postgres_altercolum_error' into master
...
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
2015-03-14 22:23:43 -04:00
mark_story
c32e5559bb
Add test to ensure column was converted to integer.
...
Refs #5512
2015-03-14 22:23:17 -04:00
mark_story
8cadb553d7
Merge branch 'master' into 2.7
2015-03-14 22:08:53 -04:00
Rob McVey
b3c961bc9e
Tickle Travis
2015-03-14 13:45:50 +00:00
Rob McVey
fe0ddf2171
Assert exception is thrown, reset error handler in tearDown
2015-03-14 13:27:34 +00:00
Rob McVey
56c6f02efc
Remove tabs
2015-03-14 13:16:05 +00:00
Rob McVey
d3c24be84b
add a custom error handler for tests of json_encode
2015-03-14 13:12:09 +00:00
Rob McVey
5002bd4dbe
Use fall back json_last_error_msg
2015-03-14 09:21:15 +00:00
Rob McVey
10cfb878be
fallback implementation of json_last_error_msg
2015-03-14 09:13:31 +00:00
Rob McVey
bcb6549565
add throws tag to function comment
2015-03-14 08:45:18 +00:00
Rob McVey
842cdf58f8
Don't translate errors
2015-03-14 08:34:06 +00:00
Mark Story
f2dd8eaa82
Merge pull request #6067 from ionas/patch-3
...
2.6.2: cake bake / ModelTask should respect decimal
2015-03-13 19:55:20 -04:00
Jonas
5f40161e24
2.6.2: cake bake / ModelTask should respect decimal
...
PR for https://github.com/cakephp/cakephp/issues/6066
2015-03-13 21:35:12 +01:00
Rob McVey
3b01c5f842
suppress warnings so test runner doesn't fart
2015-03-13 16:58:29 +00:00
Rob McVey
b880714231
coding standards elseif
2015-03-13 16:27:24 +00:00
Rob McVey
2ba9f3b8fb
Encoding false is OK - should return string null
2015-03-13 16:21:54 +00:00
Rob McVey
ddfcb06d02
Coding standards
2015-03-13 16:13:29 +00:00
Rob McVey
08620704be
Handle json_encode failure
2015-03-13 16:12:21 +00:00
Rob McVey
05aba7afb6
Assert CakeException throw when json_encode fails
2015-03-13 15:52:22 +00:00
mark_story
8e735c2db0
Fix class name in scaffold error.
...
Fixes #6061
2015-03-12 22:00:03 -04:00
Bryan Crowe
5f90f455fd
Merge pull request #6059 from davidyell/patch-2
...
Update App.php
2015-03-12 11:33:14 -04:00
David Yell
24edae5792
Update App.php
...
Add a missing apostrophe
2015-03-12 15:26:59 +00:00
