Mark Scherer
97b6f8674c
Fix CS
2015-09-21 13:45:18 +02:00
ndm2
8fe953548c
Fix path traversal check for Windows based systems
...
On Windows based systems, both, backward as well as forward
slashes are supported as path separators, thus checking for `DS`
only, would allow to slip in `../` fragments.
refs #5905 , cad57dcc28
2015-08-19 16:47:53 +02:00
mark_story
58ea40e32c
Don't stop reading when only a '0' has been read.
...
Make tests simpler by using onConsecutiveCalls() instead of trying to
maintain mock method indexes.
Refs #7121
2015-07-27 22:40:27 -04:00
t.gommers
b16d627b36
Disable SNI in HttpSocket
2015-07-27 13:03:21 +02:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
Chris Kim
94fbc6e5f2
Don't map text/plain to csv. Backport from 3.0. Refs #1696
...
Jquery sets accepts header similar to "text/plain, */*; q=0.01" by
default for xhr requests. Due to this RequestHandler used to set
extension to csv thereby causing View class to look for views under
non-existent csv folders.
2015-07-07 15:19:45 -04:00
mark_story
c47196fe08
Merge branch '2.6' into 2.7
2015-06-07 15:45:26 -04:00
mark_story
6d60e6a4db
Backport 7eec48268ebb6a17656df4a059f9e7b43991472f to 2.x
...
Backport fixes to base path generation that prevent issue when a URL
contains // it can circumvent the base path generation, which results in
unwanted user data in the base/webroot paths. This creates an
opportunity for CSS manipulation in old versions of IE, and newer ones
via iframe inheritance.
2015-06-07 15:45:16 -04:00
mark_story
d7d8b90986
Merge branch '2.6' into 2.7
2015-05-28 19:34:59 -04:00
Igor Padovan da Silva
bf550d13ce
preventing error on trying to delete unexiting buffer
2015-05-26 17:46:08 -04:00
Mark Scherer
309aee9fe5
Backport #6431
2015-04-30 15:18:28 +02:00
mark_story
096a2ebb72
Merge branch '2.6' into 2.7
...
Conflicts:
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
lib/Cake/VERSION.txt
2015-04-20 15:42:54 -04:00
mark_story
f55111bdc1
Allow empty headers to be read.
...
Allow headers with '' and '0' as their values to be read.
Fixes #6299
2015-04-08 16:33:28 -04:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -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
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
0b916cedbb
Merge branch 'master' into 2.7
2015-03-09 21:55:20 -04:00
mark_story
cad57dcc28
Use DS instead of checking both slash styles.
...
Refs #5905
2015-03-09 21:55:07 -04:00
Mark Story
43f16f38f0
Merge pull request #5905 from davidsteinsland/fix_file_response_dots
...
Fix file response dots
2015-03-09 21:54:02 -04:00
mark_story
b80a8947d7
Check line length to account for fence post.
...
When we have exactly 998 bytes CakeEmail should not emit an error.
Refs #5948
2015-02-24 21:52:34 -05:00
ADmad
2a57d9b65f
Avoid reloading config file and recreating config instance.
2015-02-20 08:48:25 +05:30
Jan Dorsman
e3b5306521
Fixing issue #5764
2015-02-19 12:19:27 +05:30
David Steinsland
5fd7396e47
Fixed downloading of files with dots
2015-02-15 19:32:33 +01:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
James Watts
970cb81d03
Typo typo
2015-02-02 02:07:13 +01:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
Richan Fongdasen
fd47d26f6b
Keep the user agent list in alphabetical order
2015-01-21 22:50:46 +07:00
Richan Fongdasen
a7d604bca8
Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706
2015-01-21 13:47:03 +07:00
mark_story
3078a1eb52
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-01-16 22:22:26 -05:00
Mark Scherer
2b1e487530
Correct CakeSocket docblocks.
2015-01-15 23:39:09 +01:00
mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
José Lorenzo Rodríguez
0a4141c78c
Merge pull request #5614 from cakephp/issue-5595
...
Convert header_sent exception into a notice error.
2015-01-09 22:25:09 +01:00
mark_story
18f02bf5b3
Don't emit errors or trigger exceptions when headers have been sent.
...
After discussing it a bit, we've come to consensus that emitting errors
or throwing exceptions are both pretty disruptive and annoying to deal
with. Instead we'll revert to the previous 2.x behavior of doing
nothing.
2015-01-09 15:16:14 -05:00
antograssiot
c2f298a8b7
Replace our custom code fence with markdown standard fence
2015-01-09 13:47:25 +01:00
mark_story
a7aaa93131
Convert header_sent exception into a notice error.
...
Throwing an exception here, causes an infinite loop when handling fatal
errors, as the shutdown function sends headers automatically.
Refs #5595
2015-01-08 21:47:13 -05:00
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
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
