1758 Commits

Author SHA1 Message Date
Tim Graham
dd0c3f4ee1 [1.6.x] Fixed #23157 -- Removed O(n) algorithm when uploading duplicate file names.
This is a security fix. Disclosure following shortly.
2014-08-20 11:43:43 -04:00
Florian Apolloner
da051da8df [1.6.x] Prevented reverse() from generating URLs pointing to other hosts.
This is a security fix. Disclosure following shortly.
2014-08-20 11:43:43 -04:00
Claude Paroz
9f9fdc4b0a [1.6.x] Fixed #22996 -- Prevented crash with unencoded query string
Thanks Jorge Carleitao for the report and Aymeric Augustin, Tim Graham
for the reviews.
Backport of fa02120d36 from master.
2014-08-19 22:55:35 +02:00
Claude Paroz
99b5567796 [1.6.x] Fixed #23265 -- Used system-specific encoding in runserver
Thanks SpaceFox for the report.
Backport of 055d95fce066 from master.
2014-08-14 12:11:42 +02:00
Tim Graham
e4b2bea743 [1.6.x] Fixed #19107 -- Restored bug fix for sending unicode email with Python 2.6.5 and below. 2014-07-30 09:29:08 -04:00
Aymeric Augustin
83098dccdf [1.6.x] Fixed #23089 -- Fixed transaction handling in two management commands.
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Also avoided transactional DDL and transactional truncates on databases
that don't support them (refs #22308).

