mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
José Lorenzo Rodríguez
42bb766d92
Merge pull request #1503 from tigrang/cake-response-multi-header
...
Cake response multi header. Fixes #3960
2013-08-11 12:19:26 -07:00
James Watts
f76046625b
Updated doc block comment
2013-08-10 14:45:00 +02:00
James Watts
2ce2a2aaa9
Updated the handling of response status codes
...
Improved API integrity by blocking the ability to set invalid status codes according to the HTTP spec. This includes any non-numeric codes, or any code that is greater or less than 3 digits in length (100-999 being the accepted range).
2013-08-10 13:30:02 +02:00
Tigran Gabrielyan
f6e1c7ca3d
Improve code readability
2013-08-09 20:26:17 -07:00
Tigran Gabrielyan
777a46ff6d
Fix CS issue
2013-08-09 20:00:33 -07:00
Tigran Gabrielyan
a6e3bb37a6
Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself
...
Added ability to send multiple values with the same type of header in CakeResponse
2013-08-06 01:35:45 -07:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
mark_story
f725779a17
Better support various ranges as described in RFC2616
...
Refs #3914
2013-07-18 11:26:55 -04:00
mark_story
e03d3df0fe
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/HelperTest.php
lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
mark_story
2df873412c
Add CakeResponse::location()
...
This method provides an easy to use interface to get/set the location
header in a response object. This is primarily to facilitate future
development in 3.x
2013-07-16 23:38:57 -04:00
mark_story
4d6258adeb
Correct off by one error.
...
Refs #3914
2013-07-15 21:48:03 -04:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
mark_story
494fd05de6
Fix downloading Ranges in files.
...
Correctly handle ranges that don't terminate at the end of the file.
Also reject invalid ranges as described in RFC-2616.
Thanks to Kim Biesbjerg for the initial patch.
Fixes #3914
2013-07-11 23:20:12 -04:00
mark_story
b3273e9cc2
Correct documentation.
...
Options are traditionally above the @param block as it results in easier
to read API docs.
2013-07-11 21:00:11 -04:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Diego Massanti
255fe004eb
Patched CakeResponse's MapType() to increase performance by reducing hundreds of is_array() and is_string() system calls
2013-05-01 09:50:29 -03:00
Mark Story
509b2b1e44
Merge pull request #1247 from DiegoMax/master
...
Added missing HTTP Status 505 to CakeResponse
2013-04-25 14:58:39 -07:00
Diego Massanti
a3d405524e
Added HTTP Status 505 (Unsupported Version) to CakeResponse
2013-04-25 17:59:28 -03:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
euromark
910e21e65e
a few more application contents should send the charset
...
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
Ceeram
74836a1c30
ignore last few silencers for code sniffer
2012-12-10 17:57:22 +01:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
frederikweber
374dd55270
Changed else if to elseif.
2012-11-18 14:06:46 +01:00
frederikweber
9b479958f6
Send charset=UTF-8 if Content-Type is JSON.
2012-11-18 12:25:45 +01:00
frederikweber
ac0b9b285d
Send charset in Content-Type when Content is JSON.
2012-11-18 11:39:17 +01:00
euromark
b7e75a6399
more whitespace coding standards
2012-11-14 12:36:55 +01:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
euromark
b47e3a7d92
move charset/App.encoding into CakeResponse
2012-09-27 20:28:19 +02:00
euromark
213d4caa85
coding standards
2012-09-20 01:50:15 +02:00
dogmatic69
aa87791432
replacing is_integer() with is_int()
2012-09-15 11:15:01 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
028795eb2e
Clarify docs.
2012-08-26 22:17:02 -04:00
James Hall
7484007fa7
Fix #3148 MediaView does not support Microsoft Office default formats
2012-08-25 17:51:48 -04:00
mark_story
d5333a2ff1
Merge branch 'master' into 2.3
2012-08-20 16:20:27 -04:00
mark_story
8146cc4db4
Update mime types of various powerpoint extensions.
...
Fixes #3121
2012-08-15 23:14:57 -04:00
ADmad
c5d1260421
Added CakeResponse::file() for serving files as response
2012-07-11 01:24:00 +05:30
AD7six
790a53d794
Revert "sort the mimeTypes map alphabetically"
...
This reverts commit 90ae2df38e
.
The mime type is used by CakeResponse::mapType to determine which mime
type maps to which alias. As this is done in the order of the mimetype
map the mimetype map is order sensitive.
2012-07-06 12:23:20 +02:00
AD7six
90ae2df38e
sort the mimeTypes map alphabetically
...
except for html which is at the top. Easier maintainance
2012-07-03 16:12:48 +02:00
AD7six
8a09b3d454
update mimetype map
...
References:
http://www.iana.org/assignments/media-types/application/index.html
http://www.iana.org/assignments/media-types/audio/index.html
https://github.com/h5bp/html5-boilerplate/blob/master/.htaccess#L86
2012-07-03 16:07:57 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
mark_story
2c1b5d978d
Optimize the content type search.
...
Move most commonly used types to the top
of the list. This reduces the time spent
iterating content types.
2012-05-09 22:53:54 -04:00
ADmad
49f8e73ab3
Allow bulk storing/updating of mime types. Closes #2844
2012-05-03 01:39:12 +05:30
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
a6da736149
Fix coding standards errors in Network/
2012-03-04 11:18:20 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Thomas Ploch
1a07f55d43
Renamed parameter to CakeResponse::cookie() to match cakephp standard naming.
2012-02-13 09:59:45 +01:00
Thomas Ploch
574b5dcd41
Merge branch '2.1' of https://github.com/cakephp/cakephp into 2.1-cookie-response
2012-02-13 09:56:39 +01:00
mark_story
2afb05b590
Merge branch '2.0' into 2.1
...
Conflicts:
app/View/Pages/home.ctp
lib/Cake/Config/config.php
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
mark_story
4c01ba7224
Add ics mime type.
...
Fixes #2565
2012-02-11 11:39:24 -05:00
Thomas Ploch
059a5f21ed
Fixed TODO: Refactored setting of Cookies into CakeResponse.
2012-02-09 14:24:10 +01:00
ADmad
12bf1348f5
Merge branch '2.0' into 2.1
2012-02-05 17:55:46 +05:30
ADmad
6f09f5dfc8
Added missing file extension to mime type mapping for files used with html5 audio/video tags
2012-02-05 05:41:02 +05:30
Jose Lorenzo Rodriguez
00a5510b1d
Readability changes
2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
979f7a28b5
Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
...
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3
Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive
2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450
Fixing typo in docblock
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e
Implementing CakeResponse::notModified()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb
Implementing the CakeResponse::etag()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6
Adding CakeResponse::vary()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e
Implementing mustRevaidate()
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571
Removing Pragma headers, implementing sharedMaxAge in CakeResponse
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db
Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f
Implementing the modified() method in CakeResponse to have an easier way of setting the modification time
2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2
Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e
Not appending the charset information for content types that are not text/* in CakeResponse
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6
Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130
Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false)
2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e
Adding protocol() method to CakeResponse to be able to change it on the fly
2012-01-19 01:08:43 -04:30
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
ADmad
01aa91b3cf
Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225
2011-11-07 02:04:57 +05:30
Jose Lorenzo Rodriguez
2711178b4b
Fixing Content-Length calculation when there is buffered output that will be sent before the response body. fixes #2208
2011-11-03 21:09:30 -04:30
Lubos Remplik
985dcad802
MimeType audio/ogg added
2011-11-01 08:17:36 -07:00
Yasushi Ichikawa
4aeb5b461d
delete App::uses Multibyte class. It is no longer needed.
2011-10-31 23:47:36 +09:00
Yasushi Ichikawa
f39c683130
check mbstring.func_overload before using strlen()
2011-10-31 23:29:59 +09:00
Yasushi Ichikawa
e53287583e
return byte length instead of number of characters in Content-Length
2011-10-31 18:31:08 +09:00
Jose Lorenzo Rodriguez
9866882506
Not sending a content-length for redirection status codes that are not supposed to have any content
2011-10-27 23:18:49 -04:30
Jose Lorenzo Rodriguez
4a453cc384
Fixes #2175
...
Adding automatic Content-Length header to hint browser of the end of the response when using persistent connections
2011-10-27 22:15:37 -04:30
Maggion Emmanuel
3dc9fee5c0
Typo
2011-10-25 22:22:10 -04:00
mark_story
8e69df9013
Revert "Fix RedirectRoute by stopping execution."
...
This reverts commit 841e7aa560
.
Having _stop() on CakeResponse seemed like the wrong place to stop
execution. It can make testing with redirects harder.
Instead RedirectRoute should be stopping execution.
2011-10-22 22:44:21 -04:00
Majna
841e7aa560
Fix RedirectRoute by stopping execution.
...
If CakeResponse sends a Location header, it will stop execution.
This fixes issues with where a body would be sent with redirect headers.
Tests updated.
Fixes #2143
2011-10-22 13:22:28 -04:00
Juan Basso
16ef234180
Removing trailing spaces.
2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
e4a7c8f3d7
Cleanup of minor issues found with phpmd.
2011-08-06 21:15:31 -04:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
070980b170
Fixed some API doc in i18n and network.
2011-07-28 23:56:10 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30