diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2013-08-01 11:08:00 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2013-08-01 11:08:00 +1200 |
commit | edb10e33aa84c45410bfbd1088b7714245c9f154 (patch) | |
tree | caf4fcdbdeb5705795112ce774a8920ef94b8486 /libmproxy | |
parent | 439d9a294c7df4d45b133e42edb3521901628daa (diff) | |
download | mitmproxy-edb10e33aa84c45410bfbd1088b7714245c9f154.tar.gz mitmproxy-edb10e33aa84c45410bfbd1088b7714245c9f154.tar.bz2 mitmproxy-edb10e33aa84c45410bfbd1088b7714245c9f154.zip |
Remove GPL notices left in source files after our change to the MIT license.
Thanks to Roy Shamir for reporting this.
Diffstat (limited to 'libmproxy')
-rw-r--r-- | libmproxy/cmdline.py | 15 | ||||
-rw-r--r-- | libmproxy/console/__init__.py | 15 | ||||
-rw-r--r-- | libmproxy/console/common.py | 15 | ||||
-rw-r--r-- | libmproxy/console/flowdetailview.py | 15 | ||||
-rw-r--r-- | libmproxy/console/flowlist.py | 15 | ||||
-rw-r--r-- | libmproxy/console/flowview.py | 15 | ||||
-rw-r--r-- | libmproxy/console/grideditor.py | 15 | ||||
-rw-r--r-- | libmproxy/console/help.py | 15 | ||||
-rw-r--r-- | libmproxy/console/palettes.py | 15 | ||||
-rw-r--r-- | libmproxy/controller.py | 15 | ||||
-rw-r--r-- | libmproxy/dump.py | 17 | ||||
-rw-r--r-- | libmproxy/encoding.py | 15 | ||||
-rw-r--r-- | libmproxy/filt.py | 15 | ||||
-rw-r--r-- | libmproxy/flow.py | 17 | ||||
-rw-r--r-- | libmproxy/proxy.py | 14 | ||||
-rw-r--r-- | libmproxy/script.py | 15 | ||||
-rw-r--r-- | libmproxy/utils.py | 14 |
17 files changed, 2 insertions, 255 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 9ed4ef7b..a394d7f3 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import proxy import re, filt import argparse diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 16c257bb..37f5d646 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -1,18 +1,3 @@ -# Copyright (C) 2010 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex, stat import os.path, sys, weakref import urwid diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 4f3ab090..187a755f 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import urwid import urwid.util from .. import utils, flow diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py index c4090c85..a26e5308 100644 --- a/libmproxy/console/flowdetailview.py +++ b/libmproxy/console/flowdetailview.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import urwid import common diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index 124e252e..6ba97733 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import urwid import common diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 61e8715b..c19ba5e6 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import os, sys import urwid import common, grideditor, contentview diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index 55f3ba0f..4986840d 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import copy, re, os import urwid import common diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index de373083..f8be6605 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import urwid import common from .. import filt, version diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index c4e92d99..650cf261 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - palettes = { # Default palette for dark background diff --git a/libmproxy/controller.py b/libmproxy/controller.py index bb22597d..62d1dbbc 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -1,18 +1,3 @@ -# Copyright (C) 2010 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import Queue, threading should_exit = False diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 5a51919c..7a49cee0 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import sys, os import netlib.utils import flow, filt, utils @@ -24,7 +9,7 @@ class Options(object): attributes = [ "app", "app_domain", - "app_ip", + "app_ip", "anticache", "anticomp", "client_replay", diff --git a/libmproxy/encoding.py b/libmproxy/encoding.py index 4b80d38c..0fd7af52 100644 --- a/libmproxy/encoding.py +++ b/libmproxy/encoding.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - """ Utility functions for decoding response bodies. """ diff --git a/libmproxy/filt.py b/libmproxy/filt.py index a0c61ee9..824429c7 100644 --- a/libmproxy/filt.py +++ b/libmproxy/filt.py @@ -1,18 +1,3 @@ -# Copyright (C) 2010 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - """ The following operators are understood: diff --git a/libmproxy/flow.py b/libmproxy/flow.py index c1d78be3..84836d11 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - """ This module provides more sophisticated flow tracking. These match requests with their responses, and provide filtering and interception facilities. @@ -221,7 +206,7 @@ class HTTPMsg(StateObject): Decodes content based on the current Content-Encoding header, then removes the header. If there is no Content-Encoding header, no action is taken. - + Returns True if decoding succeeded, False otherwise. """ ce = self.headers.get_first("content-encoding") diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index b1a5f084..08d095b0 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -1,17 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. import sys, os, string, socket, time import shutil, tempfile, threading import SocketServer diff --git a/libmproxy/script.py b/libmproxy/script.py index 4ffac71b..95fd5be2 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -1,18 +1,3 @@ -# Copyright (C) 2012 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - import os, traceback class ScriptError(Exception): diff --git a/libmproxy/utils.py b/libmproxy/utils.py index b2258b15..258626db 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -1,17 +1,3 @@ -# Copyright (C) 2010 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. import os, datetime, urlparse, string, urllib, re import time, functools, cgi import json |