- fix builds where include/php/ext/iconv does not have php_have_*.h files

  by #undef PHP_ATOM_INC
# What is this for actually?

diff --git a/http_querystring_object.c b/http_querystring_object.c
index 1238781a26aa0f5b20bdd4d83762638b3e80fdad..6a3f0f30ff9cae302c3eb2a1f597cfdc1ea6e61f 100644 (file)
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -21,8 +21,9 @@
 #include "zend_interfaces.h"
 
 #ifdef HAVE_ICONV
 #include "zend_interfaces.h"
 
 #ifdef HAVE_ICONV

-#      include "ext/standard/url.h"
+#      undef PHP_ATOM_INC

 #      include "ext/iconv/php_iconv.h"
 #      include "ext/iconv/php_iconv.h"

+#      include "ext/standard/url.h"

 #endif
 
 #include "php_http_api.h"
 #endif
 
 #include "php_http_api.h"

diff --git a/package2.xml b/package2.xml
index 407d42ca3501a5976c062f217823aa5eaf9138e7..c2eda4e1bd82f2eacb056268046b45fab975acc7 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -48,6 +48,7 @@ HttpResponse
  <notes><![CDATA[
 * Fixed possible crash in HttpQueryString if the SAPI does not have a treat_data function registered.
 * Fixed http_build_str() to urlencode brackets ("[]").
  <notes><![CDATA[
 * Fixed possible crash in HttpQueryString if the SAPI does not have a treat_data function registered.
 * Fixed http_build_str() to urlencode brackets ("[]").

+* Fixed builds where include/php/ext/iconv does not have php_have_*.h files

 * Fixed PHP-4 build.
 ]]></notes>
  <contents>
 * Fixed PHP-4 build.
 ]]></notes>
  <contents>