Commit Graph

3639 Commits (c6dd53b5c0eadd513898e0ad4e9cc57a701ec49d)

Author SHA1 Message Date
James Lee 9df192497b make sure we're not turning nil into [nil], since it breaks the arch detection
git-svn-id: file:///home/svn/framework3/trunk@11098 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 17:48:35 +00:00
Joshua Drake 14e147c931 add the rservices mixin
git-svn-id: file:///home/svn/framework3/trunk@11093 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 13:18:02 +00:00
Joshua Drake b495ca8aab add a mixin for pdf gen, see #2841
git-svn-id: file:///home/svn/framework3/trunk@11092 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 12:21:49 +00:00
Matt Weeks 2e72926638 Add audio (microphone) recording support to stdapi.
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-22 00:32:39 +00:00
Joshua Drake 4c93eb974f this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11077 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:36:38 +00:00
Joshua Drake 51fd4fb550 this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11076 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:32:29 +00:00
Joshua Drake b5c5e21b24 this fixes #3602, incompatabilities TBD
git-svn-id: file:///home/svn/framework3/trunk@11075 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 22:28:35 +00:00
Joshua Drake fe9710b836 add a rand: special case for OptAddress options
git-svn-id: file:///home/svn/framework3/trunk@11071 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:31:14 +00:00
James Lee 1c5481dcfb add a method for getting the full uri from an HttpServer to complement get_resource
git-svn-id: file:///home/svn/framework3/trunk@11069 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-19 18:15:20 +00:00
Matt Weeks 9d0cf722fa Spelling!
git-svn-id: file:///home/svn/framework3/trunk@11042 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 20:00:52 +00:00
Joshua Drake 77bc5cf6cd Big VNC update:
* Created Rex::Proto::RFB
 * Updated vnc_none_auth scanner to use Rex::Proto::RFB::Client
 * Added vnc_login (refactored from carstein)
 * Created an initial vnc_passwords.txt file
 * Removed cipher/des.rb - incompatible license
 * Updated getvncpw script to use new Rex::Proto::RFB::Cipher.decrypt




