[packages/libmicrohttpd] - updated to 0.9.24 - updated info patch - added am patch (fixes build with automake 1.13) - added m
qboosh
qboosh at pld-linux.org
Thu Jan 3 20:00:17 CET 2013
commit 458781c71bb1ba23fb92ada1d4bd9af3c15d8c82
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jan 3 19:59:26 2013 +0100
- updated to 0.9.24
- updated info patch
- added am patch (fixes build with automake 1.13)
- added missing patch (missing files from libmicrohttpd svn)
libmicrohttpd-am.patch | 11 +
libmicrohttpd-info.patch | 30 +-
libmicrohttpd-missing.patch | 4903 +++++++++++++++++++++++++++++++++++++++++++
libmicrohttpd.spec | 18 +-
4 files changed, 4941 insertions(+), 21 deletions(-)
---
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 1e0efe5..f5fd152 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -5,23 +5,27 @@
Summary: Embeded HTTP server library
Summary(pl.UTF-8): Biblioteka wbudowanego serwera HTTP
Name: libmicrohttpd
-Version: 0.9.22
+Version: 0.9.24
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-# Source0-md5: a90cb23e3087146fabc49a370c192de2
+# Source0-md5: 2891c82cc85a92e6944cacf9ae413f7c
Patch0: %{name}-info.patch
+Patch1: %{name}-am.patch
+Patch2: %{name}-missing.patch
URL: http://www.gnu.org/software/libmicrohttpd/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.10
-BuildRequires: gnutls-devel
+BuildRequires: gnutls-devel >= 2.8.6
BuildRequires: libgcrypt-devel >= 1.2.4
BuildRequires: libtool
BuildRequires: texinfo
%if %{with tests}
BuildRequires: curl-devel >= 7.16.4
%endif
+Requires: gnutls >= 2.8.6
+Requires: libgcrypt >= 1.2.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -37,7 +41,7 @@ Summary: Header files to develop libmicrohttpd applications
Summary(pl.UTF-8): Pliki nagłówkowe do rozwijania aplikacji używających libmicrohttpd
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gnutls-devel
+Requires: gnutls-devel >= 2.8.6
Requires: libgcrypt-devel >= 1.2.4
%description devel
@@ -61,6 +65,8 @@ Biblioteka statyczna libmicrohttpd.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -110,8 +116,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libmicrohttpd.so
%{_libdir}/libmicrohttpd.la
%{_includedir}/microhttpd.h
-%{_infodir}/microhttpd.info*
-%{_infodir}/microhttpd-tutorial.info*
+%{_infodir}/libmicrohttpd.info*
+%{_infodir}/libmicrohttpd-tutorial.info*
%{_mandir}/man3/libmicrohttpd.3*
%{_pkgconfigdir}/libmicrohttpd.pc
diff --git a/libmicrohttpd-am.patch b/libmicrohttpd-am.patch
new file mode 100644
index 0000000..82e905f
--- /dev/null
+++ b/libmicrohttpd-am.patch
@@ -0,0 +1,11 @@
+--- libmicrohttpd-0.9.24/configure.ac.orig 2012-12-25 19:36:51.000000000 +0100
++++ libmicrohttpd-0.9.24/configure.ac 2013-01-03 18:45:14.086408437 +0100
+@@ -23,7 +23,7 @@
+ AC_PREREQ(2.57)
+ AC_INIT([libmicrohttpd], [0.9.24],[libmicrohttpd at gnu.org])
+ AM_INIT_AUTOMAKE([silent-rules])
+-AM_CONFIG_HEADER([MHD_config.h])
++AC_CONFIG_HEADERS([MHD_config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AH_TOP([#define _GNU_SOURCE 1])
+
diff --git a/libmicrohttpd-info.patch b/libmicrohttpd-info.patch
index 4222543..0964799 100644
--- a/libmicrohttpd-info.patch
+++ b/libmicrohttpd-info.patch
@@ -1,28 +1,28 @@
---- libmicrohttpd-0.9.16/doc/microhttpd.texi.orig 2011-09-28 08:37:02.000000000 +0200
-+++ libmicrohttpd-0.9.16/doc/microhttpd.texi 2011-11-06 06:31:12.786669338 +0100
-@@ -22,9 +22,9 @@
- GNU libmicrohttpd is a GNU package.
+--- libmicrohttpd-0.9.23/doc/libmicrohttpd.texi.orig 2012-11-16 19:47:41.137911245 +0100
++++ libmicrohttpd-0.9.23/doc/libmicrohttpd.texi 2012-11-16 20:12:18.761213783 +0100
+@@ -25,9 +25,9 @@
+ @end quotation
@end copying
-- at dircategory GNU Libraries
+- at dircategory Software libraries
+ at dircategory Libraries:
@direntry
--* libmicrohttpd: (microhttpd). Embedded HTTP server library.
-+* libmicrohttpd: (microhttpd). Embedded HTTP server library
+-* libmicrohttpd: (libmicrohttpd). Embedded HTTP server library.
++* libmicrohttpd: (libmicrohttpd). Embedded HTTP server library
@end direntry
@c
---- libmicrohttpd-0.9.16/doc/microhttpd-tutorial.texi.orig 2011-11-04 10:02:56.000000000 +0100
-+++ libmicrohttpd-0.9.16/doc/microhttpd-tutorial.texi 2011-11-06 06:31:34.976670082 +0100
-@@ -7,9 +7,9 @@
- @set VERSION 0.9.16
- @settitle A tutorial for GNU libmicrohttpd
+--- libmicrohttpd-0.9.23/doc/libmicrohttpd-tutorial.texi.orig 2012-11-16 19:47:41.141244578 +0100
++++ libmicrohttpd-0.9.23/doc/libmicrohttpd-tutorial.texi 2012-11-16 20:14:21.744544555 +0100
+@@ -13,9 +13,9 @@
+ @syncodeindex pg cp
+ @syncodeindex tp cp
-- at dircategory GNU Libraries
+- at dircategory Software libraries
+ at dircategory Libraries:
@direntry
--* libmicrohttpdtutorial: (microhttpd). A tutorial for GNU libmicrohttpd.
-+* libmicrohttpdtutorial: (microhttpd). A tutorial for GNU libmicrohttpd
+-* libmicrohttpdtutorial: (libmicrohttpd). A tutorial for GNU libmicrohttpd.
++* libmicrohttpdtutorial: (libmicrohttpd). A tutorial for GNU libmicrohttpd
@end direntry
@copying
diff --git a/libmicrohttpd-missing.patch b/libmicrohttpd-missing.patch
new file mode 100644
index 0000000..cb93856
--- /dev/null
+++ b/libmicrohttpd-missing.patch
@@ -0,0 +1,4903 @@
+--- libmicrohttpd-0.9.24/doc/ecos.texi.orig 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/ecos.texi 2013-01-03 19:01:45.646387769 +0100
+@@ -0,0 +1,420 @@
++ at cindex GPL, GNU General Public License
++ at cindex eCos, GNU General Public License with eCos Extension
++ at center Version 2, June 1991
++
++ at display
++Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
++59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA
++
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++ at end display
++
++
++
++
++ at subheading Preamble
++
++ The licenses for most software are designed to take away your
++freedom to share and change it. By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software---to make sure the software is free for all its users. This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it. (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.) You can apply it to
++your programs, too.
++
++ When we speak of free software, we are referring to freedom, not
++price. Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++ To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++ For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have. You must make sure that they, too, receive or can get the
++source code. And you must show them these terms so they know their
++rights.
++
++ We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++ Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software. If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++ Finally, any free program is threatened constantly by software
++patents. We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary. To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++ The precise terms and conditions for copying, distribution and
++modification follow.
++
++ at iftex
++ at subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++ at end iftex
++ at ifinfo
++ at center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++ at end ifinfo
++
++ at enumerate
++ at item
++This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License. The ``Program'', below,
++refers to any such program or work, and a ``work based on the Program''
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
++language. (Hereinafter, translation is included without limitation in
++the term ``modification''.) Each licensee is addressed as ``you''.
++
++Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope. The act of
++running the Program is not restricted, and the output from the Program
++is covered only if its contents constitute a work based on the
++Program (independent of having been made by running the Program).
++Whether that is true depends on what the Program does.
++
++ at item
++You may copy and distribute verbatim copies of the Program's
++source code as you receive it, in any medium, provided that you
++conspicuously and appropriately publish on each copy an appropriate
++copyright notice and disclaimer of warranty; keep intact all the
++notices that refer to this License and to the absence of any warranty;
++and give any other recipients of the Program a copy of this License
++along with the Program.
++
++You may charge a fee for the physical act of transferring a copy, and
++you may at your option offer warranty protection in exchange for a fee.
++
++ at item
++You may modify your copy or copies of the Program or any portion
++of it, thus forming a work based on the Program, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++ at enumerate a
++ at item
++You must cause the modified files to carry prominent notices
++stating that you changed the files and the date of any change.
++
++ at item
++You must cause any work that you distribute or publish, that in
++whole or in part contains or is derived from the Program or any
++part thereof, to be licensed as a whole at no charge to all third
++parties under the terms of this License.
++
++ at item
++If the modified program normally reads commands interactively
++when run, you must cause it, when started running for such
++interactive use in the most ordinary way, to print or display an
++announcement including an appropriate copyright notice and a
++notice that there is no warranty (or else, saying that you provide
++a warranty) and that users may redistribute the program under
++these conditions, and telling the user how to view a copy of this
++License. (Exception: if the Program itself is interactive but
++does not normally print such an announcement, your work based on
++the Program is not required to print an announcement.)
++ at end enumerate
++
++These requirements apply to the modified work as a whole. If
++identifiable sections of that work are not derived from the Program,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works. But when you
++distribute the same sections as part of a whole which is a work based
++on the Program, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Program.
++
++In addition, mere aggregation of another work not based on the Program
++with the Program (or with a work based on the Program) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++ at item
++You may copy and distribute the Program (or a work based on it,
++under Section 2) in object code or executable form under the terms of
++Sections 1 and 2 above provided that you also do one of the following:
++
++ at enumerate a
++ at item
++Accompany it with the complete corresponding machine-readable
++source code, which must be distributed under the terms of Sections
++1 and 2 above on a medium customarily used for software interchange; or,
++
++ at item
++Accompany it with a written offer, valid for at least three
++years, to give any third party, for a charge no more than your
++cost of physically performing source distribution, a complete
++machine-readable copy of the corresponding source code, to be
++distributed under the terms of Sections 1 and 2 above on a medium
++customarily used for software interchange; or,
++
++ at item
++Accompany it with the information you received as to the offer
++to distribute corresponding source code. (This alternative is
++allowed only for noncommercial distribution and only if you
++received the program in object code or executable form with such
++an offer, in accord with Subsection b above.)
++ at end enumerate
++
++The source code for a work means the preferred form of the work for
++making modifications to it. For an executable work, complete source
++code means all the source code for all modules it contains, plus any
++associated interface definition files, plus the scripts used to
++control compilation and installation of the executable. However, as a
++special exception, the source code distributed need not include
++anything that is normally distributed (in either source or binary
++form) with the major components (compiler, kernel, and so on) of the
++operating system on which the executable runs, unless that component
++itself accompanies the executable.
++
++If distribution of executable or object code is made by offering
++access to copy from a designated place, then offering equivalent
++access to copy the source code from the same place counts as
++distribution of the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++ at item
++You may not copy, modify, sublicense, or distribute the Program
++except as expressly provided under this License. Any attempt
++otherwise to copy, modify, sublicense or distribute the Program is
++void, and will automatically terminate your rights under this License.
++However, parties who have received copies, or rights, from you under
++this License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++ at item
++You are not required to accept this License, since you have not
++signed it. However, nothing else grants you permission to modify or
++distribute the Program or its derivative works. These actions are
++prohibited by law if you do not accept this License. Therefore, by
++modifying or distributing the Program (or any work based on the
++Program), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Program or works based on it.
++
++ at item
++Each time you redistribute the Program (or any work based on the
++Program), the recipient automatically receives a license from the
++original licensor to copy, distribute or modify the Program subject to
++these terms and conditions. You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties to
++this License.
++
++ at item
++If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License. If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Program at all. For example, if a patent
++license would not permit royalty-free redistribution of the Program by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Program.
++
++If any portion of this section is held invalid or unenforceable under
++any particular circumstance, the balance of the section is intended to
++apply and the section as a whole is intended to apply in other
++circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system, which is
++implemented by public license practices. Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++ at item
++If the distribution and/or use of the Program is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Program under this License
++may add an explicit geographical distribution limitation excluding
++those countries, so that distribution is permitted only in or among
++countries not thus excluded. In such case, this License incorporates
++the limitation as if written in the body of this License.
++
++ at item
++The Free Software Foundation may publish revised and/or new versions
++of the General Public License from time to time. Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Program
++specifies a version number of this License which applies to it and ``any
++later version'', you have the option of following the terms and conditions
++either of that version or of any later version published by the Free
++Software Foundation. If the Program does not specify a version number of
++this License, you may choose any version ever published by the Free Software
++Foundation.
++
++ at item
++If you wish to incorporate parts of the Program into other free
++programs whose distribution conditions are different, write to the author
++to ask for permission. For software which is copyrighted by the Free
++Software Foundation, write to the Free Software Foundation; we sometimes
++make exceptions for this. Our decision will be guided by the two goals
++of preserving the free status of all derivatives of our free software and
++of promoting the sharing and reuse of software generally.
++
++ at iftex
++ at heading NO WARRANTY
++ at end iftex
++ at ifinfo
++ at center NO WARRANTY
++ at end ifinfo
++
++ at item
++BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
++PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
++REPAIR OR CORRECTION.
++
++ at item
++IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGES.
++
++ at iftex
++ at heading ECOS EXTENSION
++ at end iftex
++ at ifinfo
++ at center ECOS EXTENSION
++ at end ifinfo
++
++
++ at item
++As a special exception, if other files instantiate templates or use
++macros or inline functions from this file, or you compile this file
++and link it with other works to produce a work based on this file,
++this file does not by itself cause the resulting work to be covered by
++the GNU General Public License. However the source code for this file
++must still be made available in accordance with section (3) of the GNU
++General Public License v2.
++
++This exception does not invalidate any other reasons why a work based
++on this file might be covered by the GNU General Public License.
++
++ at end enumerate
++
++
++ at iftex
++ at heading END OF TERMS AND CONDITIONS
++ at end iftex
++ at ifinfo
++ at center END OF TERMS AND CONDITIONS
++ at end ifinfo
++
++ at page
++ at unnumberedsec How to Apply These Terms to Your New Programs
++
++ If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++ To do so, attach the following notices to the program. It is safest
++to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least
++the ``copyright'' line and a pointer to where the full notice is found.
++
++ at smallexample
++ at var{one line to give the program's name and an idea of what it does.}
++Copyright (C) 19 at var{yy} @var{name of author}
++
++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.
++
++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.
++ at end smallexample
++
++Also add information on how to contact you by electronic and paper mail.
++
++If the program is interactive, make it output a short notice like this
++when it starts in an interactive mode:
++
++ at smallexample
++Gnomovision version 69, Copyright (C) 19 at var{yy} @var{name of author}
++Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
++type `show w'. This is free software, and you are welcome
++to redistribute it under certain conditions; type `show c'
++for details.
++ at end smallexample
++
++The hypothetical commands @samp{show w} and @samp{show c} should show
++the appropriate parts of the General Public License. Of course, the
++commands you use may be called something other than @samp{show w} and
++ at samp{show c}; they could even be mouse-clicks or menu items---whatever
++suits your program.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a ``copyright disclaimer'' for the program, if
++necessary. Here is a sample; alter the names:
++
++ at smallexample
++ at group
++Yoyodyne, Inc., hereby disclaims all copyright
++interest in the program `Gnomovision'
++(which makes passes at compilers) written
++by James Hacker.
++
++ at var{signature of Ty Coon}, 1 April 1989
++Ty Coon, President of Vice
++ at end group
++ at end smallexample
++
++This General Public License does not permit incorporating your program into
++proprietary programs. If your program is a subroutine library, you may
++consider it more useful to permit linking proprietary applications with the
++library. If this is what you want to do, use the GNU Library General
++Public License instead of this License.
+--- libmicrohttpd-0.9.24/doc/fdl-1.3.texi.orig 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/fdl-1.3.texi 2013-01-03 19:01:45.646387769 +0100
+@@ -0,0 +1,506 @@
++ at c The GNU Free Documentation License.
++ at center Version 1.3, 3 November 2008
++
++ at c This file is intended to be included within another document,
++ at c hence no sectioning command or @node.
++
++ at display
++Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
++ at uref{http://fsf.org/}
++
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++ at end display
++
++ at enumerate 0
++ at item
++PREAMBLE
++
++The purpose of this License is to make a manual, textbook, or other
++functional and useful document @dfn{free} in the sense of freedom: to
++assure everyone the effective freedom to copy and redistribute it,
++with or without modifying it, either commercially or noncommercially.
++Secondarily, this License preserves for the author and publisher a way
++to get credit for their work, while not being considered responsible
++for modifications made by others.
++
++This License is a kind of ``copyleft'', which means that derivative
++works of the document must themselves be free in the same sense. It
++complements the GNU General Public License, which is a copyleft
++license designed for free software.
++
++We have designed this License in order to use it for manuals for free
++software, because free software needs free documentation: a free
++program should come with manuals providing the same freedoms that the
++software does. But this License is not limited to software manuals;
++it can be used for any textual work, regardless of subject matter or
++whether it is published as a printed book. We recommend this License
++principally for works whose purpose is instruction or reference.
++
++ at item
++APPLICABILITY AND DEFINITIONS
++
++This License applies to any manual or other work, in any medium, that
++contains a notice placed by the copyright holder saying it can be
++distributed under the terms of this License. Such a notice grants a
++world-wide, royalty-free license, unlimited in duration, to use that
++work under the conditions stated herein. The ``Document'', below,
++refers to any such manual or work. Any member of the public is a
++licensee, and is addressed as ``you''. You accept the license if you
++copy, modify or distribute the work in a way requiring permission
++under copyright law.
++
++A ``Modified Version'' of the Document means any work containing the
++Document or a portion of it, either copied verbatim, or with
++modifications and/or translated into another language.
++
++A ``Secondary Section'' is a named appendix or a front-matter section
++of the Document that deals exclusively with the relationship of the
++publishers or authors of the Document to the Document's overall
++subject (or to related matters) and contains nothing that could fall
++directly within that overall subject. (Thus, if the Document is in
++part a textbook of mathematics, a Secondary Section may not explain
++any mathematics.) The relationship could be a matter of historical
++connection with the subject or with related matters, or of legal,
++commercial, philosophical, ethical or political position regarding
++them.
++
++The ``Invariant Sections'' are certain Secondary Sections whose titles
++are designated, as being those of Invariant Sections, in the notice
++that says that the Document is released under this License. If a
++section does not fit the above definition of Secondary then it is not
++allowed to be designated as Invariant. The Document may contain zero
++Invariant Sections. If the Document does not identify any Invariant
++Sections then there are none.
++
++The ``Cover Texts'' are certain short passages of text that are listed,
++as Front-Cover Texts or Back-Cover Texts, in the notice that says that
++the Document is released under this License. A Front-Cover Text may
++be at most 5 words, and a Back-Cover Text may be at most 25 words.
++
++A ``Transparent'' copy of the Document means a machine-readable copy,
++represented in a format whose specification is available to the
++general public, that is suitable for revising the document
++straightforwardly with generic text editors or (for images composed of
++pixels) generic paint programs or (for drawings) some widely available
++drawing editor, and that is suitable for input to text formatters or
++for automatic translation to a variety of formats suitable for input
++to text formatters. A copy made in an otherwise Transparent file
++format whose markup, or absence of markup, has been arranged to thwart
++or discourage subsequent modification by readers is not Transparent.
++An image format is not Transparent if used for any substantial amount
++of text. A copy that is not ``Transparent'' is called ``Opaque''.
++
++Examples of suitable formats for Transparent copies include plain
++ at sc{ascii} without markup, Texinfo input format, La at TeX{} input
++format, @acronym{SGML} or @acronym{XML} using a publicly available
++ at acronym{DTD}, and standard-conforming simple @acronym{HTML},
++PostScript or @acronym{PDF} designed for human modification. Examples
++of transparent image formats include @acronym{PNG}, @acronym{XCF} and
++ at acronym{JPG}. Opaque formats include proprietary formats that can be
++read and edited only by proprietary word processors, @acronym{SGML} or
++ at acronym{XML} for which the @acronym{DTD} and/or processing tools are
++not generally available, and the machine-generated @acronym{HTML},
++PostScript or @acronym{PDF} produced by some word processors for
++output purposes only.
++
++The ``Title Page'' means, for a printed book, the title page itself,
++plus such following pages as are needed to hold, legibly, the material
++this License requires to appear in the title page. For works in
++formats which do not have any title page as such, ``Title Page'' means
++the text near the most prominent appearance of the work's title,
++preceding the beginning of the body of the text.
++
++The ``publisher'' means any person or entity that distributes copies
++of the Document to the public.
++
++A section ``Entitled XYZ'' means a named subunit of the Document whose
++title either is precisely XYZ or contains XYZ in parentheses following
++text that translates XYZ in another language. (Here XYZ stands for a
++specific section name mentioned below, such as ``Acknowledgements'',
++``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
++of such a section when you modify the Document means that it remains a
++section ``Entitled XYZ'' according to this definition.
++
++The Document may include Warranty Disclaimers next to the notice which
++states that this License applies to the Document. These Warranty
++Disclaimers are considered to be included by reference in this
++License, but only as regards disclaiming warranties: any other
++implication that these Warranty Disclaimers may have is void and has
++no effect on the meaning of this License.
++
++ at item
++VERBATIM COPYING
++
++You may copy and distribute the Document in any medium, either
++commercially or noncommercially, provided that this License, the
++copyright notices, and the license notice saying this License applies
++to the Document are reproduced in all copies, and that you add no other
++conditions whatsoever to those of this License. You may not use
++technical measures to obstruct or control the reading or further
++copying of the copies you make or distribute. However, you may accept
++compensation in exchange for copies. If you distribute a large enough
++number of copies you must also follow the conditions in section 3.
++
++You may also lend copies, under the same conditions stated above, and
++you may publicly display copies.
++
++ at item
++COPYING IN QUANTITY
++
++If you publish printed copies (or copies in media that commonly have
++printed covers) of the Document, numbering more than 100, and the
++Document's license notice requires Cover Texts, you must enclose the
++copies in covers that carry, clearly and legibly, all these Cover
++Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
++the back cover. Both covers must also clearly and legibly identify
++you as the publisher of these copies. The front cover must present
++the full title with all words of the title equally prominent and
++visible. You may add other material on the covers in addition.
++Copying with changes limited to the covers, as long as they preserve
++the title of the Document and satisfy these conditions, can be treated
++as verbatim copying in other respects.
++
++If the required texts for either cover are too voluminous to fit
++legibly, you should put the first ones listed (as many as fit
++reasonably) on the actual cover, and continue the rest onto adjacent
++pages.
++
++If you publish or distribute Opaque copies of the Document numbering
++more than 100, you must either include a machine-readable Transparent
++copy along with each Opaque copy, or state in or with each Opaque copy
++a computer-network location from which the general network-using
++public has access to download using public-standard network protocols
++a complete Transparent copy of the Document, free of added material.
++If you use the latter option, you must take reasonably prudent steps,
++when you begin distribution of Opaque copies in quantity, to ensure
++that this Transparent copy will remain thus accessible at the stated
++location until at least one year after the last time you distribute an
++Opaque copy (directly or through your agents or retailers) of that
++edition to the public.
++
++It is requested, but not required, that you contact the authors of the
++Document well before redistributing any large number of copies, to give
++them a chance to provide you with an updated version of the Document.
++
++ at item
++MODIFICATIONS
++
++You may copy and distribute a Modified Version of the Document under
++the conditions of sections 2 and 3 above, provided that you release
++the Modified Version under precisely this License, with the Modified
++Version filling the role of the Document, thus licensing distribution
++and modification of the Modified Version to whoever possesses a copy
++of it. In addition, you must do these things in the Modified Version:
++
++ at enumerate A
++ at item
++Use in the Title Page (and on the covers, if any) a title distinct
++from that of the Document, and from those of previous versions
++(which should, if there were any, be listed in the History section
++of the Document). You may use the same title as a previous version
++if the original publisher of that version gives permission.
++
++ at item
++List on the Title Page, as authors, one or more persons or entities
++responsible for authorship of the modifications in the Modified
++Version, together with at least five of the principal authors of the
++Document (all of its principal authors, if it has fewer than five),
++unless they release you from this requirement.
++
++ at item
++State on the Title page the name of the publisher of the
++Modified Version, as the publisher.
++
++ at item
++Preserve all the copyright notices of the Document.
++
++ at item
++Add an appropriate copyright notice for your modifications
++adjacent to the other copyright notices.
++
++ at item
++Include, immediately after the copyright notices, a license notice
++giving the public permission to use the Modified Version under the
++terms of this License, in the form shown in the Addendum below.
++
++ at item
++Preserve in that license notice the full lists of Invariant Sections
++and required Cover Texts given in the Document's license notice.
++
++ at item
++Include an unaltered copy of this License.
++
++ at item
++Preserve the section Entitled ``History'', Preserve its Title, and add
++to it an item stating at least the title, year, new authors, and
++publisher of the Modified Version as given on the Title Page. If
++there is no section Entitled ``History'' in the Document, create one
++stating the title, year, authors, and publisher of the Document as
++given on its Title Page, then add an item describing the Modified
++Version as stated in the previous sentence.
++
++ at item
++Preserve the network location, if any, given in the Document for
++public access to a Transparent copy of the Document, and likewise
++the network locations given in the Document for previous versions
++it was based on. These may be placed in the ``History'' section.
++You may omit a network location for a work that was published at
++least four years before the Document itself, or if the original
++publisher of the version it refers to gives permission.
++
++ at item
++For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
++the Title of the section, and preserve in the section all the
++substance and tone of each of the contributor acknowledgements and/or
++dedications given therein.
++
++ at item
++Preserve all the Invariant Sections of the Document,
++unaltered in their text and in their titles. Section numbers
++or the equivalent are not considered part of the section titles.
++
++ at item
++Delete any section Entitled ``Endorsements''. Such a section
++may not be included in the Modified Version.
++
++ at item
++Do not retitle any existing section to be Entitled ``Endorsements'' or
++to conflict in title with any Invariant Section.
++
++ at item
++Preserve any Warranty Disclaimers.
++ at end enumerate
++
++If the Modified Version includes new front-matter sections or
++appendices that qualify as Secondary Sections and contain no material
++copied from the Document, you may at your option designate some or all
++of these sections as invariant. To do this, add their titles to the
++list of Invariant Sections in the Modified Version's license notice.
++These titles must be distinct from any other section titles.
++
++You may add a section Entitled ``Endorsements'', provided it contains
++nothing but endorsements of your Modified Version by various
++parties---for example, statements of peer review or that the text has
++been approved by an organization as the authoritative definition of a
++standard.
++
++You may add a passage of up to five words as a Front-Cover Text, and a
++passage of up to 25 words as a Back-Cover Text, to the end of the list
++of Cover Texts in the Modified Version. Only one passage of
++Front-Cover Text and one of Back-Cover Text may be added by (or
++through arrangements made by) any one entity. If the Document already
++includes a cover text for the same cover, previously added by you or
++by arrangement made by the same entity you are acting on behalf of,
++you may not add another; but you may replace the old one, on explicit
++permission from the previous publisher that added the old one.
++
++The author(s) and publisher(s) of the Document do not by this License
++give permission to use their names for publicity for or to assert or
++imply endorsement of any Modified Version.
++
++ at item
++COMBINING DOCUMENTS
++
++You may combine the Document with other documents released under this
++License, under the terms defined in section 4 above for modified
++versions, provided that you include in the combination all of the
++Invariant Sections of all of the original documents, unmodified, and
++list them all as Invariant Sections of your combined work in its
++license notice, and that you preserve all their Warranty Disclaimers.
++
++The combined work need only contain one copy of this License, and
++multiple identical Invariant Sections may be replaced with a single
++copy. If there are multiple Invariant Sections with the same name but
++different contents, make the title of each such section unique by
++adding at the end of it, in parentheses, the name of the original
++author or publisher of that section if known, or else a unique number.
++Make the same adjustment to the section titles in the list of
++Invariant Sections in the license notice of the combined work.
++
++In the combination, you must combine any sections Entitled ``History''
++in the various original documents, forming one section Entitled
++``History''; likewise combine any sections Entitled ``Acknowledgements'',
++and any sections Entitled ``Dedications''. You must delete all
++sections Entitled ``Endorsements.''
++
++ at item
++COLLECTIONS OF DOCUMENTS
++
++You may make a collection consisting of the Document and other documents
++released under this License, and replace the individual copies of this
++License in the various documents with a single copy that is included in
++the collection, provided that you follow the rules of this License for
++verbatim copying of each of the documents in all other respects.
++
++You may extract a single document from such a collection, and distribute
++it individually under this License, provided you insert a copy of this
++License into the extracted document, and follow this License in all
++other respects regarding verbatim copying of that document.
++
++ at item
++AGGREGATION WITH INDEPENDENT WORKS
++
++A compilation of the Document or its derivatives with other separate
++and independent documents or works, in or on a volume of a storage or
++distribution medium, is called an ``aggregate'' if the copyright
++resulting from the compilation is not used to limit the legal rights
++of the compilation's users beyond what the individual works permit.
++When the Document is included in an aggregate, this License does not
++apply to the other works in the aggregate which are not themselves
++derivative works of the Document.
++
++If the Cover Text requirement of section 3 is applicable to these
++copies of the Document, then if the Document is less than one half of
++the entire aggregate, the Document's Cover Texts may be placed on
++covers that bracket the Document within the aggregate, or the
++electronic equivalent of covers if the Document is in electronic form.
++Otherwise they must appear on printed covers that bracket the whole
++aggregate.
++
++ at item
++TRANSLATION
++
++Translation is considered a kind of modification, so you may
++distribute translations of the Document under the terms of section 4.
++Replacing Invariant Sections with translations requires special
++permission from their copyright holders, but you may include
++translations of some or all Invariant Sections in addition to the
++original versions of these Invariant Sections. You may include a
++translation of this License, and all the license notices in the
++Document, and any Warranty Disclaimers, provided that you also include
++the original English version of this License and the original versions
++of those notices and disclaimers. In case of a disagreement between
++the translation and the original version of this License or a notice
++or disclaimer, the original version will prevail.
++
++If a section in the Document is Entitled ``Acknowledgements'',
++``Dedications'', or ``History'', the requirement (section 4) to Preserve
++its Title (section 1) will typically require changing the actual
++title.
++
++ at item
++TERMINATION
++
++You may not copy, modify, sublicense, or distribute the Document
++except as expressly provided under this License. Any attempt
++otherwise to copy, modify, sublicense, or distribute it is void, and
++will automatically terminate your rights under this License.
++
++However, if you cease all violation of this License, then your license
++from a particular copyright holder is reinstated (a) provisionally,
++unless and until the copyright holder explicitly and finally
++terminates your license, and (b) permanently, if the copyright holder
++fails to notify you of the violation by some reasonable means prior to
++60 days after the cessation.
++
++Moreover, your license from a particular copyright holder is
++reinstated permanently if the copyright holder notifies you of the
++violation by some reasonable means, this is the first time you have
++received notice of violation of this License (for any work) from that
++copyright holder, and you cure the violation prior to 30 days after
++your receipt of the notice.
++
++Termination of your rights under this section does not terminate the
++licenses of parties who have received copies or rights from you under
++this License. If your rights have been terminated and not permanently
++reinstated, receipt of a copy of some or all of the same material does
++not give you any rights to use it.
++
++ at item
++FUTURE REVISIONS OF THIS LICENSE
++
++The Free Software Foundation may publish new, revised versions
++of the GNU Free Documentation License from time to time. Such new
++versions will be similar in spirit to the present version, but may
++differ in detail to address new problems or concerns. See
++ at uref{http://www.gnu.org/copyleft/}.
++
++Each version of the License is given a distinguishing version number.
++If the Document specifies that a particular numbered version of this
++License ``or any later version'' applies to it, you have the option of
++following the terms and conditions either of that specified version or
++of any later version that has been published (not as a draft) by the
++Free Software Foundation. If the Document does not specify a version
++number of this License, you may choose any version ever published (not
++as a draft) by the Free Software Foundation. If the Document
++specifies that a proxy can decide which future versions of this
++License can be used, that proxy's public statement of acceptance of a
++version permanently authorizes you to choose that version for the
++Document.
++
++ at item
++RELICENSING
++
++``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any
++World Wide Web server that publishes copyrightable works and also
++provides prominent facilities for anybody to edit those works. A
++public wiki that anybody can edit is an example of such a server. A
++``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the
++site means any set of copyrightable works thus published on the MMC
++site.
++
++``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0
++license published by Creative Commons Corporation, a not-for-profit
++corporation with a principal place of business in San Francisco,
++California, as well as future copyleft versions of that license
++published by that same organization.
++
++``Incorporate'' means to publish or republish a Document, in whole or
++in part, as part of another Document.
++
++An MMC is ``eligible for relicensing'' if it is licensed under this
++License, and if all works that were first published under this License
++somewhere other than this MMC, and subsequently incorporated in whole
++or in part into the MMC, (1) had no cover texts or invariant sections,
++and (2) were thus incorporated prior to November 1, 2008.
++
++The operator of an MMC Site may republish an MMC contained in the site
++under CC-BY-SA on the same site at any time before August 1, 2009,
++provided the MMC is eligible for relicensing.
++
++ at end enumerate
++
++ at page
++ at heading ADDENDUM: How to use this License for your documents
++
++To use this License in a document you have written, include a copy of
++the License in the document and put the following copyright and
++license notices just after the title page:
++
++ at smallexample
++ at group
++ Copyright (C) @var{year} @var{your name}.
++ Permission is granted to copy, distribute and/or modify this document
++ under the terms of the GNU Free Documentation License, Version 1.3
++ or any later version published by the Free Software Foundation;
++ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
++ Texts. A copy of the license is included in the section entitled ``GNU
++ Free Documentation License''.
++ at end group
++ at end smallexample
++
++If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
++replace the ``with at dots{}Texts.'' line with this:
++
++ at smallexample
++ at group
++ with the Invariant Sections being @var{list their titles}, with
++ the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
++ being @var{list}.
++ at end group
++ at end smallexample
++
++If you have Invariant Sections without Cover Texts, or some other
++combination of the three, merge those two alternatives to suit the
++situation.
++
++If your document contains nontrivial examples of program code, we
++recommend releasing these examples in parallel under your choice of
++free software license, such as the GNU General Public License,
++to permit their use in free software.
++
++ at c Local Variables:
++ at c ispell-local-pdict: "ispell-dict"
++ at c End:
++
+--- libmicrohttpd-0.9.24/doc/lgpl.texi.orig 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/lgpl.texi 2013-01-03 19:01:45.646387769 +0100
+@@ -0,0 +1,561 @@
++ at c The GNU Lesser General Public License.
++ at center Version 2.1, February 1999
++
++ at c This file is intended to be included within another document,
++ at c hence no sectioning command or @node.
++
++ at display
++Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++
++Everyone is permitted to copy and distribute verbatim copies
++of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL. It also counts
++as the successor of the GNU Library Public License, version 2, hence the
++version number 2.1.]
++ at end display
++
++ at subheading Preamble
++
++ The licenses for most software are designed to take away your
++freedom to share and change it. By contrast, the GNU General Public
++Licenses are intended to guarantee your freedom to share and change
++free software---to make sure the software is free for all its users.
++
++ This license, the Lesser General Public License, applies to some
++specially designated software---typically libraries---of the Free
++Software Foundation and other authors who decide to use it. You can use
++it too, but we suggest you first think carefully about whether this
++license or the ordinary General Public License is the better strategy to
++use in any particular case, based on the explanations below.
++
++ When we speak of free software, we are referring to freedom of use,
++not price. Our General Public Licenses are designed to make sure that
++you have the freedom to distribute copies of free software (and charge
++for this service if you wish); that you receive source code or can get
++it if you want it; that you can change the software and use pieces of it
++in new free programs; and that you are informed that you can do these
++things.
++
++ To protect your rights, we need to make restrictions that forbid
++distributors to deny you these rights or to ask you to surrender these
++rights. These restrictions translate to certain responsibilities for
++you if you distribute copies of the library or if you modify it.
++
++ For example, if you distribute copies of the library, whether gratis
++or for a fee, you must give the recipients all the rights that we gave
++you. You must make sure that they, too, receive or can get the source
++code. If you link other code with the library, you must provide
++complete object files to the recipients, so that they can relink them
++with the library after making changes to the library and recompiling
++it. And you must show them these terms so they know their rights.
++
++ We protect your rights with a two-step method: (1) we copyright the
++library, and (2) we offer you this license, which gives you legal
++permission to copy, distribute and/or modify the library.
++
++ To protect each distributor, we want to make it very clear that
++there is no warranty for the free library. Also, if the library is
++modified by someone else and passed on, the recipients should know
++that what they have is not the original version, so that the original
++author's reputation will not be affected by problems that might be
++introduced by others.
++
++ Finally, software patents pose a constant threat to the existence of
++any free program. We wish to make sure that a company cannot
++effectively restrict the users of a free program by obtaining a
++restrictive license from a patent holder. Therefore, we insist that
++any patent license obtained for a version of the library must be
++consistent with the full freedom of use specified in this license.
++
++ Most GNU software, including some libraries, is covered by the
++ordinary GNU General Public License. This license, the GNU Lesser
++General Public License, applies to certain designated libraries, and
++is quite different from the ordinary General Public License. We use
++this license for certain libraries in order to permit linking those
++libraries into non-free programs.
++
++ When a program is linked with a library, whether statically or using
++a shared library, the combination of the two is legally speaking a
++combined work, a derivative of the original library. The ordinary
++General Public License therefore permits such linking only if the
++entire combination fits its criteria of freedom. The Lesser General
++Public License permits more lax criteria for linking other code with
++the library.
++
++ We call this license the @dfn{Lesser} General Public License because it
++does @emph{Less} to protect the user's freedom than the ordinary General
++Public License. It also provides other free software developers Less
++of an advantage over competing non-free programs. These disadvantages
++are the reason we use the ordinary General Public License for many
++libraries. However, the Lesser license provides advantages in certain
++special circumstances.
++
++ For example, on rare occasions, there may be a special need to
++encourage the widest possible use of a certain library, so that it becomes
++a de-facto standard. To achieve this, non-free programs must be
++allowed to use the library. A more frequent case is that a free
++library does the same job as widely used non-free libraries. In this
++case, there is little to gain by limiting the free library to free
++software only, so we use the Lesser General Public License.
++
++ In other cases, permission to use a particular library in non-free
++programs enables a greater number of people to use a large body of
++free software. For example, permission to use the GNU C Library in
++non-free programs enables many more people to use the whole GNU
++operating system, as well as its variant, the GNU/Linux operating
++system.
++
++ Although the Lesser General Public License is Less protective of the
++users' freedom, it does ensure that the user of a program that is
++linked with the Library has the freedom and the wherewithal to run
++that program using a modified version of the Library.
++
++ The precise terms and conditions for copying, distribution and
++modification follow. Pay close attention to the difference between a
++``work based on the library'' and a ``work that uses the library''. The
++former contains code derived from the library, whereas the latter must
++be combined with the library in order to run.
++
++ at subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++ at enumerate 0
++ at item
++This License Agreement applies to any software library or other program
++which contains a notice placed by the copyright holder or other
++authorized party saying it may be distributed under the terms of this
++Lesser General Public License (also called ``this License''). Each
++licensee is addressed as ``you''.
++
++ A ``library'' means a collection of software functions and/or data
++prepared so as to be conveniently linked with application programs
++(which use some of those functions and data) to form executables.
++
++ The ``Library'', below, refers to any such software library or work
++which has been distributed under these terms. A ``work based on the
++Library'' means either the Library or any derivative work under
++copyright law: that is to say, a work containing the Library or a
++portion of it, either verbatim or with modifications and/or translated
++straightforwardly into another language. (Hereinafter, translation is
++included without limitation in the term ``modification''.)
++
++ ``Source code'' for a work means the preferred form of the work for
++making modifications to it. For a library, complete source code means
++all the source code for all modules it contains, plus any associated
++interface definition files, plus the scripts used to control compilation
++and installation of the library.
++
++ Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope. The act of
++running a program using the Library is not restricted, and output from
++such a program is covered only if its contents constitute a work based
++on the Library (independent of the use of the Library in a tool for
++writing it). Whether that is true depends on what the Library does
++and what the program that uses the Library does.
++
++ at item
++You may copy and distribute verbatim copies of the Library's
++complete source code as you receive it, in any medium, provided that
++you conspicuously and appropriately publish on each copy an
++appropriate copyright notice and disclaimer of warranty; keep intact
++all the notices that refer to this License and to the absence of any
++warranty; and distribute a copy of this License along with the
++Library.
++
++ You may charge a fee for the physical act of transferring a copy,
++and you may at your option offer warranty protection in exchange for a
++fee.
++
++ at item
++You may modify your copy or copies of the Library or any portion
++of it, thus forming a work based on the Library, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++ at enumerate a
++ at item
++The modified work must itself be a software library.
++
++ at item
++You must cause the files modified to carry prominent notices
++stating that you changed the files and the date of any change.
++
++ at item
++You must cause the whole of the work to be licensed at no
++charge to all third parties under the terms of this License.
++
++ at item
++If a facility in the modified Library refers to a function or a
++table of data to be supplied by an application program that uses
++the facility, other than as an argument passed when the facility
++is invoked, then you must make a good faith effort to ensure that,
++in the event an application does not supply such function or
++table, the facility still operates, and performs whatever part of
++its purpose remains meaningful.
++
++(For example, a function in a library to compute square roots has
++a purpose that is entirely well-defined independent of the
++application. Therefore, Subsection 2d requires that any
++application-supplied function or table used by this function must
++be optional: if the application does not supply it, the square
++root function must still compute square roots.)
++ at end enumerate
++
++These requirements apply to the modified work as a whole. If
++identifiable sections of that work are not derived from the Library,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works. But when you
++distribute the same sections as part of a whole which is a work based
++on the Library, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote
++it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library
++with the Library (or with a work based on the Library) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++ at item
++You may opt to apply the terms of the ordinary GNU General Public
++License instead of this License to a given copy of the Library. To do
++this, you must alter all the notices that refer to this License, so
++that they refer to the ordinary GNU General Public License, version 2,
++instead of to this License. (If a newer version than version 2 of the
++ordinary GNU General Public License has appeared, then you can specify
++that version instead if you wish.) Do not make any other change in
++these notices.
++
++ Once this change is made in a given copy, it is irreversible for
++that copy, so the ordinary GNU General Public License applies to all
++subsequent copies and derivative works made from that copy.
++
++ This option is useful when you wish to copy part of the code of
++the Library into a program that is not a library.
++
++ at item
++You may copy and distribute the Library (or a portion or
++derivative of it, under Section 2) in object code or executable form
++under the terms of Sections 1 and 2 above provided that you accompany
++it with the complete corresponding machine-readable source code, which
++must be distributed under the terms of Sections 1 and 2 above on a
++medium customarily used for software interchange.
++
++ If distribution of object code is made by offering access to copy
++from a designated place, then offering equivalent access to copy the
++source code from the same place satisfies the requirement to
++distribute the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++ at item
++A program that contains no derivative of any portion of the
++Library, but is designed to work with the Library by being compiled or
++linked with it, is called a ``work that uses the Library''. Such a
++work, in isolation, is not a derivative work of the Library, and
++therefore falls outside the scope of this License.
++
++ However, linking a ``work that uses the Library'' with the Library
++creates an executable that is a derivative of the Library (because it
++contains portions of the Library), rather than a ``work that uses the
++library''. The executable is therefore covered by this License.
++Section 6 states terms for distribution of such executables.
++
++ When a ``work that uses the Library'' uses material from a header file
++that is part of the Library, the object code for the work may be a
++derivative work of the Library even though the source code is not.
++Whether this is true is especially significant if the work can be
++linked without the Library, or if the work is itself a library. The
++threshold for this to be true is not precisely defined by law.
++
++ If such an object file uses only numerical parameters, data
++structure layouts and accessors, and small macros and small inline
++functions (ten lines or less in length), then the use of the object
++file is unrestricted, regardless of whether it is legally a derivative
++work. (Executables containing this object code plus portions of the
++Library will still fall under Section 6.)
++
++ Otherwise, if the work is a derivative of the Library, you may
++distribute the object code for the work under the terms of Section 6.
++Any executables containing that work also fall under Section 6,
++whether or not they are linked directly with the Library itself.
++
++ at item
++As an exception to the Sections above, you may also combine or
++link a ``work that uses the Library'' with the Library to produce a
++work containing portions of the Library, and distribute that work
++under terms of your choice, provided that the terms permit
++modification of the work for the customer's own use and reverse
++engineering for debugging such modifications.
++
++ You must give prominent notice with each copy of the work that the
++Library is used in it and that the Library and its use are covered by
++this License. You must supply a copy of this License. If the work
++during execution displays copyright notices, you must include the
++copyright notice for the Library among them, as well as a reference
++directing the user to the copy of this License. Also, you must do one
++of these things:
++
++ at enumerate a
++ at item
++Accompany the work with the complete corresponding
++machine-readable source code for the Library including whatever
++changes were used in the work (which must be distributed under
++Sections 1 and 2 above); and, if the work is an executable linked
++with the Library, with the complete machine-readable ``work that
++uses the Library'', as object code and/or source code, so that the
++user can modify the Library and then relink to produce a modified
++executable containing the modified Library. (It is understood
++that the user who changes the contents of definitions files in the
++Library will not necessarily be able to recompile the application
++to use the modified definitions.)
++
++ at item
++Use a suitable shared library mechanism for linking with the Library. A
++suitable mechanism is one that (1) uses at run time a copy of the
++library already present on the user's computer system, rather than
++copying library functions into the executable, and (2) will operate
++properly with a modified version of the library, if the user installs
++one, as long as the modified version is interface-compatible with the
++version that the work was made with.
++
++ at item
++Accompany the work with a written offer, valid for at
++least three years, to give the same user the materials
++specified in Subsection 6a, above, for a charge no more
++than the cost of performing this distribution.
++
++ at item
++If distribution of the work is made by offering access to copy
++from a designated place, offer equivalent access to copy the above
++specified materials from the same place.
++
++ at item
++Verify that the user has already received a copy of these
++materials or that you have already sent this user a copy.
++ at end enumerate
++
++ For an executable, the required form of the ``work that uses the
++Library'' must include any data and utility programs needed for
++reproducing the executable from it. However, as a special exception,
++the materials to be distributed need not include anything that is
++normally distributed (in either source or binary form) with the major
++components (compiler, kernel, and so on) of the operating system on
++which the executable runs, unless that component itself accompanies the
++executable.
++
++ It may happen that this requirement contradicts the license
++restrictions of other proprietary libraries that do not normally
++accompany the operating system. Such a contradiction means you cannot
++use both them and the Library together in an executable that you
++distribute.
++
++ at item
++You may place library facilities that are a work based on the
++Library side-by-side in a single library together with other library
++facilities not covered by this License, and distribute such a combined
++library, provided that the separate distribution of the work based on
++the Library and of the other library facilities is otherwise
++permitted, and provided that you do these two things:
++
++ at enumerate a
++ at item
++Accompany the combined library with a copy of the same work
++based on the Library, uncombined with any other library
++facilities. This must be distributed under the terms of the
++Sections above.
++
++ at item
++Give prominent notice with the combined library of the fact
++that part of it is a work based on the Library, and explaining
++where to find the accompanying uncombined form of the same work.
++ at end enumerate
++
++ at item
++You may not copy, modify, sublicense, link with, or distribute
++the Library except as expressly provided under this License. Any
++attempt otherwise to copy, modify, sublicense, link with, or
++distribute the Library is void, and will automatically terminate your
++rights under this License. However, parties who have received copies,
++or rights, from you under this License will not have their licenses
++terminated so long as such parties remain in full compliance.
++
++ at item
++You are not required to accept this License, since you have not
++signed it. However, nothing else grants you permission to modify or
++distribute the Library or its derivative works. These actions are
++prohibited by law if you do not accept this License. Therefore, by
++modifying or distributing the Library (or any work based on the
++Library), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Library or works based on it.
++
++ at item
++Each time you redistribute the Library (or any work based on the
++Library), the recipient automatically receives a license from the
++original licensor to copy, distribute, link with or modify the Library
++subject to these terms and conditions. You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties with
++this License.
++
++ at item
++If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License. If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Library at all. For example, if a patent
++license would not permit royalty-free redistribution of the Library by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any
++particular circumstance, the balance of the section is intended to apply,
++and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system which is
++implemented by public license practices. Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++ at item
++If the distribution and/or use of the Library is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Library under this License may add
++an explicit geographical distribution limitation excluding those countries,
++so that distribution is permitted only in or among countries not thus
++excluded. In such case, this License incorporates the limitation as if
++written in the body of this License.
++
++ at item
++The Free Software Foundation may publish revised and/or new
++versions of the Lesser General Public License from time to time.
++Such new versions will be similar in spirit to the present version,
++but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Library
++specifies a version number of this License which applies to it and
++``any later version'', you have the option of following the terms and
++conditions either of that version or of any later version published by
++the Free Software Foundation. If the Library does not specify a
++license version number, you may choose any version ever published by
++the Free Software Foundation.
++
++ at item
++If you wish to incorporate parts of the Library into other free
++programs whose distribution conditions are incompatible with these,
++write to the author to ask for permission. For software which is
++copyrighted by the Free Software Foundation, write to the Free
++Software Foundation; we sometimes make exceptions for this. Our
++decision will be guided by the two goals of preserving the free status
++of all derivatives of our free software and of promoting the sharing
++and reuse of software generally.
++
++ at iftex
++ at heading NO WARRANTY
++ at end iftex
++ at ifinfo
++ at center NO WARRANTY
++
++ at end ifinfo
++
++ at item
++BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
++OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY
++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
++LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++ at item
++IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
++DAMAGES.
++ at end enumerate
++
++ at iftex
++ at heading END OF TERMS AND CONDITIONS
++ at end iftex
++ at ifinfo
++ at center END OF TERMS AND CONDITIONS
++
++ at end ifinfo
++
++ at page
++ at subheading How to Apply These Terms to Your New Libraries
++
++ If you develop a new library, and you want it to be of the greatest
++possible use to the public, we recommend making it free software that
++everyone can redistribute and change. You can do so by permitting
++redistribution under these terms (or, alternatively, under the terms of the
++ordinary General Public License).
++
++ To apply these terms, attach the following notices to the library. It is
++safest to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least the
++``copyright'' line and a pointer to where the full notice is found.
++
++ at smallexample
++ at var{one line to give the library's name and an idea of what it does.}
++Copyright (C) @var{year} @var{name of author}
++
++This library is free software; you can redistribute it and/or modify it
++under the terms of the GNU Lesser General Public License as published by
++the Free Software Foundation; either version 2.1 of the License, or (at
++your option) any later version.
++
++This library 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
++Lesser General Public License for more details.
++
++You should have received a copy of the GNU Lesser General Public
++License along with this library; if not, write to the Free Software
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++USA.
++ at end smallexample
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a ``copyright disclaimer'' for the library, if
++necessary. Here is a sample; alter the names:
++
++ at smallexample
++Yoyodyne, Inc., hereby disclaims all copyright interest in the library
++`Frob' (a library for tweaking knobs) written by James Random Hacker.
++
++ at var{signature of Ty Coon}, 1 April 1990
++Ty Coon, President of Vice
++ at end smallexample
++
++That's all there is to it!
+--- libmicrohttpd-0.9.24/doc/chapters.orig/basicauthentication.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/basicauthentication.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,159 @@
++With the small exception of IP address based access control,
++requests from all connecting clients where served equally until now.
++This chapter discusses a first method of client's authentication and
++its limits.
++
++A very simple approach feasible with the means already discussed would
++be to expect the password in the @emph{URI} string before granting access to
++the secured areas. The password could be separated from the actual resource identifier
++by a certain character, thus the request line might look like
++ at verbatim
++GET /picture.png?mypassword
++ at end verbatim
++ at noindent
++
++In the rare situation where the client is customized enough and the connection occurs
++through secured lines (e.g., a embedded device directly attached to another via wire)
++and where the ability to embedd a password in the URI or to pass on a URI with a
++password are desired, this can be a reasonable choice.
++
++But when it is assumed that the user connecting does so with an ordinary Internet browser,
++this implementation brings some problems about. For example, the URI including the password
++stays in the address field or at least in the history of the browser for anybody near enough to see.
++It will also be inconvenient to add the password manually to any new URI when the browser does
++not know how to compose this automatically.
++
++At least the convenience issue can be addressed by employing the simplest built-in password
++facilities of HTTP compliant browsers, hence we want to start there. It will however turn out
++to have still severe weaknesses in terms of security which need consideration.
++
++Before we will start implementing @emph{Basic Authentication} as described in @emph{RFC 2617},
++we should finally abandon the bad practice of responding every request the first time our callback
++is called for a given connection. This is becoming more important now because the client and
++the server will have to talk in a more bi-directional way than before to
++
++But how can we tell whether the callback has been called before for the particular connection?
++Initially, the pointer this parameter references is set by @emph{MHD} in the callback. But it will
++also be "remembered" on the next call (for the same connection).
++Thus, we will generate no response until the parameter is non-null---implying the callback was
++called before at least once. We do not need to share information between different calls of the callback,
++so we can set the parameter to any adress that is assured to be not null. The pointer to the
++ at code{connection} structure will be pointing to a legal address, so we take this.
++
++The first time @code{answer_to_connection} is called, we will not even look at the headers.
++
++ at verbatim
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method, const char *version,
++ const char *upload_data, size_t *upload_data_size,
++ void **con_cls)
++{
++ if (0 != strcmp(method, "GET")) return MHD_NO;
++ if (NULL == *con_cls) {*con_cls = connection; return MHD_YES;}
++
++ ...
++ /* else respond accordingly */
++ ...
++}
++ at end verbatim
++ at noindent
++
++Note how we lop off the connection on the first condition (no "GET" request), but return asking for more on
++the other one with @code{MHD_YES}.
++With this minor change, we can proceed to implement the actual authentication process.
++
++ at heading Request for authentication
++
++Let us assume we had only files not intended to be handed out without the correct username/password,
++so every "GET" request will be challenged.
++ at emph{RFC 2617} describes how the server shall ask for authentication by adding a
++ at emph{WWW-Authenticate} response header with the name of the @emph{realm} protected.
++MHD can generate and queue such a failure response for you using
++the @code{MHD_queue_basic_auth_fail_response} API. The only thing you need to do
++is construct a response with the error page to be shown to the user
++if he aborts basic authentication. But first, you should check if the
++proper credentials were already supplied using the
++ at code{MHD_basic_auth_get_username_password} call.
++
++Your code would then look like this:
++ at verbatim
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ char *user;
++ char *pass;
++ int fail;
++ struct MHD_Response *response;
++
++ if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
++ return MHD_NO;
++ if (NULL == *con_cls)
++ {
++ *con_cls = connection;
++ return MHD_YES;
++ }
++ pass = NULL;
++ user = MHD_basic_auth_get_username_password (connection, &pass);
++ fail = ( (user == NULL) ||
++ (0 != strcmp (user, "root")) ||
++ (0 != strcmp (pass, "pa$$w0rd") ) );
++ if (user != NULL) free (user);
++ if (pass != NULL) free (pass);
++ if (fail)
++ {
++ const char *page = "<html><body>Go away.</body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_PERSISTENT);
++ ret = MHD_queue_basic_auth_fail_response (connection,
++ "my realm",
++ response);
++ }
++ else
++ {
++ const char *page = "<html><body>A secret.</body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_PERSISTENT);
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ }
++ MHD_destroy_response (response);
++ return ret;
++}
++ at end verbatim
++
++See the @code{examples} directory for the complete example file.
++
++ at heading Remarks
++For a proper server, the conditional statements leading to a return of @code{MHD_NO} should yield a
++response with a more precise status code instead of silently closing the connection. For example,
++failures of memory allocation are best reported as @emph{internal server error} and unexpected
++authentication methods as @emph{400 bad request}.
++
++ at heading Exercises
++ at itemize @bullet
++ at item
++Make the server respond to wrong credentials (but otherwise well-formed requests) with the recommended
++ at emph{401 unauthorized} status code. If the client still does not authenticate correctly within the
++same connection, close it and store the client's IP address for a certain time. (It is OK to check for
++expiration not until the main thread wakes up again on the next connection.) If the client fails
++authenticating three times during this period, add it to another list for which the
++ at code{AcceptPolicyCallback} function denies connection (temporally).
++
++ at item
++With the network utility @code{netcat} connect and log the response of a "GET" request as you
++did in the exercise of the first example, this time to a file. Now stop the server and let @emph{netcat}
++listen on the same port the server used to listen on and have it fake being the proper server by giving
++the file's content as the response (e.g. @code{cat log | nc -l -p 8888}). Pretending to think your were
++connecting to the actual server, browse to the eavesdropper and give the correct credentials.
++
++Copy and paste the encoded string you see in @code{netcat}'s output to some of the Base64 decode tools available online
++and see how both the user's name and password could be completely restored.
++
++ at end itemize
++
++
+--- libmicrohttpd-0.9.24/doc/chapters.orig/bibliography.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/bibliography.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,29 @@
++ at heading API reference
++ at itemize @bullet
++ at item
++The @emph{GNU libmicrohttpd} manual by Marco Maggi and Christian Grothoff 2008
++ at uref{http://gnunet.org/libmicrohttpd/microhttpd.html}
++
++ at item
++All referenced RFCs can be found on the website of @emph{The Internet Engineering Task Force}
++ at uref{http://www.ietf.org/}
++
++ at item
++ at emph{RFC 2616}: Fielding, R., Gettys, J., Mogul, J., Frystyk, H., and T. Berners-Lee,
++"Hypertext Transfer Protocol -- HTTP/1.1", RFC 2016, January 1997.
++
++ at item
++ at emph{RFC 2617}: Franks, J., Hallam-Baker, P., Hostetler, J., Lawrence, S., Leach, P.,
++Luotonen, A., and L. Stewart, "HTTP Authentication: Basic and Digest Access Authentication", RFC 2617, June 1999.
++
++
++ at item
++A well--structured @emph{HTML} reference can be found on
++ at uref{http://www.echoecho.com/html.htm}
++
++For those readers understanding German or French, there is an excellent document both for learning
++ at emph{HTML} and for reference, whose English version unfortunately has been discontinued.
++ at uref{http://de.selfhtml.org/} and @uref{http://fr.selfhtml.org/}
++
++
++ at end itemize
+--- libmicrohttpd-0.9.24/doc/chapters.orig/exploringrequests.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/exploringrequests.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,109 @@
++This chapter will deal with the information which the client sends to the
++server at every request. We are going to examine the most useful fields of such an request
++and print them out in a readable manner. This could be useful for logging facilities.
++
++The starting point is the @emph{hellobrowser} program with the former response removed.
++
++This time, we just want to collect information in the callback function, thus we will
++just return MHD_NO after we have probed the request. This way, the connection is closed
++without much ado by the server.
++
++ at verbatim
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url,
++ const char *method, const char *version,
++ const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ ...
++ return MHD_NO;
++}
++ at end verbatim
++ at noindent
++The ellipsis marks the position where the following instructions shall be inserted.
++
++
++We begin with the most obvious information available to the server, the request line. You should
++already have noted that a request consists of a command (or "HTTP method") and a URI (e.g. a filename).
++It also contains a string for the version of the protocol which can be found in @code{version}.
++To call it a "new request" is justified because we return only @code{MHD_NO}, thus ensuring the
++function will not be called again for this connection.
++ at verbatim
++printf ("New %s request for %s using version %s\n", method, url, version);
++ at end verbatim
++ at noindent
++
++The rest of the information is a bit more hidden. Nevertheless, there is lot of it sent from common
++Internet browsers. It is stored in "key-value" pairs and we want to list what we find in the header.
++As there is no mandatory set of keys a client has to send, each key-value pair is printed out one by
++one until there are no more left. We do this by writing a separate function which will be called for
++each pair just like the above function is called for each HTTP request.
++It can then print out the content of this pair.
++ at verbatim
++int print_out_key (void *cls, enum MHD_ValueKind kind,
++ const char *key, const char *value)
++{
++ printf ("%s: %s\n", key, value);
++ return MHD_YES;
++}
++ at end verbatim
++ at noindent
++
++To start the iteration process that calls our new function for every key, the line
++ at verbatim
++MHD_get_connection_values (connection, MHD_HEADER_KIND, &print_out_key, NULL);
++ at end verbatim
++ at noindent
++needs to be inserted in the connection callback function too. The second parameter tells the function
++that we are only interested in keys from the general HTTP header of the request. Our iterating
++function @code{print_out_key} does not rely on any additional information to fulfill its duties
++so the last parameter can be NULL.
++
++All in all, this constitutes the complete @code{logging.c} program for this chapter which can be
++found in the @code{examples} section.
++
++Connecting with any modern Internet browser should yield a handful of keys. You should try to
++interpret them with the aid of @emph{RFC 2616}.
++Especially worth mentioning is the "Host" key which is often used to serve several different websites
++hosted under one single IP address but reachable by different domain names (this is called virtual hosting).
++
++ at heading Conclusion
++The introduced capabilities to itemize the content of a simple GET request---especially the
++URI---should already allow the server to satisfy clients' requests for small specific resources
++(e.g. files) or even induce alteration of server state. However, the latter is not
++recommended as the GET method (including its header data) is by convention considered a "safe"
++operation, which should not change the server's state in a significant way. By convention,
++GET operations can thus be performed by crawlers and other automatic software. Naturally
++actions like searching for a passed string are fine.
++
++Of course, no transmission can occur while the return value is still set to @code{MHD_NO} in the
++callback function.
++
++ at heading Exercises
++ at itemize @bullet
++ at item
++By parsing the @code{url} string and delivering responses accordingly, implement a small server for
++"virtual" files. When asked for @code{/index.htm@{l@}}, let the response consist of a HTML page
++containing a link to @code{/another.html} page which is also to be created "on the fly" in case of
++being requested. If neither of these two pages are requested, @code{MHD_HTTP_NOT_FOUND} shall be
++returned accompanied by an informative message.
++
++ at item
++A very interesting information has still been ignored by our logger---the client's IP address.
++Implement a callback function
++ at verbatim
++static int on_client_connect (void *cls,
++ const struct sockaddr *addr,
++ socklen_t addrlen)
++ at end verbatim
++ at noindent
++that prints out the IP address in an appropriate format. You might want to use the POSIX function
++ at code{inet_ntoa} but bear in mind that @code{addr} is actually just a structure containing other
++substructures and is @emph{not} the variable this function expects.
++Make sure to return @code{MHD_YES} so that the library knows the client is allowed to connect
++(and to then process the request). If one wanted to limit access basing on IP addresses, this would be the place
++to do it. The address of your @code{on_client_connect} function must be passed as the third parameter to the
++ at code{MHD_start_daemon} call.
++
++ at end itemize
+--- libmicrohttpd-0.9.24/doc/chapters.orig/hellobrowser.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/hellobrowser.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,222 @@
++The most basic task for a HTTP server is to deliver a static text message to any client connecting to it.
++Given that this is also easy to implement, it is an excellent problem to start with.
++
++For now, the particular URI the client asks for shall have no effect on the message that will
++be returned. In addition, the server shall end the connection after the message has been sent so that
++the client will know there is nothing more to expect.
++
++The C program @code{hellobrowser.c}, which is to be found in the examples section, does just that.
++If you are very eager, you can compile and start it right away but it is advisable to type the
++lines in by yourself as they will be discussed and explained in detail.
++
++After the necessary includes and the definition of the port which our server should listen on
++ at verbatim
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <microhttpd.h>
++
++#define PORT 8888
++
++ at end verbatim
++
++ at noindent
++the desired behaviour of our server when HTTP request arrive has to be implemented. We already have
++agreed that it should not care about the particular details of the request, such as who is requesting
++what. The server will respond merely with the same small HTML page to every request.
++
++The function we are going to write now will be called by @emph{GNU libmicrohttpd} every time an
++appropriate request comes in. While the name of this callback function is arbitrary, its parameter
++list has to follow a certain layout. So please, ignore the lot of parameters for now, they will be
++explained at the point they are needed. We have to use only one of them,
++ at code{struct MHD_Connection *connection}, for the minimalistic functionality we want to archive at the moment.
++
++This parameter is set by the @emph{libmicrohttpd} daemon and holds the necessary information to
++relate the call with a certain connection. Keep in mind that a server might have to satisfy hundreds
++of concurrent connections and we have to make sure that the correct data is sent to the destined
++client. Therefore, this variable is a means to refer to a particular connection if we ask the
++daemon to sent the reply.
++
++Talking about the reply, it is defined as a string right after the function header
++ at verbatim
++int answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url,
++ const char *method, const char *version,
++ const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ const char *page = "<html><body>Hello, browser!</body></html>";
++
++ at end verbatim
++
++ at noindent
++HTTP is a rather strict protocol and the client would certainly consider it "inappropriate" if we
++just sent the answer string "as is". Instead, it has to be wrapped with additional information stored in so-called headers and footers. Most of the work in this area is done by the library for us---we
++just have to ask. Our reply string packed in the necessary layers will be called a "response".
++To obtain such a response we hand our data (the reply--string) and its size over to the
++ at code{MHD_create_response_from_buffer} function. The last two parameters basically tell @emph{MHD}
++that we do not want it to dispose the message data for us when it has been sent and there also needs
++no internal copy to be done because the @emph{constant} string won't change anyway.
++
++ at verbatim
++ struct MHD_Response *response;
++ int ret;
++
++ response = MHD_create_response_from_buffer (strlen (page),
++ (void*) page, MHD_RESPMEM_PERSISTENT);
++
++ at end verbatim
++
++ at noindent
++Now that the the response has been laced up, it is ready for delivery and can be queued for sending.
++This is done by passing it to another @emph{GNU libmicrohttpd} function. As all our work was done in
++the scope of one function, the recipient is without doubt the one associated with the
++local variable @code{connection} and consequently this variable is given to the queue function.
++Every HTTP response is accompanied by a status code, here "OK", so that the client knows
++this response is the intended result of his request and not due to some error or malfunction.
++
++Finally, the packet is destroyed and the return value from the queue returned,
++already being set at this point to either MHD_YES or MHD_NO in case of success or failure.
++
++ at verbatim
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_destroy_response (response);
++
++ return ret;
++}
++
++ at end verbatim
++
++ at noindent
++With the primary task of our server implemented, we can start the actual server daemon which will listen
++on @code{PORT} for connections. This is done in the main function.
++ at verbatim
++int main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL, MHD_OPTION_END);
++ if (NULL == daemon) return 1;
++
++ at end verbatim
++
++ at noindent
++The first parameter is one of three possible modes of operation. Here we want the daemon to run in
++a separate thread and to manage all incoming connections in the same thread. This means that while
++producing the response for one connection, the other connections will be put on hold. In this
++example, where the reply is already known and therefore the request is served quickly, this poses no problem.
++
++We will allow all clients to connect regardless of their name or location, therefore we do not check
++them on connection and set the forth and fifth parameter to NULL.
++
++Parameter six is the address of the function we want to be called whenever a new connection has been
++established. Our @code{answer_to_connection} knows best what the client wants and needs no additional
++information (which could be passed via the next parameter) so the next parameter is NULL. Likewise,
++we do not need to pass extra options to the daemon so we just write the MHD_OPTION_END as the last parameter.
++
++As the server daemon runs in the background in its own thread, the execution flow in our main
++function will contine right after the call. Because of this, we must delay the execution flow in the
++main thread or else the program will terminate prematurely. We let it pause in a processing-time
++friendly manner by waiting for the enter key to be pressed. In the end, we stop the daemon so it can
++do its cleanup tasks.
++ at verbatim
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++ return 0;
++}
++
++ at end verbatim
++
++ at noindent
++The first example is now complete.
++
++Compile it with
++ at verbatim
++cc hellobrowser.c -o hellobrowser -I$PATH_TO_LIBMHD_INCLUDES
++ -L$PATH_TO_LIBMHD_LIBS -lmicrohttpd
++ at end verbatim
++with the two paths set accordingly and run it.
++
++Now open your favorite Internet browser and go to the address @code{http://localhost:8888/}, provided that 8888
++is the port you chose. If everything works as expected, the browser will present the message of the
++static HTML page it got from our minimal server.
++
++ at heading Remarks
++To keep this first example as small as possible, some drastic shortcuts were taken and are to be
++discussed now.
++
++Firstly, there is no distinction made between the kinds of requests a client could send. We implied
++that the client sends a GET request, that means, that he actually asked for some data. Even when
++it is not intended to accept POST requests, a good server should at least recognize that this
++request does not constitute a legal request and answer with an error code. This can be easily
++implemented by checking if the parameter @code{method} equals the string "GET" and returning a
++ at code{MHD_NO} if not so.
++
++Secondly, the above practice of queuing a response upon the first call of the callback function
++brings with it some limitations. This is because the content of the message body will not be
++received if a response is queued in the first iteration. Furthermore, the connection will be closed
++right after the response has been transferred then. This is typically not what you want as it
++disables HTTP pipelining. The correct approach is to simply not queue a message on the first
++callback unless there is an error. The @code{void**} argument to the callback provides a location
++for storing information about the history of the connection; for the first call, the pointer
++will point to NULL. A simplistic way to differenciate the first call from others is to check
++if the pointer is NULL and set it to a non-NULL value during the first call.
++
++Both of these issues you will find addressed in the official @code{minimal_example.c} residing in
++the @code{src/examples} directory of the @emph{MHD} package. The source code of this
++program should look very familiar to you by now and easy to understand.
++
++For our example, the @code{must_copy} and @code{must_free} parameter at the response construction
++function could be set to @code{MHD_NO}. In the usual case, responses cannot be sent immediately
++after being queued. For example, there might be other data on the system that needs to be sent with
++a higher priority. Nevertheless, the queue function will return successfully---raising the problem
++that the data we have pointed to may be invalid by the time it is about being sent. This is not an
++issue here because we can expect the @code{page} string, which is a constant @emph{string literal}
++here, to be static. That means it will be present and unchanged for as long as the program runs.
++For dynamic data, one could choose to either have @emph{MHD} free the memory @code{page} points
++to itself when it is not longer needed or, alternatively, have the library to make and manage
++its own copy of it.
++
++ at heading Exercises
++ at itemize @bullet
++ at item
++While the server is running, use a program like @code{telnet} or @code{netcat} to connect to it. Try to form a
++valid HTTP 1.1 request yourself like
++ at verbatim
++GET /dontcare HTTP/1.1
++Host: itsme
++<enter>
++ at end verbatim
++ at noindent
++and see what the server returns to you.
++
++
++ at item
++Also, try other requests, like POST, and see how our server does not mind and why.
++How far in malforming a request can you go before the builtin functionality of @emph{MHD} intervenes
++and an altered response is sent? Make sure you read about the status codes in the @emph{RFC}.
++
++
++ at item
++Add the option @code{MHD_USE_PEDANTIC_CHECKS} to the start function of the daemon in @code{main}.
++Mind the special format of the parameter list here which is described in the manual. How indulgent
++is the server now to your input?
++
++
++ at item
++Let the main function take a string as the first command line argument and pass @code{argv[1]} to
++the @code{MHD_start_daemon} function as the sixth parameter. The address of this string will be
++passed to the callback function via the @code{cls} variable. Decorate the text given at the command
++line when the server is started with proper HTML tags and send it as the response instead of the
++former static string.
++
++
++ at item
++ at emph{Demanding:} Write a separate function returning a string containing some useful information,
++for example, the time. Pass the function's address as the sixth parameter and evaluate this function
++on every request anew in @code{answer_to_connection}. Remember to free the memory of the string
++every time after satisfying the request.
++
++ at end itemize
+--- libmicrohttpd-0.9.24/doc/chapters.orig/introduction.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/introduction.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,23 @@
++This tutorial is for developers who want to learn how they can add HTTP serving
++capabilities to their applications with the @emph{GNU libmicrohttpd} library,
++abbreviated @emph{MHD}. The reader will learn how to
++implement basic HTTP functions from simple executable
++sample programs that implement various features.
++
++The text is supposed to be a supplement to the API reference manual of
++ at emph{GNU libmicrohttpd} and for that reason does not explain many of the parameters.
++Therefore, the reader should always consult the manual to find the exact meaning
++of the functions used in the tutorial. Furthermore, the reader is
++encouraged to study the relevant @emph{RFCs}, which document the HTTP standard.
++
++ at emph{GNU libmicrohttpd} is assumed to be already installed. This tutorial
++is written for version @value{VERSION}. At the time being,
++this tutorial has only been tested on @emph{GNU/Linux} machines even though
++efforts were made not to rely on anything that would prevent the samples from being
++built on similar systems.
++
++ at section History
++
++This tutorial was originally written by Sebastian Gerhardt for MHD
++0.4.0. It was slighly polished and updated to MHD 0.9.0 by Christian
++Grothoff.
+--- libmicrohttpd-0.9.24/doc/chapters.orig/largerpost.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/largerpost.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,319 @@
++The previous chapter introduced a way to upload data to the server, but the developed example program
++has some shortcomings, such as not being able to handle larger chunks of data. In this chapter, we
++are going to discuss a more advanced server program that allows clients to upload a file in order to
++have it stored on the server's filesystem. The server shall also watch and limit the number of
++clients concurrently uploading, responding with a proper busy message if necessary.
++
++
++ at heading Prepared answers
++We choose to operate the server with the @code{SELECT_INTERNALLY} method. This makes it easier to
++synchronize the global states at the cost of possible delays for other connections if the processing
++of a request is too slow. One of these variables that needs to be shared for all connections is the
++total number of clients that are uploading.
++
++ at verbatim
++#define MAXCLIENTS 2
++static unsigned int nr_of_uploading_clients = 0;
++ at end verbatim
++ at noindent
++
++If there are too many clients uploading, we want the server to respond to all requests with a busy
++message.
++ at verbatim
++const char* busypage =
++ "<html><body>This server is busy, please try again later.</body></html>";
++ at end verbatim
++ at noindent
++
++Otherwise, the server will send a @emph{form} that informs the user of the current number of uploading clients,
++and ask her to pick a file on her local filesystem which is to be uploaded.
++ at verbatim
++const char* askpage = "<html><body>\n\
++ Upload a file, please!<br>\n\
++ There are %u clients uploading at the moment.<br>\n\
++ <form action=\"/filepost\" method=\"post\" \
++ enctype=\"multipart/form-data\">\n\
++ <input name=\"file\" type=\"file\">\n\
++ <input type=\"submit\" value=\" Send \"></form>\n\
++ </body></html>";
++ at end verbatim
++ at noindent
++
++If the upload has succeeded, the server will respond with a message saying so.
++ at verbatim
++const char* completepage = "<html><body>The upload has been completed.</body></html>";
++ at end verbatim
++ at noindent
++
++We want the server to report internal errors, such as memory shortage or file access problems,
++adequately.
++ at verbatim
++const char* servererrorpage
++ = "<html><body>An internal server error has occured.</body></html>";
++const char* fileexistspage
++ = "<html><body>This file already exists.</body></html>";
++ at end verbatim
++ at noindent
++
++It would be tolerable to send all these responses undifferentiated with a @code{200 HTTP_OK}
++status code but in order to improve the @code{HTTP} conformance of our server a bit, we extend the
++ at code{send_page} function so that it accepts individual status codes.
++
++ at verbatim
++static int
++send_page (struct MHD_Connection *connection,
++ const char* page, int status_code)
++{
++ int ret;
++ struct MHD_Response *response;
++
++ response = MHD_create_response_from_buffer (strlen (page), (void*) page,
++ MHD_RESPMEM_MUST_COPY);
++ if (!response) return MHD_NO;
++
++ ret = MHD_queue_response (connection, status_code, response);
++ MHD_destroy_response (response);
++
++ return ret;
++}
++ at end verbatim
++ at noindent
++
++Note how we ask @emph{MHD} to make its own copy of the message data. The reason behind this will
++become clear later.
++
++
++ at heading Connection cycle
++The decision whether the server is busy or not is made right at the beginning of the connection. To
++do that at this stage is especially important for @emph{POST} requests because if no response is
++queued at this point, and @code{MHD_YES} returned, @emph{MHD} will not sent any queued messages until
++a postprocessor has been created and the post iterator is called at least once.
++
++ at verbatim
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url,
++ const char *method, const char *version,
++ const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ if (NULL == *con_cls)
++ {
++ struct connection_info_struct *con_info;
++
++ if (nr_of_uploading_clients >= MAXCLIENTS)
++ return send_page(connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE);
++ at end verbatim
++ at noindent
++
++If the server is not busy, the @code{connection_info} structure is initialized as usual, with
++the addition of a filepointer for each connection.
++
++ at verbatim
++ con_info = malloc (sizeof (struct connection_info_struct));
++ if (NULL == con_info) return MHD_NO;
++ con_info->fp = 0;
++
++ if (0 == strcmp (method, "POST"))
++ {
++ ...
++ }
++ else con_info->connectiontype = GET;
++
++ *con_cls = (void*) con_info;
++
++ return MHD_YES;
++ }
++ at end verbatim
++ at noindent
++
++For @emph{POST} requests, the postprocessor is created and we register a new uploading client. From
++this point on, there are many possible places for errors to occur that make it necessary to interrupt
++the uploading process. We need a means of having the proper response message ready at all times.
++Therefore, the @code{connection_info} structure is extended to hold the most current response
++message so that whenever a response is sent, the client will get the most informative message. Here,
++the structure is initialized to "no error".
++ at verbatim
++ if (0 == strcmp (method, "POST"))
++ {
++ con_info->postprocessor
++ = MHD_create_post_processor (connection, POSTBUFFERSIZE,
++ iterate_post, (void*) con_info);
++
++ if (NULL == con_info->postprocessor)
++ {
++ free (con_info);
++ return MHD_NO;
++ }
++
++ nr_of_uploading_clients++;
++
++ con_info->connectiontype = POST;
++ con_info->answercode = MHD_HTTP_OK;
++ con_info->answerstring = completepage;
++ }
++ else con_info->connectiontype = GET;
++ at end verbatim
++ at noindent
++
++If the connection handler is called for the second time, @emph{GET} requests will be answered with
++the @emph{form}. We can keep the buffer under function scope, because we asked @emph{MHD} to make its
++own copy of it for as long as it is needed.
++ at verbatim
++ if (0 == strcmp (method, "GET"))
++ {
++ int ret;
++ char buffer[1024];
++
++ sprintf (buffer, askpage, nr_of_uploading_clients);
++ return send_page (connection, buffer, MHD_HTTP_OK);
++ }
++ at end verbatim
++ at noindent
++
++
++The rest of the @code{answer_to_connection} function is very similar to the @code{simplepost.c}
++example, except the more flexible content of the responses. The @emph{POST} data is processed until
++there is none left and the execution falls through to return an error page if the connection
++constituted no expected request method.
++ at verbatim
++ if (0 == strcmp (method, "POST"))
++ {
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (0 != *upload_data_size)
++ {
++ MHD_post_process (con_info->postprocessor,
++ upload_data, *upload_data_size);
++ *upload_data_size = 0;
++
++ return MHD_YES;
++ }
++ else
++ return send_page (connection, con_info->answerstring,
++ con_info->answercode);
++ }
++
++ return send_page(connection, errorpage, MHD_HTTP_BAD_REQUEST);
++}
++ at end verbatim
++ at noindent
++
++
++ at heading Storing to data
++Unlike the @code{simplepost.c} example, here it is to be expected that post iterator will be called
++several times now. This means that for any given connection (there might be several concurrent of them)
++the posted data has to be written to the correct file. That is why we store a file handle in every
++ at code{connection_info}, so that the it is preserved between successive iterations.
++ at verbatim
++static int
++iterate_post (void *coninfo_cls, enum MHD_ValueKind kind,
++ const char *key,
++ const char *filename, const char *content_type,
++ const char *transfer_encoding, const char *data,
++ uint64_t off, size_t size)
++{
++ struct connection_info_struct *con_info = coninfo_cls;
++ at end verbatim
++ at noindent
++
++Because the following actions depend heavily on correct file processing, which might be error prone,
++we default to reporting internal errors in case anything will go wrong.
++
++ at verbatim
++con_info->answerstring = servererrorpage;
++con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR;
++ at end verbatim
++ at noindent
++
++In the "askpage" @emph{form}, we told the client to label its post data with the "file" key. Anything else
++would be an error.
++
++ at verbatim
++ if (0 != strcmp (key, "file")) return MHD_NO;
++ at end verbatim
++ at noindent
++
++If the iterator is called for the first time, no file will have been opened yet. The @code{filename}
++string contains the name of the file (without any paths) the user selected on his system. We want to
++take this as the name the file will be stored on the server and make sure no file of that name exists
++(or is being uploaded) before we create one (note that the code below technically contains a
++race between the two "fopen" calls, but we will overlook this for portability sake).
++ at verbatim
++ if (!con_info->fp)
++ {
++ if (NULL != (fp = fopen (filename, "rb")) )
++ {
++ fclose (fp);
++ con_info->answerstring = fileexistspage;
++ con_info->answercode = MHD_HTTP_FORBIDDEN;
++ return MHD_NO;
++ }
++
++ con_info->fp = fopen (filename, "ab");
++ if (!con_info->fp) return MHD_NO;
++ }
++ at end verbatim
++ at noindent
++
++
++Occasionally, the iterator function will be called even when there are 0 new bytes to process. The
++server only needs to write data to the file if there is some.
++ at verbatim
++if (size > 0)
++ {
++ if (!fwrite (data, size, sizeof(char), con_info->fp))
++ return MHD_NO;
++ }
++ at end verbatim
++ at noindent
++
++If this point has been reached, everything worked well for this iteration and the response can
++be set to success again. If the upload has finished, this iterator function will not be called again.
++ at verbatim
++ con_info->answerstring = completepage;
++ con_info->answercode = MHD_HTTP_OK;
++
++ return MHD_YES;
++}
++ at end verbatim
++ at noindent
++
++
++The new client was registered when the postprocessor was created. Likewise, we unregister the client
++on destroying the postprocessor when the request is completed.
++ at verbatim
++void request_completed (void *cls, struct MHD_Connection *connection,
++ void **con_cls,
++ enum MHD_RequestTerminationCode toe)
++{
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (NULL == con_info) return;
++
++ if (con_info->connectiontype == POST)
++ {
++ if (NULL != con_info->postprocessor)
++ {
++ MHD_destroy_post_processor (con_info->postprocessor);
++ nr_of_uploading_clients--;
++ }
++
++ if (con_info->fp) fclose (con_info->fp);
++ }
++
++ free (con_info);
++ *con_cls = NULL;
++}
++ at end verbatim
++ at noindent
++
++
++This is essentially the whole example @code{largepost.c}.
++
++
++ at heading Remarks
++Now that the clients are able to create files on the server, security aspects are becoming even more
++important than before. Aside from proper client authentication, the server should always make sure
++explicitly that no files will be created outside of a dedicated upload directory. In particular,
++filenames must be checked to not contain strings like "../".
+--- libmicrohttpd-0.9.24/doc/chapters.orig/processingpost.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/processingpost.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,238 @@
++The previous chapters already have demonstrated a variety of possibilities to send information
++to the HTTP server, but it is not recommended that the @emph{GET} method is used to alter the way
++the server operates. To induce changes on the server, the @emph{POST} method is preferred over
++and is much more powerful than @emph{GET} and will be introduced in this chapter.
++
++We are going to write an application that asks for the visitor's name and, after the user has posted it,
++composes an individual response text. Even though it was not mandatory to use the @emph{POST} method here,
++as there is no permanent change caused by the POST, it is an illustrative example on how to share data
++between different functions for the same connection. Furthermore, the reader should be able to extend
++it easily.
++
++ at heading GET request
++When the first @emph{GET} request arrives, the server shall respond with a HTML page containing an
++edit field for the name.
++
++ at verbatim
++const char* askpage = "<html><body>\
++ What's your name, Sir?<br>\
++ <form action=\"/namepost\" method=\"post\">\
++ <input name=\"name\" type=\"text\"\
++ <input type=\"submit\" value=\" Send \"></form>\
++ </body></html>";
++ at end verbatim
++ at noindent
++
++The @code{action} entry is the @emph{URI} to be called by the browser when posting, and the
++ at code{name} will be used later to be sure it is the editbox's content that has been posted.
++
++We also prepare the answer page, where the name is to be filled in later, and an error page
++as the response for anything but proper @emph{GET} and @emph{POST} requests:
++
++ at verbatim
++const char* greatingpage="<html><body><h1>Welcome, %s!</center></h1></body></html>";
++
++const char* errorpage="<html><body>This doesn't seem to be right.</body></html>";
++ at end verbatim
++ at noindent
++
++Whenever we need to send a page, we use an extra function
++ at code{int send_page(struct MHD_Connection *connection, const char* page)}
++for this, which does not contain anything new and whose implementation is therefore
++not discussed further in the tutorial.
++
++
++ at heading POST request
++Posted data can be of arbitrary and considerable size; for example, if a user uploads a big
++image to the server. Similar to the case of the header fields, there may also be different streams
++of posted data, such as one containing the text of an editbox and another the state of a button.
++Likewise, we will have to register an iterator function that is going to be called maybe several times
++not only if there are different POSTs but also if one POST has only been received partly yet and
++needs processing before another chunk can be received.
++
++Such an iterator function is called by a @emph{postprocessor}, which must be created upon arriving
++of the post request. We want the iterator function to read the first post data which is tagged
++ at code{name} and to create an individual greeting string based on the template and the name.
++But in order to pass this string to other functions and still be able to differentiate different
++connections, we must first define a structure to share the information, holding the most import entries.
++
++ at verbatim
++struct connection_info_struct
++{
++ int connectiontype;
++ char *answerstring;
++ struct MHD_PostProcessor *postprocessor;
++};
++ at end verbatim
++ at noindent
++
++With these information available to the iterator function, it is able to fulfill its task.
++Once it has composed the greeting string, it returns @code{MHD_NO} to inform the post processor
++that it does not need to be called again. Note that this function does not handle processing
++of data for the same @code{key}. If we were to expect that the name will be posted in several
++chunks, we had to expand the namestring dynamically as additional parts of it with the same @code{key}
++came in. But in this example, the name is assumed to fit entirely inside one single packet.
++
++ at verbatim
++static int
++iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key,
++ const char *filename, const char *content_type,
++ const char *transfer_encoding, const char *data,
++ uint64_t off, size_t size)
++{
++ struct connection_info_struct *con_info = coninfo_cls;
++
++ if (0 == strcmp (key, "name"))
++ {
++ if ((size > 0) && (size <= MAXNAMESIZE))
++ {
++ char *answerstring;
++ answerstring = malloc (MAXANSWERSIZE);
++ if (!answerstring) return MHD_NO;
++
++ snprintf (answerstring, MAXANSWERSIZE, greatingpage, data);
++ con_info->answerstring = answerstring;
++ }
++ else con_info->answerstring = NULL;
++
++ return MHD_NO;
++ }
++
++ return MHD_YES;
++}
++ at end verbatim
++ at noindent
++
++Once a connection has been established, it can be terminated for many reasons. As these
++reasons include unexpected events, we have to register another function that cleans up any resources
++that might have been allocated for that connection by us, namely the post processor and the greetings
++string. This cleanup function must take into account that it will also be called for finished
++requests other than @emph{POST} requests.
++
++ at verbatim
++void request_completed (void *cls, struct MHD_Connection *connection,
++ void **con_cls,
++ enum MHD_RequestTerminationCode toe)
++{
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (NULL == con_info) return;
++ if (con_info->connectiontype == POST)
++ {
++ MHD_destroy_post_processor (con_info->postprocessor);
++ if (con_info->answerstring) free (con_info->answerstring);
++ }
++
++ free (con_info);
++ *con_cls = NULL;
++}
++ at end verbatim
++ at noindent
++
++ at emph{GNU libmicrohttpd} is informed that it shall call the above function when the daemon is started
++in the main function.
++
++ at verbatim
++...
++daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL,
++ MHD_OPTION_NOTIFY_COMPLETED, &request_completed, NULL,
++ MHD_OPTION_END);
++...
++ at end verbatim
++ at noindent
++
++ at heading Request handling
++With all other functions prepared, we can now discuss the actual request handling.
++
++On the first iteration for a new request, we start by allocating a new instance of a
++ at code{struct connection_info_struct} structure, which will store all necessary information for later
++iterations and other functions.
++
++ at verbatim
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url,
++ const char *method, const char *version,
++ const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ if(NULL == *con_cls)
++ {
++ struct connection_info_struct *con_info;
++
++ con_info = malloc (sizeof (struct connection_info_struct));
++ if (NULL == con_info) return MHD_NO;
++ con_info->answerstring = NULL;
++ at end verbatim
++ at noindent
++
++If the new request is a @emph{POST}, the postprocessor must be created now. In addition, the type
++of the request is stored for convenience.
++ at verbatim
++ if (0 == strcmp (method, "POST"))
++ {
++ con_info->postprocessor
++ = MHD_create_post_processor (connection, POSTBUFFERSIZE,
++ iterate_post, (void*) con_info);
++
++ if (NULL == con_info->postprocessor)
++ {
++ free (con_info);
++ return MHD_NO;
++ }
++ con_info->connectiontype = POST;
++ }
++ else con_info->connectiontype = GET;
++ at end verbatim
++ at noindent
++
++The address of our structure will both serve as the indicator for successive iterations and to remember
++the particular details about the connection.
++ at verbatim
++ *con_cls = (void*) con_info;
++ return MHD_YES;
++ }
++ at end verbatim
++ at noindent
++
++The rest of the function will not be executed on the first iteration. A @emph{GET} request is easily
++satisfied by sending the question form.
++ at verbatim
++ if (0 == strcmp (method, "GET"))
++ {
++ return send_page (connection, askpage);
++ }
++ at end verbatim
++ at noindent
++
++In case of @emph{POST}, we invoke the post processor for as long as data keeps incoming, setting
++ at code{*upload_data_size} to zero in order to indicate that we have processed---or at least have
++considered---all of it.
++ at verbatim
++ if (0 == strcmp (method, "POST"))
++ {
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (*upload_data_size != 0)
++ {
++ MHD_post_process (con_info->postprocessor, upload_data,
++ *upload_data_size);
++ *upload_data_size = 0;
++
++ return MHD_YES;
++ }
++ else if (NULL != con_info->answerstring)
++ return send_page (connection, con_info->answerstring);
++ }
++ at end verbatim
++ at noindent
++
++Finally, if they are neither @emph{GET} nor @emph{POST} requests, the error page is returned.
++ at verbatim
++ return send_page(connection, errorpage);
++}
++ at end verbatim
++ at noindent
++
++These were the important parts of the program @code{simplepost.c}.
+--- libmicrohttpd-0.9.24/doc/chapters.orig/responseheaders.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/responseheaders.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,193 @@
++Now that we are able to inspect the incoming request in great detail,
++this chapter discusses the means to enrich the outgoing responses likewise.
++
++As you have learned in the @emph{Hello, Browser} chapter, some obligatory
++header fields are added and set automatically for simple responses by the library
++itself but if more advanced features are desired, additional fields have to be created.
++One of the possible fields is the content type field and an example will be developed around it.
++This will lead to an application capable of correctly serving different types of files.
++
++
++When we responded with HTML page packed in the static string previously, the client had no choice
++but guessing about how to handle the response, because the server had not told him.
++What if we had sent a picture or a sound file? Would the message have been understood
++or merely been displayed as an endless stream of random characters in the browser?
++This is what the mime content types are for. The header of the response is extended
++by certain information about how the data is to be interpreted.
++
++To introduce the concept, a picture of the format @emph{PNG} will be sent to the client
++and labeled accordingly with @code{image/png}.
++Once again, we can base the new example on the @code{hellobrowser} program.
++
++ at verbatim
++#define FILENAME "picture.png"
++#define MIMETYPE "image/png"
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url,
++ const char *method, const char *version,
++ const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ unsigned char *buffer = NULL;
++ struct MHD_Response *response;
++ at end verbatim
++ at noindent
++
++We want the program to open the file for reading and determine its size:
++ at verbatim
++ int fd;
++ int ret;
++ struct stat sbuf;
++
++ if (0 != strcmp (method, "GET"))
++ return MHD_NO;
++ if ( (-1 == (fd = open (FILENAME, O_RDONLY))) ||
++ (0 != fstat (fd, &sbuf)) )
++ {
++ /* error accessing file */
++ /* ... (see below) */
++ }
++ /* ... (see below) */
++ at end verbatim
++ at noindent
++
++When dealing with files, there is a lot that could go wrong on the
++server side and if so, the client should be informed with @code{MHD_HTTP_INTERNAL_SERVER_ERROR}.
++
++ at verbatim
++ /* error accessing file */
++ if (fd != -1) close (fd);
++ const char *errorstr =
++ "<html><body>An internal server error has occured!\
++ </body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (errorstr),
++ (void *) errorstr,
++ MHD_RESPMEM_PERSISTENT);
++ if (response)
++ {
++ ret =
++ MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR,
++ response);
++ MHD_destroy_response (response);
++
++ return MHD_YES;
++ }
++ else
++ return MHD_NO;
++ if (!ret)
++ {
++ const char *errorstr = "<html><body>An internal server error has occured!\
++ </body></html>";
++
++ if (buffer) free(buffer);
++
++ response = MHD_create_response_from_buffer (strlen(errorstr), (void*) errorstr,
++ MHD_RESPMEM_PERSISTENT);
++
++ if (response)
++ {
++ ret = MHD_queue_response (connection,
++ MHD_HTTP_INTERNAL_SERVER_ERROR,
++ response);
++ MHD_destroy_response (response);
++
++ return MHD_YES;
++ }
++ else return MHD_NO;
++ }
++ at end verbatim
++ at noindent
++
++Note that we nevertheless have to create a response object even for sending a simple error code.
++Otherwise, the connection would just be closed without comment, leaving the client curious about
++what has happened.
++
++But in the case of success a response will be constructed directly from the file descriptor:
++
++ at verbatim
++ /* error accessing file */
++ /* ... (see above) */
++ }
++
++ response =
++ MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0);
++ MHD_add_response_header (response, "Content-Type", MIMETYPE);
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_destroy_response (response);
++ at end verbatim
++ at noindent
++
++Note that the response object will take care of closing the file desciptor for us.
++
++Up to this point, there was little new. The actual novelty is that we enhance the header with the
++meta data about the content. Aware of the field's name we want to add, it is as easy as that:
++ at verbatim
++MHD_add_response_header(response, "Content-Type", MIMETYPE);
++ at end verbatim
++ at noindent
++We do not have to append a colon expected by the protocol behind the first
++field--- at emph{GNU libhttpdmicro} will take care of this.
++
++The function finishes with the well-known lines
++ at verbatim
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_destroy_response (response);
++ return ret;
++}
++ at end verbatim
++ at noindent
++
++The complete program @code{responseheaders.c} is in the @code{examples} section as usual.
++Find a @emph{PNG} file you like and save it to the directory the example is run from under the name
++ at code{picture.png}. You should find the image displayed on your browser if everything worked well.
++
++ at heading Remarks
++The include file of the @emph{MHD} library comes with the header types mentioned in @emph{RFC 2616}
++already defined as macros. Thus, we could have written @code{MHD_HTTP_HEADER_CONTENT_TYPE} instead
++of @code{"Content-Type"} as well. However, one is not limited to these standard headers and could
++add custom response headers without violating the protocol. Whether, and how, the client would react
++to these custom header is up to the receiver. Likewise, the client is allowed to send custom request
++headers to the server as well, opening up yet more possibilities how client and server could
++communicate with each other.
++
++The method of creating the response from a file on disk only works for static content.
++Serving dynamically created responses will be a topic of a future chapter.
++
++ at heading Exercises
++ at itemize @bullet
++
++ at item
++Remember that the original program was written under a few assumptions---a static response
++using a local file being one of them. In order to simulate a very large or hard to reach file that cannot be provided
++instantly, postpone the queuing in the callback with the @code{sleep} function for 30 seconds
++ at emph{if} the file @code{/big.png} is requested (but deliver the same as above). A request for
++ at code{/picture.png} should provide just the same but without any artificial delays.
++
++Now start two instances of your browser (or even use two machines) and see how the second client
++is put on hold while the first waits for his request on the slow file to be fulfilled.
++
++Finally, change the sourcecode to use @code{MHD_USE_THREAD_PER_CONNECTION} when the daemon is
++started and try again.
++
++
++ at item
++Did you succeed in implementing the clock exercise yet? This time, let the server save the
++program's start time @code{t} and implement a response simulating a countdown that reaches 0 at
++ at code{t+60}. Returning a message saying on which point the countdown is, the response should
++ultimately be to reply "Done" if the program has been running long enough,
++
++An unofficial, but widely understood, response header line is @code{Refresh: DELAY; url=URL} with
++the uppercase words substituted to tell the client it should request the given resource after
++the given delay again. Improve your program in that the browser (any modern browser should work)
++automatically reconnects and asks for the status again every 5 seconds or so. The URL would have
++to be composed so that it begins with "http://", followed by the @emph{URI} the server is reachable
++from the client's point of view.
++
++Maybe you want also to visualize the countdown as a status bar by creating a
++ at code{<table>} consisting of one row and @code{n} columns whose fields contain small images of either
++a red or a green light.
++
++ at end itemize
+--- libmicrohttpd-0.9.24/doc/chapters.orig/sessions.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/sessions.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,71 @@
++This chapter discusses how one should manage sessions, that is, share state between multiple
++HTTP requests from the same user. We use a simple example where the user submits multiple
++forms and the server is supposed to accumulate state from all of these forms. Naturally, as
++this is a network protocol, our session mechanism must support having many users with
++many concurrent sessions at the same time.
++
++In order to track users, we use a simple session cookie. A session cookie expires when the
++user closes the browser. Changing from session cookies to persistent cookies only requires
++adding an expiration time to the cookie. The server creates a fresh session cookie whenever
++a request without a cookie is received, or if the supplied session cookie is not known to
++the server.
++
++ at heading Looking up the cookie
++
++Since MHD parses the HTTP cookie header for us, looking up an existing cookie
++is straightforward:
++
++ at verbatim
++FIXME.
++ at end verbatim
++
++Here, FIXME is the name we chose for our session cookie.
++
++
++ at heading Setting the cookie header
++
++MHD requires the user to provide the full cookie format string in order to set
++cookies. In order to generate a unique cookie, our example creates a random
++64-character text string to be used as the value of the cookie:
++
++ at verbatim
++FIXME.
++ at end verbatim
++
++Given this cookie value, we can then set the cookie header in our HTTP response
++as follows:
++
++ at verbatim
++FIXME.
++ at end verbatim
++
++
++ at heading Remark: Session expiration
++
++It is of course possible that clients stop their interaction with the
++server at any time. In order to avoid using too much storage, the
++server must thus discard inactive sessions at some point. Our example
++implements this by discarding inactive sessions after a certain amount
++of time. Alternatively, the implementation may limit the total number
++of active sessions. Which bounds are used for idle sessions or the
++total number of sessions obviously depends largely on the type of
++the application and available server resources.
++
++ at heading Example code
++
++A sample application implementing a website with multiple
++forms (which are dynamically created using values from previous
++POST requests from the same session) is available
++as the example @code{sessions.c}.
++
++Note that the example uses a simple, $O(n)$ linked list traversal to
++look up sessions and to expire old sessions. Using a hash table and a
++heap would be more appropriate if a large number of concurrent
++sessions is expected.
++
++ at heading Remarks
++
++Naturally, it is quite conceivable to store session data in a database
++instead of in memory. Still, having mechanisms to expire data
++associated with long-time idle sessions (where the business process
++has still not finished) is likely a good idea.
+--- libmicrohttpd-0.9.24/doc/chapters.orig/tlsauthentication.inc 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/chapters/tlsauthentication.inc 2013-01-03 19:12:00.176374962 +0100
+@@ -0,0 +1,317 @@
++We left the basic authentication chapter with the unsatisfactory conclusion that
++any traffic, including the credentials, could be intercepted by anyone between
++the browser client and the server. Protecting the data while it is sent over
++unsecured lines will be the goal of this chapter.
++
++Since version 0.4, the @emph{MHD} library includes support for encrypting the
++traffic by employing SSL/TSL. If @emph{GNU libmicrohttpd} has been configured to
++support these, encryption and decryption can be applied transparently on the
++data being sent, with only minimal changes to the actual source code of the example.
++
++
++ at heading Preparation
++
++First, a private key for the server will be generated. With this key, the server
++will later be able to authenticate itself to the client---preventing anyone else
++from stealing the password by faking its identity. The @emph{OpenSSL} suite, which
++is available on many operating systems, can generate such a key. For the scope of
++this tutorial, we will be content with a 1024 bit key:
++ at verbatim
++> openssl genrsa -out server.key 1024
++ at end verbatim
++ at noindent
++
++In addition to the key, a certificate describing the server in human readable tokens
++is also needed. This certificate will be attested with our aforementioned key. In this way,
++we obtain a self-signed certificate, valid for one year.
++
++ at verbatim
++> openssl req -days 365 -out server.pem -new -x509 -key server.key
++ at end verbatim
++ at noindent
++
++To avoid unnecessary error messages in the browser, the certificate needs to
++have a name that matches the @emph{URI}, for example, "localhost" or the domain.
++If you plan to have a publicly reachable server, you will need to ask a trusted third party,
++called @emph{Certificate Authority}, or @emph{CA}, to attest the certificate for you. This way,
++any visitor can make sure the server's identity is real.
++
++Whether the server's certificate is signed by us or a third party, once it has been accepted
++by the client, both sides will be communicating over encrypted channels. From this point on,
++it is the client's turn to authenticate itself. But this has already been implemented in the basic
++authentication scheme.
++
++
++ at heading Changing the source code
++
++We merely have to extend the server program so that it loads the two files into memory,
++
++ at verbatim
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++ char *key_pem;
++ char *cert_pem;
++
++ key_pem = load_file (SERVERKEYFILE);
++ cert_pem = load_file (SERVERCERTFILE);
++
++ if ((key_pem == NULL) || (cert_pem == NULL))
++ {
++ printf ("The key/certificate files could not be read.\n");
++ return 1;
++ }
++ at end verbatim
++ at noindent
++
++and then we point the @emph{MHD} daemon to it upon initalization.
++ at verbatim
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL,
++ PORT, NULL, NULL,
++ &answer_to_connection, NULL,
++ MHD_OPTION_HTTPS_MEM_KEY, key_pem,
++ MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
++ MHD_OPTION_END);
++
++ if (NULL == daemon)
++ {
++ printf ("%s\n", cert_pem);
++
++ free (key_pem);
++ free (cert_pem);
++
++ return 1;
++ }
++ at end verbatim
++ at noindent
++
++
++The rest consists of little new besides some additional memory cleanups.
++ at verbatim
++
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++ free (key_pem);
++ free (cert_pem);
++
++ return 0;
++}
++ at end verbatim
++ at noindent
++
++
++The rather unexciting file loader can be found in the complete example @code{tlsauthentication.c}.
++
++
++ at heading Remarks
++ at itemize @bullet
++ at item
++While the standard @emph{HTTP} port is 80, it is 443 for @emph{HTTPS}. The common internet browsers assume
++standard @emph{HTTP} if they are asked to access other ports than these. Therefore, you will have to type
++ at code{https://localhost:8888} explicitly when you test the example, or the browser will not know how to
++handle the answer properly.
++
++ at item
++The remaining weak point is the question how the server will be trusted initially. Either a @emph{CA} signs the
++certificate or the client obtains the key over secure means. Anyway, the clients have to be aware (or configured)
++that they should not accept certificates of unknown origin.
++
++ at item
++The introduced method of certificates makes it mandatory to set an expiration date---making it less feasible to
++hardcode certificates in embedded devices.
++
++ at item
++The cryptographic facilities consume memory space and computing time. For this reason, websites usually consists
++both of uncritically @emph{HTTP} parts and secured @emph{HTTPS}.
++
++ at end itemize
++
++
++ at heading Client authentication
++
++You can also use MHD to authenticate the client via SSL/TLS certificates
++(as an alternative to using the password-based Basic or Digest authentication).
++To do this, you will need to link your application against @emph{gnutls}.
++Next, when you start the MHD daemon, you must specify the root CA that you're
++willing to trust:
++ at verbatim
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_SSL,
++ PORT, NULL, NULL,
++ &answer_to_connection, NULL,
++ MHD_OPTION_HTTPS_MEM_KEY, key_pem,
++ MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
++ MHD_OPTION_HTTPS_MEM_TRUST, root_ca_pem,
++ MHD_OPTION_END);
++ at end verbatim
++
++With this, you can then obtain client certificates for each session.
++In order to obtain the identity of the client, you first need to
++obtain the raw GnuTLS session handle from @emph{MHD} using
++ at code{MHD_get_connection_info}.
++
++ at verbatim
++#include <gnutls/gnutls.h>
++#include <gnutls/x509.h>
++
++gnutls_session_t tls_session;
++union MHD_ConnectionInfo *ci;
++
++ci = MHD_get_connection_info (connection,
++ MHD_CONNECTION_INFO_GNUTLS_SESSION);
++tls_session = ci->tls_session;
++ at end verbatim
++
++You can then extract the client certificate:
++
++ at verbatim
++/**
++ * Get the client's certificate
++ *
++ * @param tls_session the TLS session
++ * @return NULL if no valid client certificate could be found, a pointer
++ * to the certificate if found
++ */
++static gnutls_x509_crt_t
++get_client_certificate (gnutls_session_t tls_session)
++{
++ unsigned int listsize;
++ const gnutls_datum_t * pcert;
++ gnutls_certificate_status_t client_cert_status;
++ gnutls_x509_crt_t client_cert;
++
++ if (tls_session == NULL)
++ return NULL;
++ if (gnutls_certificate_verify_peers2(tls_session,
++ &client_cert_status))
++ return NULL;
++ pcert = gnutls_certificate_get_peers(tls_session,
++ &listsize);
++ if ( (pcert == NULL) ||
++ (listsize == 0))
++ {
++ fprintf (stderr,
++ "Failed to retrieve client certificate chain\n");
++ return NULL;
++ }
++ if (gnutls_x509_crt_init(&client_cert))
++ {
++ fprintf (stderr,
++ "Failed to initialize client certificate\n");
++ return NULL;
++ }
++ /* Note that by passing values between 0 and listsize here, you
++ can get access to the CA's certs */
++ if (gnutls_x509_crt_import(client_cert,
++ &pcert[0],
++ GNUTLS_X509_FMT_DER))
++ {
++ fprintf (stderr,
++ "Failed to import client certificate\n");
++ gnutls_x509_crt_deinit(client_cert);
++ return NULL;
++ }
++ return client_cert;
++}
++ at end verbatim
++
++Using the client certificate, you can then get the client's distinguished name
++and alternative names:
++
++ at verbatim
++/**
++ * Get the distinguished name from the client's certificate
++ *
++ * @param client_cert the client certificate
++ * @return NULL if no dn or certificate could be found, a pointer
++ * to the dn if found
++ */
++char *
++cert_auth_get_dn(gnutls_x509_crt_c client_cert)
++{
++ char* buf;
++ size_t lbuf;
++
++ lbuf = 0;
++ gnutls_x509_crt_get_dn(client_cert, NULL, &lbuf);
++ buf = malloc(lbuf);
++ if (buf == NULL)
++ {
++ fprintf (stderr,
++ "Failed to allocate memory for certificate dn\n");
++ return NULL;
++ }
++ gnutls_x509_crt_get_dn(client_cert, buf, &lbuf);
++ return buf;
++}
++
++
++/**
++ * Get the alternative name of specified type from the client's certificate
++ *
++ * @param client_cert the client certificate
++ * @param nametype The requested name type
++ * @param index The position of the alternative name if multiple names are
++ * matching the requested type, 0 for the first matching name
++ * @return NULL if no matching alternative name could be found, a pointer
++ * to the alternative name if found
++ */
++char *
++MHD_cert_auth_get_alt_name(gnutls_x509_crt_t client_cert,
++ int nametype,
++ unsigned int index)
++{
++ char* buf;
++ size_t lbuf;
++ unsigned int seq;
++ unsigned int subseq;
++ unsigned int type;
++ int result;
++
++ subseq = 0;
++ for (seq=0;;seq++)
++ {
++ lbuf = 0;
++ result = gnutls_x509_crt_get_subject_alt_name2(client_cert, seq, NULL, &lbuf,
++ &type, NULL);
++ if (result == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
++ return NULL;
++ if (nametype != (int) type)
++ continue;
++ if (subseq == index)
++ break;
++ subseq++;
++ }
++ buf = malloc(lbuf);
++ if (buf == NULL)
++ {
++ fprintf (stderr,
++ "Failed to allocate memory for certificate alt name\n");
++ return NULL;
++ }
++ result = gnutls_x509_crt_get_subject_alt_name2(client_cert,
++ seq,
++ buf,
++ &lbuf,
++ NULL, NULL);
++ if (result != nametype)
++ {
++ fprintf (stderr,
++ "Unexpected return value from gnutls: %d\n",
++ result);
++ free (buf);
++ return NULL;
++ }
++ return buf;
++}
++ at end verbatim
++
++Finally, you should release the memory associated with the client
++certificate:
++
++ at verbatim
++gnutls_x509_crt_deinit (client_cert);
++ at end verbatim
++
+--- libmicrohttpd-0.9.24/doc/examples.orig/basicauthentication.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/basicauthentication.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,79 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <microhttpd.h>
++#include <time.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
++
++#define PORT 8888
++
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ char *user;
++ char *pass;
++ int fail;
++ int ret;
++ struct MHD_Response *response;
++
++ if (0 != strcmp (method, "GET"))
++ return MHD_NO;
++ if (NULL == *con_cls)
++ {
++ *con_cls = connection;
++ return MHD_YES;
++ }
++ pass = NULL;
++ user = MHD_basic_auth_get_username_password (connection, &pass);
++ fail = ( (user == NULL) ||
++ (0 != strcmp (user, "root")) ||
++ (0 != strcmp (pass, "pa$$w0rd") ) );
++ if (user != NULL) free (user);
++ if (pass != NULL) free (pass);
++ if (fail)
++ {
++ const char *page = "<html><body>Go away.</body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_PERSISTENT);
++ ret = MHD_queue_basic_auth_fail_response (connection,
++ "my realm",
++ response);
++ }
++ else
++ {
++ const char *page = "<html><body>A secret.</body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_PERSISTENT);
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ }
++ MHD_destroy_response (response);
++ return ret;
++}
++
++
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL, MHD_OPTION_END);
++ if (NULL == daemon)
++ return 1;
++
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++ return 0;
++}
+--- libmicrohttpd-0.9.24/doc/examples.orig/hellobrowser.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/hellobrowser.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,46 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <string.h>
++#include <microhttpd.h>
++#include <stdio.h>
++
++#define PORT 8888
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ const char *page = "<html><body>Hello, browser!</body></html>";
++ struct MHD_Response *response;
++ int ret;
++
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_PERSISTENT);
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_destroy_response (response);
++
++ return ret;
++}
++
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL, MHD_OPTION_END);
++ if (NULL == daemon)
++ return 1;
++
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++ return 0;
++}
+--- libmicrohttpd-0.9.24/doc/examples.orig/largepost.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/largepost.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,235 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <microhttpd.h>
++
++#define PORT 8888
++#define POSTBUFFERSIZE 512
++#define MAXCLIENTS 2
++
++#define GET 0
++#define POST 1
++
++static unsigned int nr_of_uploading_clients = 0;
++
++struct connection_info_struct
++{
++ int connectiontype;
++ struct MHD_PostProcessor *postprocessor;
++ FILE *fp;
++ const char *answerstring;
++ int answercode;
++};
++
++const char *askpage = "<html><body>\n\
++ Upload a file, please!<br>\n\
++ There are %u clients uploading at the moment.<br>\n\
++ <form action=\"/filepost\" method=\"post\" enctype=\"multipart/form-data\">\n\
++ <input name=\"file\" type=\"file\">\n\
++ <input type=\"submit\" value=\" Send \"></form>\n\
++ </body></html>";
++
++const char *busypage =
++ "<html><body>This server is busy, please try again later.</body></html>";
++
++const char *completepage =
++ "<html><body>The upload has been completed.</body></html>";
++
++const char *errorpage =
++ "<html><body>This doesn't seem to be right.</body></html>";
++const char *servererrorpage =
++ "<html><body>An internal server error has occured.</body></html>";
++const char *fileexistspage =
++ "<html><body>This file already exists.</body></html>";
++
++
++static int
++send_page (struct MHD_Connection *connection, const char *page,
++ int status_code)
++{
++ int ret;
++ struct MHD_Response *response;
++
++ response =
++ MHD_create_response_from_buffer (strlen (page), (void *) page,
++ MHD_RESPMEM_MUST_COPY);
++ if (!response)
++ return MHD_NO;
++ MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, "text/html");
++ ret = MHD_queue_response (connection, status_code, response);
++ MHD_destroy_response (response);
++
++ return ret;
++}
++
++
++static int
++iterate_post (void *coninfo_cls, enum MHD_ValueKind kind, const char *key,
++ const char *filename, const char *content_type,
++ const char *transfer_encoding, const char *data, uint64_t off,
++ size_t size)
++{
++ struct connection_info_struct *con_info = coninfo_cls;
++ FILE *fp;
++
++ con_info->answerstring = servererrorpage;
++ con_info->answercode = MHD_HTTP_INTERNAL_SERVER_ERROR;
++
++ if (0 != strcmp (key, "file"))
++ return MHD_NO;
++
++ if (!con_info->fp)
++ {
++ if (NULL != (fp = fopen (filename, "rb")))
++ {
++ fclose (fp);
++ con_info->answerstring = fileexistspage;
++ con_info->answercode = MHD_HTTP_FORBIDDEN;
++ return MHD_NO;
++ }
++
++ con_info->fp = fopen (filename, "ab");
++ if (!con_info->fp)
++ return MHD_NO;
++ }
++
++ if (size > 0)
++ {
++ if (!fwrite (data, size, sizeof (char), con_info->fp))
++ return MHD_NO;
++ }
++
++ con_info->answerstring = completepage;
++ con_info->answercode = MHD_HTTP_OK;
++
++ return MHD_YES;
++}
++
++
++static void
++request_completed (void *cls, struct MHD_Connection *connection,
++ void **con_cls, enum MHD_RequestTerminationCode toe)
++{
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (NULL == con_info)
++ return;
++
++ if (con_info->connectiontype == POST)
++ {
++ if (NULL != con_info->postprocessor)
++ {
++ MHD_destroy_post_processor (con_info->postprocessor);
++ nr_of_uploading_clients--;
++ }
++
++ if (con_info->fp)
++ fclose (con_info->fp);
++ }
++
++ free (con_info);
++ *con_cls = NULL;
++}
++
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ if (NULL == *con_cls)
++ {
++ struct connection_info_struct *con_info;
++
++ if (nr_of_uploading_clients >= MAXCLIENTS)
++ return send_page (connection, busypage, MHD_HTTP_SERVICE_UNAVAILABLE);
++
++ con_info = malloc (sizeof (struct connection_info_struct));
++ if (NULL == con_info)
++ return MHD_NO;
++
++ con_info->fp = NULL;
++
++ if (0 == strcmp (method, "POST"))
++ {
++ con_info->postprocessor =
++ MHD_create_post_processor (connection, POSTBUFFERSIZE,
++ iterate_post, (void *) con_info);
++
++ if (NULL == con_info->postprocessor)
++ {
++ free (con_info);
++ return MHD_NO;
++ }
++
++ nr_of_uploading_clients++;
++
++ con_info->connectiontype = POST;
++ con_info->answercode = MHD_HTTP_OK;
++ con_info->answerstring = completepage;
++ }
++ else
++ con_info->connectiontype = GET;
++
++ *con_cls = (void *) con_info;
++
++ return MHD_YES;
++ }
++
++ if (0 == strcmp (method, "GET"))
++ {
++ char buffer[1024];
++
++ snprintf (buffer, sizeof (buffer), askpage, nr_of_uploading_clients);
++ return send_page (connection, buffer, MHD_HTTP_OK);
++ }
++
++ if (0 == strcmp (method, "POST"))
++ {
++ struct connection_info_struct *con_info = *con_cls;
++
++ if (0 != *upload_data_size)
++ {
++ MHD_post_process (con_info->postprocessor, upload_data,
++ *upload_data_size);
++ *upload_data_size = 0;
++
++ return MHD_YES;
++ }
++ else
++ {
++ if (NULL != con_info->fp)
++ fclose (con_info->fp);
++ /* Now it is safe to open and inspect the file before calling send_page with a response */
++ return send_page (connection, con_info->answerstring,
++ con_info->answercode);
++ }
++
++ }
++
++ return send_page (connection, errorpage, MHD_HTTP_BAD_REQUEST);
++}
++
++
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL,
++ MHD_OPTION_NOTIFY_COMPLETED, request_completed,
++ NULL, MHD_OPTION_END);
++ if (NULL == daemon)
++ return 1;
++ getchar ();
++ MHD_stop_daemon (daemon);
++ return 0;
++}
+--- libmicrohttpd-0.9.24/doc/examples.orig/logging.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/logging.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,49 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <microhttpd.h>
++#include <stdio.h>
++
++#define PORT 8888
++
++
++static int
++print_out_key (void *cls, enum MHD_ValueKind kind, const char *key,
++ const char *value)
++{
++ printf ("%s: %s\n", key, value);
++ return MHD_YES;
++}
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ printf ("New %s request for %s using version %s\n", method, url, version);
++
++ MHD_get_connection_values (connection, MHD_HEADER_KIND, print_out_key,
++ NULL);
++
++ return MHD_NO;
++}
++
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL, MHD_OPTION_END);
++ if (NULL == daemon)
++ return 1;
++
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++ return 0;
++}
+--- libmicrohttpd-0.9.24/doc/examples.orig/responseheaders.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/responseheaders.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,81 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/socket.h>
++#include <microhttpd.h>
++#include <time.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <string.h>
++#include <stdio.h>
++
++#define PORT 8888
++#define FILENAME "picture.png"
++#define MIMETYPE "image/png"
++
++static int
++answer_to_connection (void *cls, struct MHD_Connection *connection,
++ const char *url, const char *method,
++ const char *version, const char *upload_data,
++ size_t *upload_data_size, void **con_cls)
++{
++ struct MHD_Response *response;
++ int fd;
++ int ret;
++ struct stat sbuf;
++
++ if (0 != strcmp (method, "GET"))
++ return MHD_NO;
++
++ if ( (-1 == (fd = open (FILENAME, O_RDONLY))) ||
++ (0 != fstat (fd, &sbuf)) )
++ {
++ /* error accessing file */
++ if (fd != -1) close (fd);
++ const char *errorstr =
++ "<html><body>An internal server error has occured!\
++ </body></html>";
++ response =
++ MHD_create_response_from_buffer (strlen (errorstr),
++ (void *) errorstr,
++ MHD_RESPMEM_PERSISTENT);
++ if (NULL != response)
++ {
++ ret =
++ MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR,
++ response);
++ MHD_destroy_response (response);
++
++ return ret;
++ }
++ else
++ return MHD_NO;
++ }
++ response =
++ MHD_create_response_from_fd_at_offset (sbuf.st_size, fd, 0);
++ MHD_add_response_header (response, "Content-Type", MIMETYPE);
++ ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++ MHD_destroy_response (response);
++
++ return ret;
++}
++
++
++int
++main ()
++{
++ struct MHD_Daemon *daemon;
++
++ daemon = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, PORT, NULL, NULL,
++ &answer_to_connection, NULL, MHD_OPTION_END);
++ if (NULL == daemon)
++ return 1;
++
++ getchar ();
++
++ MHD_stop_daemon (daemon);
++
++ return 0;
++}
+--- libmicrohttpd-0.9.24/doc/examples.orig/sessions.c 1970-01-01 01:00:00.000000000 +0100
++++ libmicrohttpd-0.9.24/doc/examples/sessions.c 2013-01-03 19:12:57.946373758 +0100
+@@ -0,0 +1,727 @@
++/* Feel free to use this example code in any way
++ you see fit (Public Domain) */
++
++/* needed for asprintf */
++#define _GNU_SOURCE
++
++
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
++#include <errno.h>
++#include <time.h>
++#include <microhttpd.h>
++
++/**
++ * Invalid method page.
++ */
++#define METHOD_ERROR "<html><head><title>Illegal request</title></head><body>Go away.</body></html>"
++
++/**
++ * Invalid URL page.
++ */
++#define NOT_FOUND_ERROR "<html><head><title>Not found</title></head><body>Go away.</body></html>"
++
++/**
++ * Front page. (/)
++ */
++#define MAIN_PAGE "<html><head><title>Welcome</title></head><body><form action=\"/2\" method=\"post\">What is your name? <input type=\"text\" name=\"v1\" value=\"%s\" /><input type=\"submit\" value=\"Next\" /></body></html>"
++
++/**
++ * Second page. (/2)
++ */
++#define SECOND_PAGE "<html><head><title>Tell me more</title></head><body><a href=\"/\">previous</a> <form action=\"/S\" method=\"post\">%s, what is your job? <input type=\"text\" name=\"v2\" value=\"%s\" /><input type=\"submit\" value=\"Next\" /></body></html>"
++
++/**
++ * Second page (/S)
++ */
++#define SUBMIT_PAGE "<html><head><title>Ready to submit?</title></head><body><form action=\"/F\" method=\"post\"><a href=\"/2\">previous </a> <input type=\"hidden\" name=\"DONE\" value=\"yes\" /><input type=\"submit\" value=\"Submit\" /></body></html>"
++
++/**
++ * Last page.
++ */
++#define LAST_PAGE "<html><head><title>Thank you</title></head><body>Thank you.</body></html>"
++
++/**
++ * Name of our cookie.
++ */
++#define COOKIE_NAME "session"
++
++
++/**
++ * State we keep for each user/session/browser.
++ */
++struct Session
++{
++ /**
++ * We keep all sessions in a linked list.
++ */
++ struct Session *next;
++
++ /**
++ * Unique ID for this session.
++ */
++ char sid[33];
++
++ /**
++ * Reference counter giving the number of connections
++ * currently using this session.
++ */
++ unsigned int rc;
++
++ /**
++ * Time when this session was last active.
++ */
++ time_t start;
++
++ /**
++ * String submitted via form.
++ */
++ char value_1[64];
++
++ /**
++ * Another value submitted via form.
++ */
++ char value_2[64];
++
++};
++
++
++/**
++ * Data kept per request.
++ */
++struct Request
++{
++
++ /**
++ * Associated session.
++ */
++ struct Session *session;
++
++ /**
++ * Post processor handling form data (IF this is
++ * a POST request).
++ */
++ struct MHD_PostProcessor *pp;
++
++ /**
++ * URL to serve in response to this POST (if this request
++ * was a 'POST')
++ */
++ const char *post_url;
++
++};
++
++
++/**
++ * Linked list of all active sessions. Yes, O(n) but a
++ * hash table would be overkill for a simple example...
++ */
<Skipped 1069 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmicrohttpd.git/commitdiff/458781c71bb1ba23fb92ada1d4bd9af3c15d8c82
More information about the pld-cvs-commit
mailing list