Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 129995 Details for
Bug 191245
www-apache/mod_lisp2-1.2 doesn't build against Apache 2.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
1.2-apr-1.patch
1.2-apr-1.patch (text/plain), 2.68 KB, created by
David Leverton
on 2007-09-04 15:01:56 UTC
(
hide
)
Description:
1.2-apr-1.patch
Filename:
MIME Type:
Creator:
David Leverton
Created:
2007-09-04 15:01:56 UTC
Size:
2.68 KB
patch
obsolete
>--- mod_lisp2-1.2/mod_lisp2.c~ 2007-09-04 14:24:49.000000000 +0100 >+++ mod_lisp2-1.2/mod_lisp2.c 2007-09-04 14:26:34.000000000 +0100 >@@ -105,6 +105,7 @@ > #include "util_script.h" > #include "apr_date.h" > #include "apr_strings.h" >+#include "apr_version.h" > > #include <stdio.h> > #include <stdlib.h> >@@ -117,7 +118,7 @@ > while (1) \ > { \ > apr_status_t RELAY_ERROR_status = (expr); \ >- if (APR_STATUS_IS_SUCCESS (RELAY_ERROR_status)) \ >+ if (RELAY_ERROR_status == APR_SUCCESS) \ > break; \ > if (!APR_STATUS_IS_EINTR (RELAY_ERROR_status)) \ > return (RELAY_ERROR_status); \ >@@ -332,11 +333,16 @@ > (apr_sockaddr_info_get ((&addr), (cfg->server_address), APR_UNSPEC, > (cfg->server_port), 0, socket_pool)); > >+#if APR_MAJOR_VERSION >= 1 >+ RELAY_ERROR >+ (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, APR_PROTO_TCP, socket_pool)); >+#else > RELAY_ERROR > (apr_socket_create ((&socket), AF_INET, SOCK_STREAM, socket_pool)); >+#endif > > /* Should be apr_socket_connect */ >- RELAY_ERROR (apr_connect (socket, addr)); >+ RELAY_ERROR (apr_socket_connect (socket, addr)); > > { > input_buffer_t * buffer >@@ -371,7 +377,7 @@ > { > apr_size_t n2 = n1; > /* Should be apr_socket_send */ >- RELAY_ERROR (apr_send (socket, p, (&n2))); >+ RELAY_ERROR (apr_socket_send (socket, p, (&n2))); > if (n2 == n1) > return (APR_SUCCESS); > p += n2; >@@ -411,7 +417,7 @@ > RELAY_ERROR (get_input_buffer (socket, (&buffer))); > RELAY_ERROR > (((length = (sizeof (buffer->data))), >- (apr_recv (socket, (buffer->data), (&length))))); >+ (apr_socket_recv (socket, (buffer->data), (&length))))); > (buffer->start) = (buffer->data); > (buffer->end) = ((buffer->data) + length); > if (length == 0) >@@ -479,7 +485,7 @@ > #define CVT_ERROR(expr, msg) do \ > { \ > apr_status_t CVT_ERROR_status = (expr); \ >- if (!APR_STATUS_IS_SUCCESS (CVT_ERROR_status)) \ >+ if (CVT_ERROR_status != APR_SUCCESS) \ > { \ > ap_log_error (APLOG_MARK, APLOG_ERR, CVT_ERROR_status, \ > (r->server), "error %s", msg); \ >@@ -565,7 +571,7 @@ > > { > apr_status_t status = (write_lisp_data (socket, buffer, n_read)); >- if (!APR_STATUS_IS_SUCCESS (status)) >+ if (status != APR_SUCCESS) > { > while ((ap_get_client_block (r, buffer, (sizeof (buffer)))) > > 0) >@@ -818,7 +824,7 @@ > static void > lisp_child_init (apr_pool_t * pool, server_rec * s) > { >- if (APR_STATUS_IS_SUCCESS (apr_pool_create ((&socket_pool), 0))) >+ if (apr_pool_create ((&socket_pool), 0) == APR_SUCCESS) > { > apr_pool_cleanup_register (pool, 0, destroy_socket_pool, destroy_socket_pool); > #if APR_HAS_THREADS
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 191245
: 129995