git-svn-id: file:///home/svn/framework3/trunk@11033 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-14 03:37:45 +00:00
HD Moore 4c69fc7b84 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@11028 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:58:24 +00:00
HD Moore 432a2e0ee8 Nuke the old mixin
git-svn-id: file:///home/svn/framework3/trunk@11027 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:53 +00:00
HD Moore dc5116f9df Move the crawler mixin to an auxiliary
git-svn-id: file:///home/svn/framework3/trunk@11026 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:55:19 +00:00
HD Moore f457ccb8f7 Add the crawler mixin and a sample form extractor crawler
git-svn-id: file:///home/svn/framework3/trunk@11025 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:40:56 +00:00
HD Moore bc2d43d86d Raise thread errors instead of eating them
git-svn-id: file:///home/svn/framework3/trunk@11024 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 06:22:40 +00:00
HD Moore 54f3563c7e Store the http request in the http response object when Rex::HTTP::Client.send_recv() is used. Let Anemone store the request as well, passing it into the Page object for further analysis.
git-svn-id: file:///home/svn/framework3/trunk@11023 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:25:39 +00:00
HD Moore 510f61ac37 A working Rex backend for Anemone
git-svn-id: file:///home/svn/framework3/trunk@11022 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 05:20:51 +00:00
HD Moore a0b76b1979 This merges in support for Rex sockets to anemone
git-svn-id: file:///home/svn/framework3/trunk@11016 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-13 03:33:36 +00:00
HD Moore 375a655317 Fix windows platform detection
git-svn-id: file:///home/svn/framework3/trunk@11012 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 19:46:33 +00:00
HD Moore 29073a519a Small tweaks to the thread code, add an update method
git-svn-id: file:///home/svn/framework3/trunk@11011 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 17:28:40 +00:00
James Lee 9df4c2bccf don't fail if we were given a peerhost of 'Remote Pipe'. Fixes #3049, thanks Raphael M for the patch
git-svn-id: file:///home/svn/framework3/trunk@11010 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 16:43:00 +00:00
HD Moore a12d9f8dbf This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads.
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 06:19:49 +00:00
Carlos Perez b171d5192e Changes to handle errors and to output print
git-svn-id: file:///home/svn/framework3/trunk@11001 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-12 01:27:15 +00:00
James Lee 326dc42bca add EncodedPayload#encoded_exe, encoded_jar, and encoded_war. simplifies exploits that need java and native payloads. see #406 and #3009
git-svn-id: file:///home/svn/framework3/trunk@10999 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 23:01:35 +00:00
Joshua Drake 3992eb7ef8 Mass RE-update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10998 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:43:22 +00:00
Matt Weeks 594a46bfc7 Merge webcam extension into stdapi.
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:36:54 +00:00
Joshua Drake 9fc6f2f3a3 Mass update: fix all framework URL references
git-svn-id: file:///home/svn/framework3/trunk@10996 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 22:25:13 +00:00
HD Moore 8afc9ebb41 Revert, this is causing threading issues with Windows.
git-svn-id: file:///home/svn/framework3/trunk@10989 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 19:54:27 +00:00
Carlos Perez 3edccbc118 fix help message
git-svn-id: file:///home/svn/framework3/trunk@10986 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:55:36 +00:00
HD Moore b143c8eac1 Only load priv on win32/win64 sessions
git-svn-id: file:///home/svn/framework3/trunk@10984 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-11 16:15:26 +00:00
James Lee 0b8f0c51bc use a random name for the app if one is not supplied
git-svn-id: file:///home/svn/framework3/trunk@10976 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:35:02 +00:00
James Lee 4aae717312 only need metasploit.dat in WEB-INF/classes/
git-svn-id: file:///home/svn/framework3/trunk@10975 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:22:00 +00:00
James Lee 75cd356803 a less obnoxious .inspect
git-svn-id: file:///home/svn/framework3/trunk@10974 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-10 23:04:01 +00:00
Joshua Drake 73d9135c91 merge patch from Larry Wert, fixes #2510
git-svn-id: file:///home/svn/framework3/trunk@10955 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:31:21 +00:00
Matt Weeks db602dd478 Add functional in-memory webcam support.
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-09 02:24:28 +00:00
HD Moore dc9274229a Reapply Yoann's patch from r7247 to the new tree
git-svn-id: file:///home/svn/framework3/trunk@10953 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 22:51:29 +00:00
HD Moore bed66d4f64 Change the default domain to "." (local host) from WORKGROUP. Suggestion from Rob Fuller (mubix)
git-svn-id: file:///home/svn/framework3/trunk@10952 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 20:07:17 +00:00
Joshua Drake d75e7885d4 remove has_badchars? in favor of Rex::Text.badchar_index
git-svn-id: file:///home/svn/framework3/trunk@10949 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 17:00:07 +00:00
Joshua Drake 2037262950 turn verbosity off by default
git-svn-id: file:///home/svn/framework3/trunk@10948 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 16:59:20 +00:00
James Lee 5c692aa034 genericize the message since we now support LOGIN as well as PLAIN
git-svn-id: file:///home/svn/framework3/trunk@10945 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:03:15 +00:00
James Lee 289c068f2a add support for LOGIN authentication, thanks Ricardo Gandara for the patch. fixes #3072
git-svn-id: file:///home/svn/framework3/trunk@10944 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-08 05:01:18 +00:00
HD Moore 8f4cb4fbf6 Merge Zate Berg's latest patch
git-svn-id: file:///home/svn/framework3/trunk@10938 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-07 01:57:17 +00:00
Matt Weeks bc983ea52c Run meterpreter GUI commands in background to not interfere with active shell or other channel interaction.
Also simplify calling commands in file browser and process viewer.



