Files
metasploit-gs/modules/exploits/windows/http
Tod Beardsley 7e539332db Reverting disaster merge to 593363c5f with diff
There was a disaster of a merge at 6f37cf22eb that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

 git checkout -b reset-hard-ohmu
 git reset --hard 593363c5f9
 git checkout upstream-master
 git checkout -b revert-via-diff
 git diff --no-prefix upstream-master..reset-hard-ohmy > patch
 patch -p0 < patch

Since there was one binary change, also did this:

 git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.
2013-07-29 21:47:52 -05:00
..
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-02-19 23:16:46 -06:00
2013-01-04 00:48:10 +01:00
2013-06-25 13:41:22 -05:00
2012-06-28 02:09:12 -05:00
2013-01-04 00:48:10 +01:00
2013-03-25 00:58:47 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-06-21 21:38:40 -05:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-06-25 13:41:22 -05:00
2013-01-04 00:48:10 +01:00
2012-05-25 03:06:28 -05:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2013-01-04 00:48:10 +01:00
2012-08-06 18:59:16 +02:00
2013-06-25 02:06:20 -05:00
2013-06-26 09:44:56 -05:00
2013-01-04 00:48:10 +01:00