You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2010/09/15 18:59:56 UTC
svn commit: r997396 - in /httpd/httpd/branches/2.2.x/server: core.c main.c
Author: wrowe
Date: Wed Sep 15 16:59:56 2010
New Revision: 997396
URL: http://svn.apache.org/viewvc?rev=997396&view=rev
Log:
ap_document_root_check must live in libhttpd, not in the httpd binary,
due to the way that symbols are resolved.
Generally, main.c should export nothing.
Modified:
httpd/httpd/branches/2.2.x/server/core.c
httpd/httpd/branches/2.2.x/server/main.c
Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?rev=997396&r1=997395&r2=997396&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Wed Sep 15 16:59:56 2010
@@ -96,6 +96,9 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_core
/* magic pointer for ErrorDocument xxx "default" */
static char errordocument_default;
+/* Default ap_document_root_check to default value: true */
+AP_DECLARE_DATA int ap_document_root_check = 1;
+
static void *create_core_dir_config(apr_pool_t *a, char *dir)
{
core_dir_config *conf;
Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/main.c?rev=997396&r1=997395&r2=997396&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Wed Sep 15 16:59:56 2010
@@ -446,9 +446,6 @@ static void usage(process_rec *process)
destroy_and_exit_process(process, 1);
}
-/* Set ap_document_root_check to default value: true */
-AP_DECLARE_DATA int ap_document_root_check = 1;
-
int main(int argc, const char * const argv[])
{
char c;
Re: svn commit: r997396 - in /httpd/httpd/branches/2.2.x/server:
core.c main.c
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 9/15/2010 1:38 PM, Ruediger Pluem wrote:
>
>
> On 09/15/2010 06:59 PM, wrowe@apache.org wrote:
>> Author: wrowe
>> Date: Wed Sep 15 16:59:56 2010
>> New Revision: 997396
>>
>> URL: http://svn.apache.org/viewvc?rev=997396&view=rev
>> Log:
>> ap_document_root_check must live in libhttpd, not in the httpd binary,
>> due to the way that symbols are resolved.
>>
>> Generally, main.c should export nothing.
>>
>> Modified:
>> httpd/httpd/branches/2.2.x/server/core.c
>> httpd/httpd/branches/2.2.x/server/main.c
>
> Is this a platform specific change? I saw no entry in the status file.
That's because the author didn't look-ahead to corrections of their patch in svn.
Essentially, but not entirely. This would apply on any build based on libhttpd.
depending on the platform's load time linker, depth of namespaces, etc.
Where we build on libhttpd, shared objects should persist somewhere outside of
main.c and within the libhttpd.so's scope.
> Nevertheless it would be helpful to reference the trunk revision in
> the log for this backport (r901557 in this case).
Absolutely agreed, thanks for providing the reference :)
Re: svn commit: r997396 - in /httpd/httpd/branches/2.2.x/server:
core.c main.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 09/15/2010 06:59 PM, wrowe@apache.org wrote:
> Author: wrowe
> Date: Wed Sep 15 16:59:56 2010
> New Revision: 997396
>
> URL: http://svn.apache.org/viewvc?rev=997396&view=rev
> Log:
> ap_document_root_check must live in libhttpd, not in the httpd binary,
> due to the way that symbols are resolved.
>
> Generally, main.c should export nothing.
>
> Modified:
> httpd/httpd/branches/2.2.x/server/core.c
> httpd/httpd/branches/2.2.x/server/main.c
Is this a platform specific change? I saw no entry in the status file.
Nevertheless it would be helpful to reference the trunk revision in
the log for this backport (r901557 in this case).
Regards
Rüdiger