httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/main iol_socket.c
Date Fri, 04 Aug 2000 02:48:39 GMT
stoddard    00/08/03 19:48:39

  Modified:    src/lib/apr aprlib.def
               src/lib/apr/include apr.hw
               src/lib/apr/network_io/win32 sendrecv.c
               src/lib/apr/network_io/unix sendrecv.c
               src/main iol_socket.c
  Log:
  Fix Win32 compile break caused by ap_ to apr_ migration. Change ap_sendfile to
  apr_sendfile.
  
  Revision  Changes    Path
  1.31      +232 -232  apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- aprlib.def	2000/07/15 16:08:00	1.30
  +++ aprlib.def	2000/08/04 02:48:36	1.31
  @@ -5,248 +5,248 @@
   
   EXPORTS
   	; Add new API calls to the end of this list.
  -	ap_opendir   @1
  -	ap_closedir   @2
  -	ap_readdir   @3
  -	ap_rewinddir   @4
  -	ap_make_dir   @5
  -	ap_remove_dir   @6
  -	ap_dir_entry_size   @7
  -	ap_dir_entry_mtime   @8
  -	ap_dir_entry_ftype   @9
  -	ap_get_dir_filename   @10
  -;	ap_get_filename   @11
  -	ap_stat		  @11
  -;	ap_get_filesize   @12
  -;	ap_get_fileatime   @13
  -;	ap_get_filectime   @14
  -;	ap_make_iov   @15
  -	ap_dupfile   @16
  -	ap_getfileinfo   @17
  -	ap_open   @18
  -	ap_close   @19
  -	ap_remove_file   @20
  -	ap_create_pipe   @21
  -	ap_read   @22
  -	ap_write   @23
  -	ap_seek   @24
  -    	ap_get_filedata   @25
  -    	ap_set_filedata   @26
  -    	ap_get_os_file   @27
  -	ap_put_os_file @28
  -    	ap_get_os_dir   @29
  -    	ap_putc   @30
  -    	ap_getc   @31
  -	ap_puts @32
  -	ap_fgets @33
  -	ap_flush @34
  -    	ap_fprintf   @35
  -    	ap_eof   @36
  -;	ap_get_filetype @37
  -	ap_writev @38
  +	apr_opendir   @1
  +	apr_closedir   @2
  +	apr_readdir   @3
  +	apr_rewinddir   @4
  +	apr_make_dir   @5
  +	apr_remove_dir   @6
  +	apr_dir_entry_size   @7
  +	apr_dir_entry_mtime   @8
  +	apr_dir_entry_ftype   @9
  +	apr_get_dir_filename   @10
  +;	apr_get_filename   @11
  +	apr_stat		  @11
  +;	apr_get_filesize   @12
  +;	apr_get_fileatime   @13
  +;	apr_get_filectime   @14
  +;	apr_make_iov   @15
  +	apr_dupfile   @16
  +	apr_getfileinfo   @17
  +	apr_open   @18
  +	apr_close   @19
  +	apr_remove_file   @20
  +	apr_create_pipe   @21
  +	apr_read   @22
  +	apr_write   @23
  +	apr_seek   @24
  +    	apr_get_filedata   @25
  +    	apr_set_filedata   @26
  +    	apr_get_os_file   @27
  +	apr_put_os_file @28
  +    	apr_get_os_dir   @29
  +    	apr_putc   @30
  +    	apr_getc   @31
  +	apr_puts @32
  +	apr_fgets @33
  +	apr_flush @34
  +    	apr_fprintf   @35
  +    	apr_eof   @36
  +;	apr_get_filetype @37
  +	apr_writev @38
   	; locks
  -	ap_create_lock   @39
  -	ap_lock   @40
  -	ap_unlock   @41
  -	ap_destroy_lock   @42
  -	ap_child_init_lock   @43
  -	ap_get_lockdata   @44
  -	ap_set_lockdata   @45
  -	ap_get_os_lock   @46
  -	ap_create_tcp_socket   @47
  -	ap_shutdown   @48
  -	ap_close_socket   @49
  -	ap_bind   @50
  -	ap_listen   @51
  -	ap_accept   @52
  -	ap_connect   @53
  -	ap_get_remote_hostname   @54
  -	ap_gethostname   @55
  -	ap_send   @56
  -	ap_recv   @57
  -	ap_setsocketopt   @58
  -	ap_sendv @59
  -	ap_sendfile  @60
  -	ap_setup_poll   @61
  -	ap_poll   @62
  -	ap_add_poll_socket   @63
  -	ap_get_revents   @64
  -	ap_get_socketdata   @65
  -	ap_set_socketdata   @66
  -	ap_get_polldata   @67
  -	ap_set_polldata   @68
  -	ap_put_os_sock @69
  -	ap_get_os_sock   @70
  -	ap_remove_poll_socket   @71
  -	ap_clear_poll_sockets   @72
  -	ap_getsocketopt @73
  -;	ap_getipaddr @74
  -;	ap_create_signal   @75
  -;	ap_setup_signal   @76
  +	apr_create_lock   @39
  +	apr_lock   @40
  +	apr_unlock   @41
  +	apr_destroy_lock   @42
  +	apr_child_init_lock   @43
  +	apr_get_lockdata   @44
  +	apr_set_lockdata   @45
  +	apr_get_os_lock   @46
  +	apr_create_tcp_socket   @47
  +	apr_shutdown   @48
  +	apr_close_socket   @49
  +	apr_bind   @50
  +	apr_listen   @51
  +	apr_accept   @52
  +	apr_connect   @53
  +	apr_get_remote_hostname   @54
  +	apr_gethostname   @55
  +	apr_send   @56
  +	apr_recv   @57
  +	apr_setsocketopt   @58
  +	apr_sendv @59
  +	apr_sendfile  @60
  +	apr_setup_poll   @61
  +	apr_poll   @62
  +	apr_add_poll_socket   @63
  +	apr_get_revents   @64
  +	apr_get_socketdata   @65
  +	apr_set_socketdata   @66
  +	apr_get_polldata   @67
  +	apr_set_polldata   @68
  +	apr_put_os_sock @69
  +	apr_get_os_sock   @70
  +	apr_remove_poll_socket   @71
  +	apr_clear_poll_sockets   @72
  +	apr_getsocketopt @73
  +;	apr_getipaddr @74
  +;	apr_create_signal   @75
  +;	apr_setup_signal   @76
   ;       SignalHandling   @77
  -;	ap_send_signal    @78
  +;	apr_send_signal    @78
   ;       thread_ready   @79
  -	ap_createprocattr_init   @80
  -	ap_setprocattr_io   @81
  -	ap_setprocattr_dir   @82
  -	ap_setprocattr_cmdtype   @83
  -	ap_setprocattr_detach   @84
  -	ap_create_process   @85
  -;	ap_get_childin   @86
  -;	ap_get_childout   @87
  -;	ap_get_childerr   @88
  -	ap_wait_proc   @89
  -	ap_kill   @90
  -	ap_create_threadattr   @91
  -	ap_setthreadattr_detach   @92
  -	ap_getthreadattr_detach   @93
  -	ap_create_thread   @94
  -	ap_thread_exit   @95
  -	ap_thread_join   @96
  -	ap_thread_detach   @97
  -;	ap_cancel_thread   @98
  -	ap_create_thread_private   @99
  -	ap_get_thread_private   @100
  -	ap_set_thread_private   @101
  -	ap_delete_thread_private   @102
  -	ap_get_threaddata    @103
  -	ap_set_threaddata    @104
  -	ap_get_threadkeydata    @105
  -	ap_set_threadkeydata    @106
  -;	ap_get_procdata    @107
  -;	ap_set_procdata    @108
  -;	ap_get_os_proc   @109
  -	ap_get_os_thread   @110
  -	ap_get_os_threadkey   @111
  +	apr_createprocattr_init   @80
  +	apr_setprocattr_io   @81
  +	apr_setprocattr_dir   @82
  +	apr_setprocattr_cmdtype   @83
  +	apr_setprocattr_detach   @84
  +	apr_create_process   @85
  +;	apr_get_childin   @86
  +;	apr_get_childout   @87
  +;	apr_get_childerr   @88
  +	apr_wait_proc   @89
  +	apr_kill   @90
  +	apr_create_threadattr   @91
  +	apr_setthreadattr_detach   @92
  +	apr_getthreadattr_detach   @93
  +	apr_create_thread   @94
  +	apr_thread_exit   @95
  +	apr_thread_join   @96
  +	apr_thread_detach   @97
  +;	apr_cancel_thread   @98
  +	apr_create_thread_private   @99
  +	apr_get_thread_private   @100
  +	apr_set_thread_private   @101
  +	apr_delete_thread_private   @102
  +	apr_get_threaddata    @103
  +	apr_set_threaddata    @104
  +	apr_get_threadkeydata    @105
  +	apr_set_threadkeydata    @106
  +;	apr_get_procdata    @107
  +;	apr_set_procdata    @108
  +;	apr_get_os_proc   @109
  +	apr_get_os_thread   @110
  +	apr_get_os_threadkey   @111
   	ap_os_systemcase_filename   @112
   	canonical_filename   @113
  -	ap_create_pool   @114
  -	ap_clear_pool   @115
  -	ap_destroy_pool   @116
  -;	ap_get_oslevel   @117
  -	ap_get_userdata   @118
  -	ap_set_userdata   @119
  -	ap_initialize   @120
  -	ap_getopt    @121
  +	apr_create_pool   @114
  +	apr_clear_pool   @115
  +	apr_destroy_pool   @116
  +;	apr_get_oslevel   @117
  +	apr_get_userdata   @118
  +	apr_set_userdata   @119
  +	apr_initialize   @120
  +	apr_getopt    @121
   	ap_opterr   @122 DATA
   	ap_optind   @123 DATA
   	ap_optopt   @124 DATA
   	ap_optreset   @125 DATA
   	ap_optarg   @126 DATA
  -;	ap_make_time   @127
  -	ap_ansi_time_to_ap_time @127
  -;	ap_current_time   @128
  -	ap_now		  @128
  -;	ap_explode_time   @129
  -	ap_explode_gmt	  @129
  -;	ap_implode_time   @130
  -	ap_explode_localtime @130
  -;	ap_get_curtime   @131
  -	ap_implode_time	 @131
  -;	ap_get_sec   @132
  -	ap_get_os_imp_time	@132
  -;	ap_get_min   @133
  -	ap_get_os_exp_time	@133
  -;	ap_get_hour   @134
  -	ap_put_os_imp_time	@134
  -;	ap_get_mday   @135
  -	ap_put_os_exp_time	@135
  -;	ap_get_mon   @136
  -	ap_ctime     @136
  -;	ap_get_year   @137
  -	ap_rfc822_date	@137
  -;	ap_get_wday   @138
  -	ap_strftime   @138
  -;	ap_set_sec   @139
  -;	ap_set_min   @140
  -;	ap_set_hour   @141
  -;	ap_set_mday   @142
  -;	ap_set_mon   @143
  -;	ap_set_year   @144
  -;	ap_set_wday   @145
  -;	ap_get_timedata   @146
  -;	ap_set_timedata   @147
  -;	ap_get_os_time   @148
  -;	ap_timediff   @149
  -	ap_MD5Final   @150
  -	ap_MD5Init   @151
  -	ap_MD5Update   @152
  -	ap_cpystrn   @153
  -	ap_register_cleanup   @154
  -	ap_kill_cleanup   @155
  -	ap_fnmatch   @156
  -	ap_is_fnmatch   @157
  -	ap_MD5Encode   @158
  -	ap_validate_password   @159
  -	ap_make_sub_pool   @160
  -	ap_init_alloc   @161
  -;	ap_clear_pool   @162
  -;	ap_destroy_pool   @163
  -	ap_bytes_in_pool   @164
  -	ap_bytes_in_free_blocks   @165
  -	ap_palloc   @166
  -	ap_pcalloc   @167
  -	ap_pstrdup   @168
  -	ap_pstrndup   @169
  -	ap_pstrcat   @170
  -	ap_pvsprintf   @171
  -	ap_psprintf   @172
  -	ap_make_array   @173
  -	ap_push_array   @174
  -	ap_array_cat   @175
  -	ap_copy_array   @176
  -	ap_copy_array_hdr   @177
  -	ap_append_arrays   @178
  -	ap_array_pstrcat   @179
  -	ap_make_table   @180
  -	ap_copy_table   @181
  -	ap_clear_table   @182
  -	ap_table_get   @183
  -	ap_table_set   @184
  -	ap_table_setn   @185
  -	ap_table_unset   @186
  -	ap_table_merge   @187
  -	ap_table_mergen   @188
  -	ap_table_add   @189
  -	ap_table_addn   @190
  -	ap_overlay_tables @191
  -	ap_table_do   @192
  -	ap_overlap_tables   @193
  -	ap_run_cleanup   @194
  -	ap_cleanup_for_exec   @195
  -	ap_null_cleanup   @196
  -	ap_note_subprocess   @197
  +;	apr_make_time   @127
  +	apr_ansi_time_to_ap_time @127
  +;	apr_current_time   @128
  +	apr_now		  @128
  +;	apr_explode_time   @129
  +	apr_explode_gmt	  @129
  +;	apr_implode_time   @130
  +	apr_explode_localtime @130
  +;	apr_get_curtime   @131
  +	apr_implode_time	 @131
  +;	apr_get_sec   @132
  +	apr_get_os_imp_time	@132
  +;	apr_get_min   @133
  +	apr_get_os_exp_time	@133
  +;	apr_get_hour   @134
  +	apr_put_os_imp_time	@134
  +;	apr_get_mday   @135
  +	apr_put_os_exp_time	@135
  +;	apr_get_mon   @136
  +	apr_ctime     @136
  +;	apr_get_year   @137
  +	apr_rfc822_date	@137
  +;	apr_get_wday   @138
  +	apr_strftime   @138
  +;	apr_set_sec   @139
  +;	apr_set_min   @140
  +;	apr_set_hour   @141
  +;	apr_set_mday   @142
  +;	apr_set_mon   @143
  +;	apr_set_year   @144
  +;	apr_set_wday   @145
  +;	apr_get_timedata   @146
  +;	apr_set_timedata   @147
  +;	apr_get_os_time   @148
  +;	apr_timediff   @149
  +	apr_MD5Final   @150
  +	apr_MD5Init   @151
  +	apr_MD5Update   @152
  +	apr_cpystrn   @153
  +	apr_register_cleanup   @154
  +	apr_kill_cleanup   @155
  +	apr_fnmatch   @156
  +	apr_is_fnmatch   @157
  +	apr_MD5Encode   @158
  +	apr_validate_password   @159
  +	apr_make_sub_pool   @160
  +	apr_init_alloc   @161
  +;	apr_clear_pool   @162
  +;	apr_destroy_pool   @163
  +	apr_bytes_in_pool   @164
  +	apr_bytes_in_free_blocks   @165
  +	apr_palloc   @166
  +	apr_pcalloc   @167
  +	apr_pstrdup   @168
  +	apr_pstrndup   @169
  +	apr_pstrcat   @170
  +	apr_pvsprintf   @171
  +	apr_psprintf   @172
  +	apr_make_array   @173
  +	apr_push_array   @174
  +	apr_array_cat   @175
  +	apr_copy_array   @176
  +	apr_copy_array_hdr   @177
  +	apr_append_arrays   @178
  +	apr_array_pstrcat   @179
  +	apr_make_table   @180
  +	apr_copy_table   @181
  +	apr_clear_table   @182
  +	apr_table_get   @183
  +	apr_table_set   @184
  +	apr_table_setn   @185
  +	apr_table_unset   @186
  +	apr_table_merge   @187
  +	apr_table_mergen   @188
  +	apr_table_add   @189
  +	apr_table_addn   @190
  +	apr_overlay_tables @191
  +	apr_table_do   @192
  +	apr_overlap_tables   @193
  +	apr_run_cleanup   @194
  +	apr_cleanup_for_exec   @195
  +	apr_null_cleanup   @196
  +	apr_note_subprocess   @197
   ;
  -	ap_vformatter   @199
  -	ap_snprintf   @200
  -	ap_vsnprintf   @201
  -	ap_getpass   @202
  -	ap_ungetc @203
  -	ap_tokenize_to_argv @204
  -	ap_filename_of_pathname @205
  -	ap_get_remote_name @206
  -	ap_get_local_name @207
  -	ap_get_local_ipaddr @208
  -	ap_set_local_ipaddr @209
  -	ap_get_remote_ipaddr @210
  -	ap_set_remote_ipaddr @211
  -	ap_get_local_port @212
  -	ap_set_local_port @213
  -	ap_get_remote_port @214
  -	ap_set_remote_port @215
  -	ap_open_stderr @216
  -        ap_set_pipe_timeout   @217
  -        ap_terminate @218
  -        ap_dso_load @219
  -        ap_dso_unload @220
  -        ap_dso_sym @221
  -;        ap_dso_init @222
  -        ap_collapse_spaces @223
  +	apr_vformatter   @199
  +	apr_snprintf   @200
  +	apr_vsnprintf   @201
  +	apr_getpass   @202
  +	apr_ungetc @203
  +	apr_tokenize_to_argv @204
  +	apr_filename_of_pathname @205
  +	apr_get_remote_name @206
  +	apr_get_local_name @207
  +	apr_get_local_ipaddr @208
  +	apr_set_local_ipaddr @209
  +	apr_get_remote_ipaddr @210
  +	apr_set_remote_ipaddr @211
  +	apr_get_local_port @212
  +	apr_set_local_port @213
  +	apr_get_remote_port @214
  +	apr_set_remote_port @215
  +	apr_open_stderr @216
  +        apr_set_pipe_timeout   @217
  +        apr_terminate @218
  +        apr_dso_load @219
  +        apr_dso_unload @220
  +        apr_dso_sym @221
  +;        apr_dso_init @222
  +        apr_collapse_spaces @223
   	ap_month_snames @224
   	ap_day_snames @225
  -	ap_canonical_error @226
  -	ap_strerror @227
  -	ap_generate_random_bytes @228
  -	ap_strnatcmp @229
  -	ap_strnatcasecmp @230
  -        ap_dso_error @231
  +	apr_canonical_error @226
  +	apr_strerror @227
  +	apr_generate_random_bytes @228
  +	apr_strnatcmp @229
  +	apr_strnatcasecmp @230
  +        apr_dso_error @231
  
  
  
  1.24      +10 -10    apache-2.0/src/lib/apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.hw,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr.hw	2000/07/25 01:06:26	1.23
  +++ apr.hw	2000/08/04 02:48:37	1.24
  @@ -154,18 +154,18 @@
   
   /* Typedefs that APR needs. */
   
  -typedef  short           ap_int16_t;
  -typedef  unsigned short  ap_uint16_t;
  +typedef  short           apr_int16_t;
  +typedef  unsigned short  apr_uint16_t;
                                                  
  -typedef  int           ap_int32_t;
  -typedef  unsigned int  ap_uint32_t;
  +typedef  int           apr_int32_t;
  +typedef  unsigned int  apr_uint32_t;
                                                  
  -typedef  __int64           ap_int64_t;
  -typedef  unsigned __int64  ap_uint64_t;
  +typedef  __int64           apr_int64_t;
  +typedef  unsigned __int64  apr_uint64_t;
   
  -typedef  int         ap_size_t;
  -typedef  int         ap_ssize_t;
  -typedef  _off_t      ap_off_t;
  +typedef  int         apr_size_t;
  +typedef  int         apr_ssize_t;
  +typedef  _off_t      apr_off_t;
   typedef  int         pid_t;
   typedef  int         uid_t;
   typedef  int         gid_t;
  @@ -197,7 +197,7 @@
   #define APR_VAR_IMPORT           extern __declspec(dllimport)
   #endif
   
  -#define ap_signal(a,b) signal(a,b)
  +#define apr_signal(a,b) signal(a,b)
   
   typedef int ap_wait_t;
   
  
  
  
  1.25      +3 -3      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- sendrecv.c	2000/08/04 02:42:32	1.24
  +++ sendrecv.c	2000/08/04 02:48:37	1.25
  @@ -136,7 +136,7 @@
   }
   #if APR_HAS_SENDFILE
   /*
  - * apr_status_t ap_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, 
  + * apr_status_t apr_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, 
    *                         apr_off_t *, apr_size_t *, apr_int32_t flags)
    *    Send a file from an open file descriptor to a socket, along with 
    *    optional headers and trailers
  @@ -147,7 +147,7 @@
    * arg 5) Number of bytes to send 
    * arg 6) APR flags that are mapped to OS specific flags
    */
  -apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
           		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
           		apr_int32_t flags) 
   {
  @@ -257,7 +257,7 @@
   
       /* Mark the socket as disconnected, but do not close it.
        * Note: The application must have stored the socket prior to making
  -     * the call to ap_sendfile in order to either reuse it or close it.
  +     * the call to apr_sendfile in order to either reuse it or close it.
        */
       if ((lasterror == APR_SUCCESS) && (flags & APR_SENDFILE_DISCONNECT_SOCKET))
{
           sock->disconnected = 1;
  
  
  
  1.38      +8 -8      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- sendrecv.c	2000/08/02 05:26:29	1.37
  +++ sendrecv.c	2000/08/04 02:48:38	1.38
  @@ -260,7 +260,7 @@
       return rv;
   }
   
  -apr_status_t ap_sendfile(apr_socket_t *sock, apr_file_t *file,
  +apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
           		apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
           		apr_int32_t flags)
   {
  @@ -391,7 +391,7 @@
   #elif defined(__FreeBSD__)
   
   /* Release 3.1 or greater */
  -apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
           		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
           		apr_int32_t flags)
   {
  @@ -481,10 +481,10 @@
   
   #elif defined(__HPUX__)
   
  -#error "there's no way this ap_sendfile implementation works -djg"
  +#error "there's no way this apr_sendfile implementation works -djg"
   
   /* HP-UX Version 10.30 or greater */
  -apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
           		apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
           		apr_int32_t flags)
   {
  @@ -591,7 +591,7 @@
    * AIX -  version 4.3.2 with APAR IX85388, or version 4.3.3 and above
    * OS/390 - V2R7 and above
    */
  -apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
                           apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
                           apr_int32_t flags)
   {
  @@ -710,7 +710,7 @@
   }
   #elif defined(__osf__) && defined (__alpha)
   /*
  - * ap_sendfile for Tru64 Unix. 
  + * apr_sendfile for Tru64 Unix. 
    *
    * Note: while the sendfile implementation on Tru64 can send 
    * a one header/trailer with the file, it will send only one
  @@ -720,7 +720,7 @@
    * Rather than code these special cases in, using apr_sendv for
    * all cases of the headers and trailers seems to be a good idea.
    */
  -apr_status_t ap_sendfile(apr_socket_t * sock, apr_file_t * file,
  +apr_status_t apr_sendfile(apr_socket_t * sock, apr_file_t * file,
                           apr_hdtr_t * hdtr, apr_off_t * offset, apr_size_t * len,
                           apr_int32_t flags)
   {
  @@ -826,7 +826,7 @@
   
   #else
   #error APR has detected sendfile on your system, but nobody has written a
  -#error version of it for APR yet.  To get past this, either write ap_sendfile
  +#error version of it for APR yet.  To get past this, either write apr_sendfile
   #error or change APR_HAS_SENDFILE in apr.h to 0. 
   #endif /* __linux__, __FreeBSD__, __HPUX__, _AIX, __MVS__, Tru64/OSF1 */
   #endif /* APR_HAS_SENDFILE */
  
  
  
  1.12      +1 -1      apache-2.0/src/main/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/iol_socket.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- iol_socket.c	2000/08/02 17:51:39	1.11
  +++ iol_socket.c	2000/08/04 02:48:38	1.12
  @@ -137,7 +137,7 @@
                                      apr_hdtr_t *hdtr, apr_off_t *offset, 
                                      apr_size_t *len,  apr_int32_t flags) 
   {
  -    return ap_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
  +    return apr_sendfile(((iol_socket *)viol)->sock, file, hdtr, offset, len, flags);
   }
   #endif
   
  
  
  

Mime
View raw message