Commit graph

18258 commits

Author SHA1 Message Date
Richard van den Berg
e315fb6688 Fix proxy authentication when SSL is used 2015-12-11 14:44:46 +01:00
Richard van den Berg
4a4728b44d Fix SSL via proxy 2015-12-11 10:28:53 +01:00
Mark S
b76a235175 Remove default overwrites that are useless 2015-12-08 18:21:51 +01:00
Mark Story
1af5d23e87 Merge pull request #7806 from ravage84/patch-1
Include the Code of Conduct in the 2.x branch
2015-12-07 12:58:20 -05:00
Marc Würth
d6da07c7a9 Include the Code of Conduct in the 2.x branch
Even though I don't think we need a CoC at all, if we have one, it should be included in all relevant branches.
2015-12-07 12:54:39 +01:00
Mark Story
5852ecec5a Merge pull request #7766 from wiserfirst/split_protocol_from_host
Fixed issue incorrect SNI validation when host name contains protocol for SmtpTransport.
2015-12-02 13:53:17 -05:00
Qing Wu
48dd778bd0 Fixed issue #7579 on the 2.7 branch 2015-12-02 10:24:16 +11:00
José Lorenzo Rodríguez
caf93bf923 Merge pull request #7752 from ichikaway/2.7-remove-extract
remove extract function in the Validation::comparison
2015-11-30 08:50:04 +01:00
Yasushi Ichikawa
bed76acea1 fixed coding standards error 2015-11-29 23:37:07 +09:00
Yasushi Ichikawa
5b098af240 remove extract function in the Validation::comparison 2015-11-29 22:42:55 +09:00
mark_story
7aa6908800 Update version number to 2.7.7 2015-11-22 21:29:57 -05:00
mark_story
7cc163d9b8 Merge branch 'fix-sni' into 2.7
Refs #7675
2015-11-11 22:53:08 -05:00
mark_story
079d15d54f Handle enhanced config in a more graceful way.
HttpSocket further munges the host into a nested array. This config
value should be preferred over the top level host config.

Refs #7675
2015-11-11 22:51:17 -05:00
Richard van den Berg
f8e7634131 Use hostname of request instead of hostname of proxy for SNI 2015-11-10 10:54:36 +01:00
José Lorenzo Rodríguez
65b84107a1 Merge pull request #7673 from cakephp/issue-7661
In CLI mode default the error handlers to Console flavors.
2015-11-10 09:38:35 +01:00
mark_story
89d5449270 In CLI mode default the error handlers to Console flavors.
In the somewhat rare case where an error or exception occurs during
application bootstrap, we should not emit HTML to the stdout.

Refs #7661
2015-11-09 21:47:16 -05:00
mark_story
df3c786f57 Update version number to 2.7.6 2015-11-05 22:30:43 -05:00
mark_story
1a6f733286 Merge branch '27-pages-fix' into 2.7 2015-11-05 22:30:25 -05:00
Jose Lorenzo Rodriguez
18544c5aaa Fix validation allowing arrays.
Accepting arrays can cause a number of adverse effects. While this may
be a breaking change the alternatives are worse.
2015-11-04 21:35:05 -05:00
Mark Story
e7eeafcddd Merge pull request #7642 from steinkel/issue/missing-flash-bake-and-scaffold
add Flash back to Controller, fix Scaffold to use Flash instead
2015-11-04 21:27:26 -05:00
Jorge González
5845cad93f fix phpcs 2015-11-04 16:37:21 +00:00
Jorge González
cb6a17c34e add Flash back to Controller, fix Scaffold to use Flash instead 2015-11-04 10:41:35 +00:00
mark_story
5e60cc5d18 Fix plugin view names being able to escape the plugin root directory.
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
ADmad
b9dc89acff Update docblock 2015-10-30 09:24:22 +05:30
Mark Story
9c804186af Merge pull request #7614 from ravage84/2.7-timehelper-engine-type-hint
Specify type hint
2015-10-27 20:56:27 -04:00
Mark Scherer
820fc2286f Correct doc block. 2015-10-27 21:17:10 +01:00
Marc Würth
58316b3a58 Specify type hint
Plus fix two typos.
2015-10-27 16:47:48 +01:00
mark_story
d220616b5a Merge branch 'flash-plugin' into 2.7
Fixes the plugin option not working with `__call` on FlashComponent as
documented.