git-svn-id: file:///home/svn/framework3/trunk@10929 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 16:51:48 +00:00
HD Moore dc43689578 Make a note about the second callback
git-svn-id: file:///home/svn/framework3/trunk@10926 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:48:41 +00:00
HD Moore 1460e7134b Merge in some minor tweaks to Anemone, overhaul to the HTTP class still in the works
git-svn-id: file:///home/svn/framework3/trunk@10925 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:45:27 +00:00
HD Moore b3cc6e19b6 Initial import of an Anemone snapshot
git-svn-id: file:///home/svn/framework3/trunk@10924 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 04:34:43 +00:00
Tod Beardsley f6415186a8 Adds the imported_creds table.
git-svn-id: file:///home/svn/framework3/trunk@10923 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-06 01:01:20 +00:00
HD Moore cf70f322d0 This minor syntax change allows rubinius to at least start the console
git-svn-id: file:///home/svn/framework3/trunk@10921 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 21:16:33 +00:00
Joshua Drake 8353bf7bf3 move 100-continue processing into Rex, fixes #3109
git-svn-id: file:///home/svn/framework3/trunk@10919 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-05 16:20:13 +00:00
Matt Weeks 66fd9f71b7 Typo.
git-svn-id: file:///home/svn/framework3/trunk@10906 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:05:01 +00:00
Matt Weeks fe03497d57 Make tab completion work for meterpreter sessions over rpc.
git-svn-id: file:///home/svn/framework3/trunk@10905 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 23:01:03 +00:00
HD Moore bbfcaefffb Fix the double-up data directory
git-svn-id: file:///home/svn/framework3/trunk@10903 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 22:12:50 +00:00
HD Moore 652764ebd3 Merge in nCircle support from Dave Lassalle, handle file reads more consistently
git-svn-id: file:///home/svn/framework3/trunk@10902 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-04 21:44:16 +00:00
HD Moore e6da9729c0 Handle invalid dates
git-svn-id: file:///home/svn/framework3/trunk@10888 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 15:31:28 +00:00
HD Moore 97d7290440 Fix an inadvertant change to close_key()
git-svn-id: file:///home/svn/framework3/trunk@10878 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 04:20:42 +00:00
HD Moore 1e4eed0559 Let recursive downloads skip over locked files
git-svn-id: file:///home/svn/framework3/trunk@10877 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:16:23 +00:00
HD Moore fba2cb6d2d Remove the response wait for close calls triggered by the finalizer, should help in a few corner cases that currently result in a timeout or hang.
git-svn-id: file:///home/svn/framework3/trunk@10876 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-03 03:03:29 +00:00
Matt Weeks b15ba92567 Add rank; fix issue with searching.
git-svn-id: file:///home/svn/framework3/trunk@10873 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:35:12 +00:00
Matt Weeks 90500eebd1 Enable running scripts independent of console state. Fixes issue with running scripts from GUI while shell/channel is active.
git-svn-id: file:///home/svn/framework3/trunk@10872 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:33:22 +00:00
James Lee 8e44f66d31 add a simple method for adding multiple files to a Jar from the file system. may eventually bubble this up to Rex::Zip::Archive
git-svn-id: file:///home/svn/framework3/trunk@10871 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 23:10:35 +00:00
Matt Weeks db4c6ae246 Properly show compatible payloads. Important for cross-platform exploits.
git-svn-id: file:///home/svn/framework3/trunk@10870 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:41:49 +00:00
James Lee 33e11421b4 fix sytax error bugs in dhcp server
git-svn-id: file:///home/svn/framework3/trunk@10868 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:37:11 +00:00
Tod Beardsley 492268b066 See #3104. Make exporting/importing funny characters more convenient. Export inactive credentials by default.
git-svn-id: file:///home/svn/framework3/trunk@10867 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 22:11:45 +00:00
Tod Beardsley 6048580919 See #3104. This adds a parser for the file format created in r10862, so that these exported credentials can be read back in to Metasploit.
git-svn-id: file:///home/svn/framework3/trunk@10866 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 21:27:26 +00:00
Tod Beardsley 313317224f fix keys, not hashes, in db_export
git-svn-id: file:///home/svn/framework3/trunk@10863 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:18:37 +00:00
Tod Beardsley 754d1a3b90 Fixes #3104. Adds the "pwdump" format to db_export.
git-svn-id: file:///home/svn/framework3/trunk@10862 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-02 19:13:15 +00:00
Tod Beardsley 761acdc419 Fixes the db_export command to deal with nil values as self-closed tags (rather than NULL) and to correctly handle some binary values.
git-svn-id: file:///home/svn/framework3/trunk@10854 4d416f70-5f16-0410-b530-b9f4589650da
2010-11-01 16:11:37 +00:00
Carlos Perez 245cfd3b61 Fixed problem when running cmd_exec in PHP Meterpreter on Linux
git-svn-id: file:///home/svn/framework3/trunk@10850 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-31 00:32:03 +00:00
HD Moore 9432991951 Rescue if priv is not available
git-svn-id: file:///home/svn/framework3/trunk@10848 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-30 19:37:01 +00:00
HD Moore 0f8a6b138b Remove the IsAdmin check for now, always load priv instead. This works around a performance issue with railgun demand loading, once thats fixed we can re-enable
git-svn-id: file:///home/svn/framework3/trunk@10844 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-29 04:14:22 +00:00
Tod Beardsley dc4b7b6641 Fixes #3067. Raise DBImportErrors when the contents of a zip archive isn't a Metasploit ZIP report.
git-svn-id: file:///home/svn/framework3/trunk@10842 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-28 15:59:40 +00:00
HD Moore 5fc69f1597 Fix charset handling, fixes #3053, thanks Rami
git-svn-id: file:///home/svn/framework3/trunk@10818 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-25 14:57:30 +00:00
HD Moore 2021b1628e Nod to http://videos.revision3.com/revision3/web/hak5/0810/hak5--0810--ipv6-mubix-metasploit--hd720p30.h264.mp4 @ 20:00
git-svn-id: file:///home/svn/framework3/trunk@10809 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-24 18:26:02 +00:00
James Lee c03da4fedf add -y to db_connect, fixes #3046
git-svn-id: file:///home/svn/framework3/trunk@10802 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 23:20:43 +00:00
James Lee ed52da9ee9 automatically load ~/.msf3/database.yml if it exists, see #3046
git-svn-id: file:///home/svn/framework3/trunk@10800 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 22:51:28 +00:00
Matt Weeks a2801e5dc1 Add detach/kill support to interacting meterpreter channels over RPC. Also clean some duplicated code in session interaction.
git-svn-id: file:///home/svn/framework3/trunk@10794 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 17:05:48 +00:00
James Lee 745f31b20f make the sessions command a little more useful, see #2097
git-svn-id: file:///home/svn/framework3/trunk@10791 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 00:02:09 +00:00
Matt Weeks e3dac1d148 Add search option to find modules with specific options, or specific default values.
git-svn-id: file:///home/svn/framework3/trunk@10790 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 22:59:31 +00:00
James Lee 27cc50f29a missed this in the java payload updates, r10781
git-svn-id: file:///home/svn/framework3/trunk@10786 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 20:40:25 +00:00
James Lee 56839ccf36 stupid debug prints
git-svn-id: file:///home/svn/framework3/trunk@10782 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:24:28 +00:00
James Lee f33d7cc670 revamp java payloads and make shells work with tomcat_mgr_deploy. tested java_trusted_chain and java_tester to verify that this doesn't break other java payload usage. see #3009 and #2973, meterpreter doesn't work yet, so not marking resolved.
git-svn-id: file:///home/svn/framework3/trunk@10781 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-22 10:19:51 +00:00
James Lee 2dbf731946 fix ArgumentError in everything that closes a process handle
git-svn-id: file:///home/svn/framework3/trunk@10776 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 17:10:46 +00:00
HD Moore 0e04505232 Fixes #3027, a set of bugs introduced during the meterpreter posix work.
git-svn-id: file:///home/svn/framework3/trunk@10773 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 04:43:54 +00:00
HD Moore 3ece16e0d9 3.5.0 is out! back to work :)
git-svn-id: file:///home/svn/framework3/trunk@10771 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-21 00:48:17 +00:00
Matt Weeks 869d930588 Bugfix for db_events. Fixes #2982.
git-svn-id: file:///home/svn/framework3/trunk@10770 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 23:32:42 +00:00
James Lee fe410df0fd mark this rev as release. Releasesvn diff lib/msf/core/framework.rb
git-svn-id: file:///home/svn/framework3/trunk@10765 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 12:05:10 +00:00
James Lee 44fa5c67a6 fix a latent issue with windows paths surrounded by quotes
git-svn-id: file:///home/svn/framework3/trunk@10763 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 09:50:12 +00:00
HD Moore 182943fe6c This change allows IPv6 addresses to be ignored by passing false as a second parameter to getaddress()
git-svn-id: file:///home/svn/framework3/trunk@10761 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:27:00 +00:00
HD Moore cafb8d1ac2 Yield back on pages, vulns, forms, and sites
git-svn-id: file:///home/svn/framework3/trunk@10760 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:13:26 +00:00
HD Moore 9d99bf1039 Store the original error code in the RequestError object as well, use this code to determine whether to raise a connect error or not
git-svn-id: file:///home/svn/framework3/trunk@10759 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-20 01:05:50 +00:00
Joshua Drake c27749db8e add default lookup_error function, fixes #2993
git-svn-id: file:///home/svn/framework3/trunk@10757 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:53:15 +00:00
Tod Beardsley bf28203159 Try to recover from binary in the XML import, report in the dlog if you run into trouble.
git-svn-id: file:///home/svn/framework3/trunk@10756 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 22:51:37 +00:00
Joshua Drake 432f235cfd dont use the module table anymore
git-svn-id: file:///home/svn/framework3/trunk@10749 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 15:03:30 +00:00
HD Moore f5f7f555b0 Allow a database config file to be specified
git-svn-id: file:///home/svn/framework3/trunk@10743 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 07:51:58 +00:00
Matt Weeks 1a03e528fa Fix for properly backgrounding shell sessions over RPC.
git-svn-id: file:///home/svn/framework3/trunk@10740 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-19 00:15:37 +00:00
Tod Beardsley a7a769c443 Fixes #2984 by taking a 1/8th of a second nap.
git-svn-id: file:///home/svn/framework3/trunk@10733 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 21:08:48 +00:00
Tod Beardsley 10a36d9398 Fixes #2979. The bug is triggered when the en locale is used in activerecord -- this fix appears to have no ill effects when both the /vendor version or a local (current) version of i18n is installed, since the percent notation appears to be okay for both versions. In any event, db_nmap 127.0.0.1 fails correctly for both.
git-svn-id: file:///home/svn/framework3/trunk@10731 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 19:58:56 +00:00
Joshua Drake 2d6b995623 rename/clarify PrintfUtil encoder, fixes #2308
git-svn-id: file:///home/svn/framework3/trunk@10729 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 15:41:13 +00:00
Joshua Drake e114f373b0 move content-disposition header before content-type, per rfc1867 examples
git-svn-id: file:///home/svn/framework3/trunk@10724 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-18 07:01:54 +00:00