mark_story
839ef73d43
Merge branch '2.6' into 2.7
2014-12-17 21:46:54 -05:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
mark_story
1c913d29b6
Merge branch '2.6' into 2.7
2014-11-29 22:00:24 -05:00
mark_story
543f05e3d0
Merge branch 'master' into 2.6
2014-11-29 22:00:00 -05:00
Florian Krämer
e7f554cba7
Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo.
2014-11-29 03:04:07 +01:00
Florian Krämer
43f7fcc735
Adding a few more ways to detect HTTP headers, extensions and the accept header.
2014-11-27 01:00:44 +01:00
Tsuyoshi Sadakata
1f4402cd4c
check ob_get_level() before ob_flush()
2014-11-26 17:25:10 +09:00
mark_story
1e6d22b8cb
Make the version option function as intended.
...
The version option is documented but does not work. While this 'breaks'
behavior, it also fixes what I think is a more important issue.
Refs #5234
2014-11-24 22:38:00 -05:00
Florian Krämer
4ff07b745a
Adding a test for the new json and xml detectors that were added to the CakeRequest class.
2014-11-22 17:30:53 +01:00
Florian Krämer
83eb8ce7de
Changes to Cake/Network/CakeRequest.php as discussed on Github for the detector code changes. Fixed the description of a few doc blocks, removed the use of getallheaders(), removed the failsafe (based on extension) for the xml and json detectors.
2014-11-22 12:55:22 +01:00
Florian Krämer
17e5d41e55
Restructuring the CakeRequest::is() code and related code a little.
2014-11-21 18:49:36 +01:00
Florian Krämer
3f5f8cbc15
phpcs fixes in Cake/Network/CakeRequest.php
2014-11-20 22:16:36 +01:00
Florian Krämer
728764c543
Adding a test for the refactored CakeRequest code.
2014-11-20 21:14:17 +01:00
Florian Krämer
88bfa70cad
Refactoring the detector code for CakeRequest::is() and adding default detectors for JSON and XML.
2014-11-20 21:14:07 +01:00
Mark Story
5dab175aa9
Merge pull request #5196 from cakephp/issue-5140
...
Gracefully handle invalid chunks in HttpSocket
2014-11-18 21:58:41 -05:00
ndm2
bae556e73f
Prevent zero only lines from being emptied
2014-11-18 17:26:31 +01:00
mark_story
8cbf975943
Gracefully handle invalid chunks in HttpSocket
...
When invalid chunks are detected we should assume the server is
incorrect and handle the remaining content as a single large chunk.
Refs #5140
2014-11-17 22:23:46 -05:00
mark_story
3095187952
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-11-10 19:38:31 -05:00
ndm2
f0b6657113
Make unsetting the email pattern work as expected.
...
When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
2014-11-09 16:33:57 +01:00
mark_story
0e4fb9d648
Merge branch 'master' into 2.6
2014-11-07 15:13:46 -05:00
mark_story
6aaac6b7e2
Fix HttpSocket mishandling encoded URIs
...
The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1
we'll continue to replace `%2F` and no longer decode the entire URI.
Fixes #5076
2014-11-05 22:18:48 -05:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
Marek Władysz
090e85a5a4
Make CakeResponse::file() accept ranges even when download option is false.
2014-10-25 19:49:56 +02:00
mark_story
af43bc1706
Merge branch 'master' into 2.6
2014-09-25 22:39:51 -04:00
euromark
af7916b1a7
Fix bug in CakeEmail::reset()
2014-09-24 14:02:18 +02:00
mark_story
cf45d3fab8
Merge branch 'master' into 2.6
2014-09-22 20:46:28 -04:00
euromark
4d1a65ede2
Add intl email test.
2014-09-16 10:14:00 +02:00
mark_story
734bb9223b
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
Marc Würth
67ba9cb406
Update all @deprecated annotations
...
to adhere to the @deprecated <version> <description> format, where version and description are mandatory.
2014-09-02 17:03:22 +02:00
mark_story
7c316bbc56
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/basics.php
2014-08-30 21:28:11 -04:00
mark_story
cd7438d33d
Fix 0 index not being properly parsed for files.
2014-08-23 13:05:16 +02:00
Jeremy Harris
8f420d74fa
HttpSocket: not overwriting auth header if it is set in request configuration
2014-08-21 11:24:10 -05:00
mark_story
cb45821c43
Fix reversed arguments in error message.
2014-08-08 23:29:29 -04:00
mark_story
9c3089796f
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Model/Model.php
2014-08-08 23:28:06 -04:00
Mathew Foscarini
4957418a4b
Added missing return statement.
...
PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.
2014-08-05 08:39:19 -04:00
ADmad
713f430fc4
Merge branch 'master' into 2.6
2014-08-03 01:05:36 +05:30
Anthony GRASSIOT
aa42b80a4d
a
/ an
typo fixes fot API
2014-07-30 22:11:03 +02:00
mark_story
0b85c35635
Fix up code formatting and structure for #3998
...
* Fix the various PHPCS errors.
* Make the logic less complex.
2014-07-28 21:47:35 -04:00
Xinquan Zhu
e08b8148a5
throw CakeException instead, putting throws tag in the comment
2014-07-28 21:41:51 -04:00
Xinquan Zhu
809de69dcf
replace whitespaces with TABs and only throw exception when Cake is in Debug mode
2014-07-28 21:41:51 -04:00
Xinquan Zhu
792c251890
throw an Exception when header is already been sent
2014-07-28 21:41:51 -04:00
ADmad
9e21d048ce
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-07-27 12:29:39 +05:30
Mark Story
adf739b893
Merge pull request #4011 from ndm2/stmp-auth-reponse-evaluation-fix
...
Make SMTP auth reply code checks work properly.
2014-07-24 08:42:22 -04:00
Rachman Chavik
aad89444d1
Fix: Blackholed request when POSTing to a URL with space
...
Eg:
Actual Posted URL:
/admin/settings/settings/prefix/Access%20Control
$_GET value:
/admin/settings/settings/prefix/Access_Control
Since $unsetUrl differs, the $_GET value will get copied in to
CakeRequest::$query, causing CakeRequest::here() to return:
/admin/settings/settings/prefix/Access%20Control?%2Fadmin%2Fsettings%2Fsettings%2Fprefix%2FAccess_Control=
This confuses SecurityComponent in the following line:
f23d811ff5/lib/Cake/Controller/Component/SecurityComponent.php (L514)
2014-07-24 16:25:03 +07:00
mark_story
0d14bf7cc8
Update doc blocks.
...
There were a few trailing comments in #3706 that have now been
addressed.
2014-07-20 22:00:07 -04:00
Mark Story
7ef7ce2dbb
Merge pull request #3706 from MelvinRoss/httpsocketheader
...
Add support for specifying protocol in Cakesocket/HttpSocket. Add HEAD function to HttpSocket
2014-07-20 21:58:37 -04:00
mark_story
0dfce1abf3
Add .
to the list of allowed characters.
...
This was missed when the email validation rules were relaxed in
dc34d80f6f
.
Fixes #4027
2014-07-19 19:57:33 -04:00
ndm2
bf7d01ac66
Make SMTP auth reply code checks work properly.
2014-07-18 14:53:22 +02:00
Melvin Ross
0eaf650d9f
Test for new HEAD function inside HttpSocket
2014-07-14 14:34:27 -05:00