Permalink
Browse files

docs: Update CHANGES and docs with addition of libhtp source.

  • Loading branch information...
1 parent 70d2794 commit f855fc038f4ab48f1df3e655ab7d026a60825ab7 @b1v1r b1v1r committed Nov 28, 2012
Showing with 7 additions and 38 deletions.
  1. +2 −0 CHANGES
  2. +5 −12 INSTALL
  3. +0 −26 docs/docbook/manual/chXX-installation.xml
View
@@ -16,6 +16,8 @@ IronBee v0.6.0
* Removed a number of unnecessary checks in configure.
+* Included libhtp source, so this is no longer required.
+
**Engine**
* Enhanced support for buffering request/response data, including
View
17 INSTALL
@@ -3,20 +3,13 @@ preview. To build this code:
Before you install:
-You will need a few dependencies. ossp-uuid (uuid), apache2, and
-libhtp. You can install uuid and apache2 through your operating
-systems package manager. For libhtp, do the following:
+You will need a few dependencies. ossp-uuid (uuid), and at least one of the
+following servers:
-Install libhtp
+* Apache TrafficServer 3.2
+* Apache httpd 2.4
- git clone git://github.com/ironbee/libhtp.git
- cd libhtp
- ./autogen.sh
- ./configure
- make
- sudo make install
-
-Get the code:
+Get the ironbee code:
git clone git://github.com/ironbee/ironbee.git
@@ -109,12 +109,6 @@
<td>http://www.pcre.org/</td>
</tr>
<tr>
- <td>LibHTP</td>
- <td>0.3.0+</td>
- <td>Security-aware parser for the HTTP protocol.</td>
- <td>https://github.com/ironbee/libhtp</td>
- </tr>
- <tr>
<td>PThread</td>
<td>NA</td>
<td>POSIX threads</td>
@@ -205,26 +199,6 @@
</table>
</section>
<section>
- <title>Resolving Dependencies</title>
- <section><title>Installing LibHTP</title>
- <para>In the future LibHTP will be integrated into the ironbee build process but until
- that time you will have to download, build and install LibHTP from it's public git
- repository.</para>
- <programlisting># Clone the repository
-git clone git://github.com/ironbee/libhtp.git
-cd libhtp
-
-# Generate the autotools utilities
-./autogen.sh
-
-# Configure the build for the current platform
-./configure
-
-# Build and Install
-make
-sudo make install</programlisting></section>
- </section>
- <section>
<title>Building, Testing and Installing IronBee</title>
<para>...</para>
<section>

0 comments on commit f855fc0

Please sign in to comment.