Fixes #7570
2015-10-17 20:59:47 -04:00
mark_story
925647ae2b Simplify code used to generate plugin flash messages. 2015-10-17 20:59:02 -04:00
gmponos
fd50d1976a Flash Component was not handling plugin option 2015-10-17 20:55:52 -04:00
mark_story
dea32345c8 Add failing test for #7570
Documented behavior that exists in 3.x is not working in 2.x
2015-10-17 20:54:40 -04:00
José Lorenzo Rodríguez
d0e7a2fd38 Merge pull request #7552 from cakephp/issue-7546
Fix error when Memcached::getAllKeys() fails.
2015-10-17 15:46:33 +02:00
mark_story
e2a1094e69 Define variables before they are used.
Refs #7563
2015-10-16 23:07:25 -04:00
mark_story
fea6fd7d30 Fix incorrect doc tag. 2015-10-16 22:09:12 -04:00
mark_story
e8a0726737 Fix error when Memcached::getAllKeys() fails.
Refs #7546
2015-10-14 21:56:01 -04:00
mark_story
e0d2c45d9a Fix PHPCS error. 2015-10-12 22:20:15 -04:00
mark_story
94aeee438b Merge branch pull request #7496 into 2.7
Adds ssl_ context options to SmtpTransport via CakeSocket. Both
CakeSocket and SmtpTransport can now use all the SSL context options
with the same syntax as HttpSocket.
2015-10-12 22:07:40 -04:00
mark_story
3a4facbf8d Remove allowSelfSigned() method.
This method is no longer needed as the low level socket understands the
`ssl_*` options now.

Refs #7496
2015-10-12 21:58:55 -04:00
mark_story
cc3531d288 Move SSL context options into CakeSocket.
Having all the options consolidated in one places enables all the SSL
context options to be used in the SmtpTransport instead of just allowing
self_signed as proposed in #7496
2015-10-12 21:56:20 -04:00
mark_story
29490eb84f Add tests for #7516 2015-10-10 22:32:41 -04:00
mark_story
7bf6768066 Merge pull request #7516 into 2.7
PaginatorHelper::meta() skips url parameters (passed and named) which
results in urls not respecting defined routes.  It means
PaginatorHelper::meta() does not generate same urls as
PaginatorHelper::prev() & PaginatorHelper::next().

Refs #7516
2015-10-10 22:31:15 -04:00
Mark Story
69cde3617f Merge pull request #7528 from ravage84/2.7-void-mixed
Do not mix void with other return types
2015-10-10 21:43:30 -04:00
Marc Würth
ed410dd12c Do not mix void with other return types
Inspired by #7527
2015-10-10 15:49:00 +02:00
ADmad
f50efd7595 Merge pull request #7521 from ravage84/2.7-field-return-value
Add false as return value of field()
2015-10-08 20:15:49 +05:30
Marc Würth
de8aed534f Add false as return value of field()
+ improve DocBlocks
2015-10-08 16:31:01 +02:00
Mohsen
f57cdb7568 PaginatorHelper::meta() skips url parameters and disrespects defined routes
PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes.
It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().
2015-10-07 15:07:37 +03:30
Ian den Hartog
5dfb780970 Change names 2015-10-06 10:10:34 +02:00
Mark Story
19ad6dcef2 Merge pull request #7508 from ravage84/2.7-index
Minor improvements to the front controller
2015-10-04 10:15:27 -04:00
Marc Würth
86da57d2be Minor improvements to the front controller 2015-10-04 15:38:48 +02:00
Mark Story
681956408d Merge pull request #7500 from cakephp/issue-7497
Correct input generation for postgres numeric types.
2015-10-02 21:47:12 -04:00