From: Pierrick Charron <pierrick@php.net>
Date: Wed, 23 Nov 2011 05:45:27 +0000 (+0000)
Subject: Fixed bug #54995
X-Git-Tag: php-5.5.0alpha1~830
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bafdf84528100d980599685af43508f029e96dd7;p=php

Fixed bug #54995
---

diff --git a/NEWS b/NEWS
index 15c3ff6b6e..f71f27c2ea 100644
--- a/NEWS
+++ b/NEWS
@@ -26,5 +26,6 @@ PHP                                                                        NEWS
     (Pierrick)
   . Fixed bug #55635 (CURLOPT_BINARYTRANSFER no longer used. The constant
 	still exists for backward compatibility but is doing nothing). (Pierrick)
+  . Fixed bug #54995 (Missing CURLINFO_RESPONSE_CODE support). (Pierrick)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index ecc6fdfc27..49adcd7daf 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -788,6 +788,7 @@ PHP_MINIT_FUNCTION(curl)
 	/* Info constants */
 	REGISTER_CURL_CONSTANT(CURLINFO_EFFECTIVE_URL);
 	REGISTER_CURL_CONSTANT(CURLINFO_HTTP_CODE);
+	REGISTER_CURL_CONSTANT(CURLINFO_RESPONSE_CODE);
 	REGISTER_CURL_CONSTANT(CURLINFO_HEADER_SIZE);
 	REGISTER_CURL_CONSTANT(CURLINFO_REQUEST_SIZE);
 	REGISTER_CURL_CONSTANT(CURLINFO_TOTAL_TIME);
diff --git a/ext/curl/tests/bug54995.phpt b/ext/curl/tests/bug54995.phpt
new file mode 100644
index 0000000000..0f3f50f344
--- /dev/null
+++ b/ext/curl/tests/bug54995.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #54995 (Missing CURLINFO_RESPONSE_CODE support)
+--SKIPIF--
+<?php 
+if (!extension_loaded("curl")) {
+	exit("skip curl extension not loaded");
+}
+if ($curl_version['version_number'] > 0x070a08) {
+	exit("skip: tests works a versions of curl >= 7.10.8");
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER'))  {
+	exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined");
+}
+?>
+--FILE--
+<?php
+
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "{$host}/get.php");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE) == curl_getinfo($ch, CURLINFO_RESPONSE_CODE));
+
+curl_exec($ch);
+curl_close($ch);
+
+?>
+--EXPECTF--
+bool(true)