You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/07/10 13:45:47 UTC
svn commit: r1690248 [2/2] - in /httpd/httpd/trunk: ./ docs/conf/
docs/conf/extra/ docs/manual/mod/ modules/ modules/http2/ modules/http2/m4/
modules/http2/mod-h2.xcodeproj/ modules/http2/mod_h2/
modules/http2/sandbox/ modules/http2/setup/
Copied: httpd/httpd/trunk/modules/http2/h2_task.c (from r1690246, httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?p2=httpd/httpd/trunk/modules/http2/h2_task.c&p1=httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c&r1=1690246&r2=1690248&rev=1690248&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task.c Fri Jul 10 11:45:46 2015
@@ -390,11 +390,12 @@ static request_rec *h2_task_create_reque
r->protocol = (char*)"HTTP/1.1";
r->proto_num = HTTP_VERSION(1, 1);
- r->hostname = env->authority;
-
/* update what we think the virtual host is based on the headers we've
* now read. may update status.
+ * Leave r->hostname empty, vhost will parse if form our Host: header,
+ * otherwise we get complains about port numbers.
*/
+ r->hostname = NULL;
ap_update_vhost_from_headers(r);
/* we may have switched to another server */
Copied: httpd/httpd/trunk/modules/http2/h2_version.h (from r1690246, httpd/httpd/trunk/modules/http2/mod_h2/h2_version.h.in)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?p2=httpd/httpd/trunk/modules/http2/h2_version.h&p1=httpd/httpd/trunk/modules/http2/mod_h2/h2_version.h.in&r1=1690246&r2=1690248&rev=1690248&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_h2/h2_version.h.in (original)
+++ httpd/httpd/trunk/modules/http2/h2_version.h Fri Jul 10 11:45:46 2015
@@ -20,7 +20,7 @@
* @macro
* Version number of the h2 module as c string
*/
-#define MOD_H2_VERSION "@PACKAGE_VERSION@"
+#define MOD_H2_VERSION "0.8.1"
/**
* @macro
@@ -28,7 +28,7 @@
* release. This is a 24 bit number with 8 bits for major number, 8 bits
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/
-#define MOD_H2_VERSION_NUM @PACKAGE_VERSION_NUM@
+#define MOD_H2_VERSION_NUM 0x000801
#endif /* mod_h2_h2_version_h */
Re: svn commit: r1690248 [2/2] - in /httpd/httpd/trunk: ./ docs/conf/ docs/conf/extra/ docs/manual/mod/ modules/ modules/http2/ modules/http2/m4/ modules/http2/mod-h2.xcodeproj/ modules/http2/mod_h2/ modules/http2/sandbox/ modules/http2/setup/
Posted by Stefan Eissing <st...@eissing.org>.
That was a small surprise, yes. Some checks in trunk did not like r->hostname to still have the port.
> Am 10.07.2015 um 16:59 schrieb Eric Covener <co...@gmail.com>:
>
>> On Fri, Jul 10, 2015 at 7:45 AM, <ic...@apache.org> wrote:
>> Copied: httpd/httpd/trunk/modules/http2/h2_task.c (from r1690246, httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c)
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?p2=httpd/httpd/trunk/modules/http2/h2_task.c&p1=httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c&r1=1690246&r2=1690248&rev=1690248&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c (original)
>> +++ httpd/httpd/trunk/modules/http2/h2_task.c Fri Jul 10 11:45:46 2015
>> @@ -390,11 +390,12 @@ static request_rec *h2_task_create_reque
>> r->protocol = (char*)"HTTP/1.1";
>> r->proto_num = HTTP_VERSION(1, 1);
>>
>> - r->hostname = env->authority;
>> -
>> /* update what we think the virtual host is based on the headers we've
>> * now read. may update status.
>> + * Leave r->hostname empty, vhost will parse if form our Host: header,
>> + * otherwise we get complains about port numbers.
>> */
>> + r->hostname = NULL;
>> ap_update_vhost_from_headers(r);
>
> Looks like your sandbox may have had some unexpected changes?
Re: svn commit: r1690248 [2/2] - in /httpd/httpd/trunk: ./ docs/conf/
docs/conf/extra/ docs/manual/mod/ modules/ modules/http2/ modules/http2/m4/
modules/http2/mod-h2.xcodeproj/ modules/http2/mod_h2/ modules/http2/sandbox/ modules/http2/setup/
Posted by Eric Covener <co...@gmail.com>.
On Fri, Jul 10, 2015 at 7:45 AM, <ic...@apache.org> wrote:
> Copied: httpd/httpd/trunk/modules/http2/h2_task.c (from r1690246, httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c)
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?p2=httpd/httpd/trunk/modules/http2/h2_task.c&p1=httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c&r1=1690246&r2=1690248&rev=1690248&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/http2/mod_h2/h2_task.c (original)
> +++ httpd/httpd/trunk/modules/http2/h2_task.c Fri Jul 10 11:45:46 2015
> @@ -390,11 +390,12 @@ static request_rec *h2_task_create_reque
> r->protocol = (char*)"HTTP/1.1";
> r->proto_num = HTTP_VERSION(1, 1);
>
> - r->hostname = env->authority;
> -
> /* update what we think the virtual host is based on the headers we've
> * now read. may update status.
> + * Leave r->hostname empty, vhost will parse if form our Host: header,
> + * otherwise we get complains about port numbers.
> */
> + r->hostname = NULL;
> ap_update_vhost_from_headers(r);
Looks like your sandbox may have had some unexpected changes?