summaryrefslogtreecommitdiff
path: root/bin/ssl/SecureXMLRPCServer.py
diff options
context:
space:
mode:
authorP. Christeas <p_christ@hol.gr>2008-11-04 22:12:38 +0200
committerP. Christeas <p_christ@hol.gr>2008-11-04 22:12:38 +0200
commit8220e0ad02c27bbcdae91a0a04aa7e0d1cf72cef (patch)
treead40bb98b0fb987e07a4a48647d60509ad107a6d /bin/ssl/SecureXMLRPCServer.py
parent97e946c466d1dce6cb62c52ac627a2be0721cd63 (diff)
parent1f1556ffba922823a7771ac41c1d7f3fdbaf4a29 (diff)
Merge commit 'origin/master' into mdv-gpl3
Conflicts: bin/tools/convert.py bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6 bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p
Diffstat (limited to 'bin/ssl/SecureXMLRPCServer.py')
-rw-r--r--bin/ssl/SecureXMLRPCServer.py35
1 files changed, 14 insertions, 21 deletions
diff --git a/bin/ssl/SecureXMLRPCServer.py b/bin/ssl/SecureXMLRPCServer.py
index 13f37cd5860..540065b4824 100644
--- a/bin/ssl/SecureXMLRPCServer.py
+++ b/bin/ssl/SecureXMLRPCServer.py
@@ -1,31 +1,24 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# $Id$
#
-# $Id$
+# 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.
#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+# 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.
#
-# 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 2
-# of the License, or (at your option) any later version.
+# 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 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-###############################################################################
+##############################################################################
"""
SecureXMLRPCServer module using pyOpenSSL 0.5
Extremely kludgey code written 0907.2002