Backport of 753a22a635, 0757e0f30d, and 6877a9d415 from master
2014-07-24 19:27:15 -04:00
Daniel Hahler
b6bfdacdae [1.6.x] Fixed various minor doc typos / references.
Backport of 67f9f385aa from master
2014-07-05 20:27:03 -04:00
Alasdair Nicol
c9a4c1d80b [1.6.X] Added missing commas to list of strings 2014-05-28 09:15:56 +01:00
Erik Romijn
50a289d05f [1.6.x] Fixed #22579 -- Corrected validation for email to reject trailing slash
Backport of 424fe76349a2e34eafef13c2450a7a1f4d3115a6 from master.
2014-05-16 15:40:52 +02:00
Aymeric Augustin
1abcf3a808 [1.6.x] Dropped fix_IE_for_vary/attach.
This is a security fix. Disclosure following shortly.
2014-05-14 10:15:06 +02:00
Tim Graham
274bedb928 Removed bad import in last commit. 2014-04-23 09:14:52 -04:00
Tim Graham
6915220ff9 [1.6.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial.
Regression in 8b93b31487d6d3b0fcbbd0498991ea0db9088054.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
2014-04-23 08:56:13 -04:00
Tim Graham
4352a50871 [1.6.x] Fixed a remote code execution vulnerabilty in URL reversing.
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487d6d3b0fcbbd0498991ea0db9088054 from master
2014-04-21 18:30:27 -04:00
Tim Graham
fa60ac76c0 [1.6.x] Fixed #22454 - Changed compatibility warning hint for test runner.
Backport of 214d1e1b0f from master
2014-04-17 20:47:54 -04:00
Patrick Michaud
73474df954 Fixed #22256 -- Replaced bad fallback for missing PATH
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
2014-04-01 20:45:12 +02:00
Tim Graham
c0a9c2f72a [1.6.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does.
refs #14305.

Thanks Adrian Klaver for the report.

Backport of 9b7ba8af1b4ddb539cd69cbec9645cd873db7624 from master
2014-03-25 14:10:29 -04:00
Baptiste Mispelon
12da6902e9 [1.6.x] Fixed #22107 -- Fixed django.core.files.File object iteration.
Due to a mixup between text and bytes, iteration over
a File instance was broken under Python 3.

Thanks to trac user pdewacht for the report and patch.

Backport of 3841feee86cae65165f120db7a5d80ffc76dd520 from master.
2014-02-20 23:59:51 +01:00
Florian Apolloner
e99eeefe44 [1.6.x] Decode mails using the message encoding.
Backport of bfe9052831c6d7ad7501b71c884525b3b471eebc from master.
2013-12-31 12:10:22 +01:00
Florian Apolloner
d18f99dfc7 [1.6.x] Changed console and filebackend to use msg.as_bytes to output the data as it would get send via smtp.
Backport of c988745cca1225496bfd36910dc3cec5065d8cc4 from master.
2013-12-31 12:09:52 +01:00
Florian Apolloner
7c674dd1f1 [1.6.x] Introduced as_bytes for SafeMIMEText (and other SafeMIME-classes).
This is to provide a consistent interface (namely bytes) for the smtp
backend which after all sends bytes over the wire; encoding with as_string
yields different results since mails as unicode are not really specified.

as_string stays for backwardscompatibilty mostly and some debug outputs.
But keep in mind that the output doesn't match as_bytes!

Backport of 5dfd824d38ec7d1f695494e46d603e89cae68661 from master.
2013-12-31 12:05:59 +01:00
Florian Apolloner
ed167e53a5 [1.6.x] Worked around a bug in python 3.3.3. Refs #21093
Backport of 280c1a65ccacd679bf298bf2b169ff01e7266b8e from master.
2013-12-28 16:01:40 +01:00
Florian Apolloner
35a447a263 [1.6.x] Fixed #21093 -- Ensured that mails are not base64 encoded on python 3.3.3+.
Thanks to Arfrever for the report and Aymeric for the review.

Backport of f28ea0230846c81e9b6725454bb3a10df24678aa from master.
2013-12-28 12:48:54 +01:00
Claude Paroz
45c0d2e1ce [1.6.x] Fixed #21551 -- Reenabled loading fixtures from subdirectory
This was a regression in Django 1.6 that was only partially
restored in 839940f27f.
Thanks Jonas Haag for the report.
Backport of 41ebc4838d from master.
2013-12-07 10:48:34 +01:00
Claude Paroz
c8b4ac814c [1.6.x] Fixed #21358 -- Allowed runserver on non-English locales
Thanks svartalf for the report.
Backport of 2080bce69 from master.
2013-12-02 10:35:27 +01:00
Ramiro Morales
8750296918 [1.6.x] Fixed #21488 -- Multiple locales treatment in i18n commands.
Removed multiple locales separated by commas variation (that wasn't
working as documented) in favor of simply allowing use of the
``--locale``/``-l`` options more than once for ``makemessages`` and
``compilemessages``.

Thanks Romain Beylerian for the report and Claude, Simon for their help.
2013-11-23 11:02:30 -03:00
Claude Paroz
833f7d11e8 [1.6.x] Fixed #21457 -- Allowed fixture file name to contain dots
Thanks Keryn Knight for the report.
Backport of 97ac22ebfc from master.
2013-11-18 20:34:39 +01:00
Ramiro Morales
b987fb188d [1.6.x] Decode from UTF-8 explicitly when reading a text file in makemessages.
This shows itself with Python 3 under Windows where UTF-8 usually isn't
the default file I/O encoding and caused one failure and three errors
in our test suite under that platform setup.

b5f52647fe from master.
2013-10-22 07:38:02 -03:00
Claude Paroz
621fc1f1d7 [1.6.x] Fixed #21284 -- Prevented KeyError swallowing in fetch_command
Thanks wildfire for the report.

Backport of 3514bcb251 from master.
2013-10-18 14:05:26 +02:00
Claude Paroz
ba9cf9596b [1.6.x] Fixed #21269 -- Don't crash when CommandError contains non-ascii
Thanks kontakt@eikefoken.de for the report.

Backport of 42a67ec1cd from master.
2013-10-14 21:28:29 +02:00
Russell Keith-Magee
7f0fdffd07 [1.6.x] Refs #21197 -- Clarified upgrade check message.
Thanks to Carl and Shai for the discussion.

Backport of 8ff4303 from master.
2013-10-08 10:02:08 +08:00
Ramiro Morales
d16753eecd [1.6.x] Fixed #21209 -- .po file path comments on Windows.
Literals from source files with Django template language syntax don't
have a '.py' suffix anymore.

Also, the '.\' prefix is preserved to respect GNU gettext behavior on
that platform.

Refs #16903.

4b715fc05a from master.
2013-10-01 20:42:13 -03:00
Javed Khan
f621aba99b [1.6.x] Fixed an ImportError in django.core.cache.backends.db
It was introduced by a979a2fea5.
2013-09-27 03:21:54 -04:00
Michael Manfre
a979a2fea5 [1.6.x] Fixed #21146 - DatabaseCache converts expires to python value
DatabaseCache uses raw cursors to bypass the ORM. This prevents it from
being used by database backends that require special handling of datetime
values.

There is no easy way to test this, so no tests added.

Backport of d5606b5763 from master
2013-09-26 13:42:32 +03:00
Florian Apolloner
56201fe5a8 [1.6.x] Fixed "Address already in use" from liveserver.
Our WSGIServer rewrapped the socket errors from server_bind into
WSGIServerExceptions, which is used later on to provide nicer
error messages in runserver and used by the liveserver to see if
the port is already in use. But wrapping server_bind isn't enough since
it only binds to the socket, socket.listen (which is called from
server_activate) could also raise "Address already in use".

Instead of overriding server_activate too I chose to just catch socket
errors, which seems to make more sense anyways and should be more robust
against changes in wsgiref.

Backport of 2ca00faa913754cd5860f6e1f23c8da2529c691a from master.
2013-09-22 22:04:50 +02:00
Aymeric Augustin
f9f792eb04 [1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
2013-09-10 21:29:31 +02:00
Aymeric Augustin
7fcd6aa669 [1.6.x] Fixed #20530 -- Properly decoded non-ASCII query strings on Python 3.
Thanks mitsuhiko for the report.

Backport of 65b6eff3 and adaptation of 8aaca65 from master.
2013-09-07 12:06:38 -05:00
Aymeric Augustin
fac5735a3d [1.6.x] Fixed #20557 -- Properly decoded non-ASCII cookies on Python 3.
Thanks mitsuhiko for the report.

Non-ASCII values are supported. Non-ASCII keys still aren't, because the
current parser mangles them. That's another bug.

Simplified backport of 8aaca651 and f5add47 from master.
2013-09-07 10:45:24 -05:00
Russell Keith-Magee
2a2ac5c140 Merge pull request #1566 from adamsc64/ticket_11857
Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.

Backport of 926bc42 from trunk.
2013-09-06 19:44:25 -05:00
Tim Graham
6ba01f64c1 [1.6.x] Fixed Python 3 syntax error introduced in [c72392da]
Backport of 498014ccd5 from master
2013-09-06 20:08:56 -04:00
Russell Keith-Magee
3df9647ad9 [1.6.x] Merge pull request #1582 from rca/12756-missing-yaml-module-serializer-error-message
Fixed #12756: Improved error message when yaml module is missing.

Backport of 4f5faa1916e7c8cb72cc9ebf1a1fd964ba6e707b from master.
2013-09-06 19:01:24 -05:00
Carl Meyer
4420de89b6 [1.6.x] Fixed #21026 -- Corrected help for manage.py test command.
Backport of 8f7f8bf6884ada8622bc3696c7465c904164d314 from master.
2013-09-03 09:51:17 -06:00
Aymeric Augustin
115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
2013-09-03 07:34:45 -05:00
Florian Apolloner
12d364a9b0 [1.6.x] Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
Backport of 6e846f7627ecf0dc15053624a23bfbf47535972d from master.
2013-08-20 21:28:14 +02:00
Alasdair Nicol
919934602f [1.6.x] Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.

Backport of 22c6497f99 from master
2013-08-15 20:33:02 -04:00
MinRK
bf132bcb8d [1.6.x] Added support for IPython.start_ipython in shell
IPython 1.0 introduces an actual stable public API function
for starting a normal (non-embedded) IPython session.

This is an official public API, which is promised to survive implementation changes.
2013-07-30 10:24:16 -07:00
Claude Paroz
48516d3b85 [1.6.x] Fixed an email validation regression
Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad from master.
2013-07-21 21:12:50 +02:00
Tim Graham
7788c71890 [1.6.x] Fixed #20722 -- Fixed MemcachedCache backend get_many on Python 3.
Backport of 3c736207a3 from master
2013-07-09 11:57:44 -04:00
Tomáš Ehrlich
2f9e5483f6 [1.6.x] Fixed #20687 -- Added documentation for django.core.signing API.
Thanks Baptiste Mispelon for the suggestion.

Backport of c5bc98d7e1 from master.
2013-07-03 10:38:53 -04:00
Claude Paroz
a9b5a1e506 [1.6.x] Do not allow FileSystemStorage.delete to receive an empty name
Refs #20660.
Backport of 7fbab3eba from master.
2013-06-29 18:12:23 +02:00
Andrew Godwin
b21e96d00d Merge pull request #1311 from loic/ticket20619_take2
Fixed missing initializations in WSGIRequest. Refs #20619
2013-06-27 07:44:09 -07:00