|
|
@@ -352,7 +352,7 @@ const
|
|
|
major : Integer;
|
|
|
minor : Integer;
|
|
|
patch : Integer;
|
|
|
- add_string : PChar;
|
|
|
+ add_string : PAnsiChar;
|
|
|
end;
|
|
|
|
|
|
{*
|
|
|
@@ -371,7 +371,7 @@ const
|
|
|
* ServerTokens directive.
|
|
|
* @return The server banner
|
|
|
}
|
|
|
- function ap_get_server_banner: PChar;
|
|
|
+ function ap_get_server_banner: PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_get_server_revision' + LibSuff0;
|
|
|
|
|
|
@@ -382,7 +382,7 @@ const
|
|
|
* by the ServerTokens directive.
|
|
|
* @return The server description
|
|
|
}
|
|
|
- function ap_get_server_description: PChar;
|
|
|
+ function ap_get_server_description: PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_get_server_revision' + LibSuff0;
|
|
|
|
|
|
@@ -391,7 +391,7 @@ const
|
|
|
* @param pconf The pool to allocate the component from
|
|
|
* @param component The string to add
|
|
|
}
|
|
|
- procedure ap_add_version_component(pconf: Papr_pool_t; const component: PChar);
|
|
|
+ procedure ap_add_version_component(pconf: Papr_pool_t; const component: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_add_version_component' + LibSuff8;
|
|
|
|
|
|
@@ -399,7 +399,7 @@ const
|
|
|
* Get the date a time that the server was built
|
|
|
* @return The server build time string
|
|
|
}
|
|
|
- function ap_get_server_built: PChar;
|
|
|
+ function ap_get_server_built: PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_get_server_built' + LibSuff0;
|
|
|
|
|
|
@@ -679,7 +679,7 @@ const
|
|
|
Phtaccess_result = ^htaccess_result;
|
|
|
htaccess_result = record
|
|
|
{* the directory to which this applies }
|
|
|
- dir : Pchar;
|
|
|
+ dir : PAnsiChar;
|
|
|
{* the overrides allowed for the .htaccess file }
|
|
|
override : Integer;
|
|
|
{* the override options allowed for the .htaccess file }
|
|
|
@@ -712,9 +712,9 @@ const
|
|
|
{* Configuration pool. Cleared upon restart }
|
|
|
pconf : Papr_pool_t;
|
|
|
{* The program name used to execute the program }
|
|
|
- short_name : PChar;
|
|
|
+ short_name : PAnsiChar;
|
|
|
{* The command line arguments }
|
|
|
- argv : PChar;
|
|
|
+ argv : PAnsiChar;
|
|
|
{* Number of command line arguments passed to the program }
|
|
|
argc : Integer;
|
|
|
end;
|
|
|
@@ -729,7 +729,7 @@ const
|
|
|
{* The next server in the list }
|
|
|
next : Pserver_addr_rec;
|
|
|
{* The name given in "<VirtualHost>" }
|
|
|
- virthost : Pchar;
|
|
|
+ virthost : PAnsiChar;
|
|
|
{* The bound address, for this server }
|
|
|
host_addr : Papr_sockaddr_t;
|
|
|
{* The bound port, for this server }
|
|
|
@@ -739,7 +739,7 @@ const
|
|
|
Pap_logconf = ^ap_logconf;
|
|
|
ap_logconf = record
|
|
|
{* The per-module log levels }
|
|
|
- module_levels : ^char;
|
|
|
+ module_levels : ^AnsiChar;
|
|
|
{* The log level for this server }
|
|
|
level : longint;
|
|
|
end;
|
|
|
@@ -758,7 +758,7 @@ const
|
|
|
{ Log files --- note that transfer log is now in the modules... }
|
|
|
|
|
|
{* The name of the error log }
|
|
|
- error_fname : Pchar;
|
|
|
+ error_fname : PAnsiChar;
|
|
|
{* A file descriptor that references the error log }
|
|
|
error_log : Papr_file_t;
|
|
|
{* The log level configuration }
|
|
|
@@ -772,25 +772,25 @@ const
|
|
|
{* MIME type info, etc., before we start checking per-directory info }
|
|
|
lookup_defaults : Pap_conf_vector_t;
|
|
|
{* The name of the server }
|
|
|
- defn_name : Pchar;
|
|
|
+ defn_name : PAnsiChar;
|
|
|
{* The line of the config file that the server was defined on }
|
|
|
defn_line_number : dword;
|
|
|
{* true if this is the virtual server }
|
|
|
- is_virtual : char;
|
|
|
+ is_virtual : AnsiChar;
|
|
|
|
|
|
{ Information for redirects }
|
|
|
|
|
|
{* for redirects, etc. }
|
|
|
port : apr_port_t;
|
|
|
{* The server request scheme for redirect responses }
|
|
|
- server_scheme : Pchar;
|
|
|
+ server_scheme : PAnsiChar;
|
|
|
|
|
|
{ Contact information }
|
|
|
|
|
|
{* The admin's contact information }
|
|
|
- server_admin : Pchar;
|
|
|
+ server_admin : PAnsiChar;
|
|
|
{* The server hostname }
|
|
|
- server_hostname : Pchar;
|
|
|
+ server_hostname : PAnsiChar;
|
|
|
|
|
|
{ Transaction handling }
|
|
|
|
|
|
@@ -811,7 +811,7 @@ const
|
|
|
wild_names : Papr_array_header_t;
|
|
|
|
|
|
{* Pathname for ServerPath }
|
|
|
- path : Pchar;
|
|
|
+ path : PAnsiChar;
|
|
|
{* Length of path }
|
|
|
pathlen : Integer;
|
|
|
|
|
|
@@ -873,19 +873,19 @@ const
|
|
|
{* Client's IP address; this is the end-point of the next hop, for the
|
|
|
* IP of the request creator, see useragent_ip in request_rec
|
|
|
}
|
|
|
- remote_ip {client_ip} : Pchar; //fpc -> renamed to stay compatible with older apache versions and older fcl-web
|
|
|
+ remote_ip {client_ip} : PAnsiChar; //fpc -> renamed to stay compatible with older apache versions and older fcl-web
|
|
|
{* Client's DNS name, if known. NULL if DNS hasn't been checked,
|
|
|
* "" if it has and no address was found. N.B. Only access this though
|
|
|
* get_remote_host() }
|
|
|
- remote_host : Pchar;
|
|
|
+ remote_host : PAnsiChar;
|
|
|
{* Only ever set if doing rfc1413 lookups. N.B. Only access this through
|
|
|
* get_remote_logname() }
|
|
|
- remote_logname : Pchar;
|
|
|
+ remote_logname : PAnsiChar;
|
|
|
{* server IP address }
|
|
|
- local_ip : Pchar;
|
|
|
+ local_ip : PAnsiChar;
|
|
|
{* used for ap_get_server_name when UseCanonicalName is set to DNS
|
|
|
* (ignores setting of HostnameLookups) }
|
|
|
- local_host : Pchar;
|
|
|
+ local_host : PAnsiChar;
|
|
|
{* ID of this connection; unique at any point in time }
|
|
|
id : clong;
|
|
|
{* Config vector containing pointers to connections per-server
|
|
|
@@ -928,7 +928,7 @@ const
|
|
|
{* Id to identify this connection in error log. Set when the first
|
|
|
* error log entry for this connection is generated.
|
|
|
}
|
|
|
- log_id : Pchar;
|
|
|
+ log_id : PAnsiChar;
|
|
|
{* This points to the current thread being used to process this request,
|
|
|
* over the lifetime of a request, the value may change. Users of the connection
|
|
|
* record should not rely upon it staying the same between calls that invole
|
|
|
@@ -959,7 +959,7 @@ const
|
|
|
|
|
|
{ Info about the request itself... we begin with stuff that only protocol.c should ever touch... }
|
|
|
{* First line of request }
|
|
|
- the_request : Pchar;
|
|
|
+ the_request : PAnsiChar;
|
|
|
{* HTTP/0.9, "simple" request (e.g. GET /foo\n w/no headers) }
|
|
|
assbackwards : Integer;
|
|
|
{* A proxy request (calculated during post_read_request/translate_name)
|
|
|
@@ -972,13 +972,13 @@ const
|
|
|
{* Protocol version number of protocol; 1.1 = 1001 }
|
|
|
proto_num : Integer;
|
|
|
{* Protocol string, as given to us, or HTTP/0.9 }
|
|
|
- protocol : Pchar;
|
|
|
+ protocol : PAnsiChar;
|
|
|
{* Host, as set by full URI or Host: }
|
|
|
- hostname : Pchar;
|
|
|
+ hostname : PAnsiChar;
|
|
|
{* Time when the request started }
|
|
|
request_time : apr_time_t;
|
|
|
{* Status line, if set by script }
|
|
|
- status_line : Pchar;
|
|
|
+ status_line : PAnsiChar;
|
|
|
{* Status line }
|
|
|
status : Integer;
|
|
|
{ Request method, two ways; also, protocol, etc.. Outside of protocol.c,
|
|
|
@@ -987,7 +987,7 @@ const
|
|
|
{* M_GET, M_POST, etc. }
|
|
|
method_number : Integer;
|
|
|
{* Request method (eg. GET, HEAD, POST, etc.) }
|
|
|
- method : Pchar;
|
|
|
+ method : PAnsiChar;
|
|
|
|
|
|
{*
|
|
|
* 'allowed' is a bitvector of the allowed methods.
|
|
|
@@ -1022,7 +1022,7 @@ const
|
|
|
mtime : apr_time_t;
|
|
|
{ HTTP/1.1 connection-level features }
|
|
|
{* The Range: header }
|
|
|
- range : Pchar;
|
|
|
+ range : PAnsiChar;
|
|
|
{* The "real" content length }
|
|
|
clength : apr_off_t;
|
|
|
{* sending chunked transfer-coding }
|
|
|
@@ -1074,36 +1074,36 @@ const
|
|
|
* they should not be modified in place.
|
|
|
}
|
|
|
{* The content-type for the current request }
|
|
|
- content_type : Pchar; { Break these out --- we dispatch on 'em }
|
|
|
+ content_type : PAnsiChar; { Break these out --- we dispatch on 'em }
|
|
|
{* The handler string that we use to call a handler function }
|
|
|
- handler : Pchar; { What we *really* dispatch on }
|
|
|
+ handler : PAnsiChar; { What we *really* dispatch on }
|
|
|
{* How to encode the data }
|
|
|
- content_encoding : Pchar;
|
|
|
+ content_encoding : PAnsiChar;
|
|
|
{* Array of strings representing the content languages }
|
|
|
content_languages : Papr_array_header_t;
|
|
|
{* variant list validator (if negotiated) }
|
|
|
- vlist_validator : Pchar;
|
|
|
+ vlist_validator : PAnsiChar;
|
|
|
{* If an authentication check was made, this gets set to the user name. }
|
|
|
- user : Pchar;
|
|
|
+ user : PAnsiChar;
|
|
|
{* If an authentication check was made, this gets set to the auth type. }
|
|
|
- ap_auth_type : Pchar;
|
|
|
+ ap_auth_type : PAnsiChar;
|
|
|
|
|
|
{ What object is being requested (either directly, or via include
|
|
|
* or content-negotiation mapping).
|
|
|
}
|
|
|
{* The URI without any parsing performed }
|
|
|
- unparsed_uri : Pchar;
|
|
|
+ unparsed_uri : PAnsiChar;
|
|
|
{* The path portion of the URI, or "/" if no path provided }
|
|
|
- uri : Pchar;
|
|
|
+ uri : PAnsiChar;
|
|
|
{* The filename on disk corresponding to this response }
|
|
|
- filename : Pchar;
|
|
|
+ filename : PAnsiChar;
|
|
|
{ XXX: What does this mean? Please define "canonicalize" -aaron }
|
|
|
{* The true filename, we canonicalize r->filename if these don't match }
|
|
|
- canonical_filename : Pchar;
|
|
|
+ canonical_filename : PAnsiChar;
|
|
|
{* The PATH_INFO extracted from this request }
|
|
|
- path_info : Pchar;
|
|
|
+ path_info : PAnsiChar;
|
|
|
{* The QUERY_ARGS extracted from this request }
|
|
|
- args : Pchar;
|
|
|
+ args : PAnsiChar;
|
|
|
|
|
|
{*
|
|
|
* Flag for the handler to accept or reject path_info on
|
|
|
@@ -1132,7 +1132,7 @@ const
|
|
|
{* Id to identify request in access and error log. Set when the first
|
|
|
* error log entry for this request is generated.
|
|
|
}
|
|
|
- log_id : Pchar;
|
|
|
+ log_id : PAnsiChar;
|
|
|
{*
|
|
|
* A linked list of the .htaccess configuration directives
|
|
|
* accessed by this request.
|
|
|
@@ -1167,7 +1167,7 @@ const
|
|
|
* This is the address that originated the request.
|
|
|
}
|
|
|
useragent_addr : Papr_sockaddr_t;
|
|
|
- useragent_ip : Pchar;
|
|
|
+ useragent_ip : PAnsiChar;
|
|
|
end;
|
|
|
|
|
|
{*
|
|
|
@@ -1211,7 +1211,7 @@ const
|
|
|
* @note For resources that do not map to the file system or for very complex
|
|
|
* mappings, this information may still be wrong.
|
|
|
}
|
|
|
-function ap_context_document_root(r: Prequest_rec): PChar;
|
|
|
+function ap_context_document_root(r: Prequest_rec): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_context_document_root' + LibSuff4;
|
|
|
|
|
|
@@ -1220,7 +1220,7 @@ function ap_context_document_root(r: Prequest_rec): PChar;
|
|
|
* maps to the context_document_root on disk.
|
|
|
* @param r The request
|
|
|
}
|
|
|
-function ap_context_prefix(r: Prequest_rec): PChar;
|
|
|
+function ap_context_prefix(r: Prequest_rec): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_context_prefix' + LibSuff4;
|
|
|
|
|
|
@@ -1232,7 +1232,7 @@ function ap_context_prefix(r: Prequest_rec): PChar;
|
|
|
* @note If one of prefix of document_root is NULL, the corrsponding
|
|
|
* property will not be changed.
|
|
|
}
|
|
|
-procedure ap_set_context_info(r: Prequest_rec; const prefix, document_root: PChar);
|
|
|
+procedure ap_set_context_info(r: Prequest_rec; const prefix, document_root: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_set_context_info' + LibSuff12;
|
|
|
|
|
|
@@ -1241,7 +1241,7 @@ procedure ap_set_context_info(r: Prequest_rec; const prefix, document_root: PCha
|
|
|
* @param r The request
|
|
|
* @param document_root the document root for the request.
|
|
|
}
|
|
|
-procedure ap_set_document_root(r: Prequest_rec; const document_root: PChar);
|
|
|
+procedure ap_set_document_root(r: Prequest_rec; const document_root: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_set_document_root' + LibSuff8;
|
|
|
|
|
|
@@ -1252,7 +1252,7 @@ procedure ap_set_document_root(r: Prequest_rec; const document_root: PChar);
|
|
|
* @param intype The field to examine
|
|
|
* @return A copy of the field minus any parameters
|
|
|
}
|
|
|
-function ap_field_noparam(p: Papr_pool_t; const intype: PChar): PChar;
|
|
|
+function ap_field_noparam(p: Papr_pool_t; const intype: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_field_noparam' + LibSuff8;
|
|
|
|
|
|
@@ -1264,14 +1264,14 @@ function ap_field_noparam(p: Papr_pool_t; const intype: PChar): PChar;
|
|
|
* @param gmt Convert the time for GMT?
|
|
|
* @return The string that represents the specified time
|
|
|
}
|
|
|
-function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PChar; gmt: Integer): PChar;
|
|
|
+function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PAnsiChar; gmt: Integer): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_ht_time' + LibSuff20;
|
|
|
|
|
|
|
|
|
- { String handling. The *_nc variants allow you to use non-const char **s as
|
|
|
- arguments (unfortunately C won't automatically convert a char ** to a const
|
|
|
- char **) }
|
|
|
+ { String handling. The *_nc variants allow you to use non-const AnsiChar **s as
|
|
|
+ arguments (unfortunately C won't automatically convert a AnsiChar ** to a const
|
|
|
+ AnsiChar **) }
|
|
|
{*
|
|
|
* Get the characters until the first occurance of a specified character
|
|
|
* @param p The pool to allocate memory from
|
|
|
@@ -1279,7 +1279,7 @@ function ap_ht_time(p: Papr_pool_t; t: apr_time_t; const fmt: PChar; gmt: Intege
|
|
|
* @param stop The character to stop at
|
|
|
* @return A copy of the characters up to the first stop character
|
|
|
}
|
|
|
-function ap_getword(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
|
|
|
+function ap_getword(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword' + LibSuff12;
|
|
|
|
|
|
@@ -1289,9 +1289,9 @@ function ap_getword(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
|
|
|
* @param line The string to get the characters from
|
|
|
* @param stop The character to stop at
|
|
|
* @return A copy of the characters up to the first stop character
|
|
|
- * @note This is the same as ap_getword(), except it doesn't use const char **.
|
|
|
+ * @note This is the same as ap_getword(), except it doesn't use const AnsiChar **.
|
|
|
}
|
|
|
-function ap_getword_nc(p: Papr_pool_t; line: PPChar; stop: Char): PChar;
|
|
|
+function ap_getword_nc(p: Papr_pool_t; line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_nc' + LibSuff12;
|
|
|
|
|
|
@@ -1302,7 +1302,7 @@ function ap_getword_nc(p: Papr_pool_t; line: PPChar; stop: Char): PChar;
|
|
|
* @param line The string to traverse
|
|
|
* @return The first word in the line
|
|
|
}
|
|
|
-function ap_getword_white(p: Papr_pool_t; const line: PPChar): PChar;
|
|
|
+function ap_getword_white(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_white' + LibSuff8;
|
|
|
|
|
|
@@ -1312,9 +1312,9 @@ function ap_getword_white(p: Papr_pool_t; const line: PPChar): PChar;
|
|
|
* @param p The pool to allocate memory from
|
|
|
* @param line The string to traverse
|
|
|
* @return The first word in the line
|
|
|
- * @note The same as ap_getword_white(), except it doesn't use const char**
|
|
|
+ * @note The same as ap_getword_white(), except it doesn't use const AnsiChar**
|
|
|
}
|
|
|
-function ap_getword_white_nc(p: Papr_pool_t; line: PPChar): PChar;
|
|
|
+function ap_getword_white_nc(p: Papr_pool_t; line: PPAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_white_nc' + LibSuff8;
|
|
|
|
|
|
@@ -1326,7 +1326,7 @@ function ap_getword_white_nc(p: Papr_pool_t; line: PPChar): PChar;
|
|
|
* @return A copy of all caracters after the first occurance of the specified
|
|
|
* character
|
|
|
}
|
|
|
-function ap_getword_nulls(p: Papr_pool_t; const line: PPChar; stop: Char): PChar;
|
|
|
+function ap_getword_nulls(p: Papr_pool_t; const line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_nulls' + LibSuff12;
|
|
|
|
|
|
@@ -1337,9 +1337,9 @@ function ap_getword_nulls(p: Papr_pool_t; const line: PPChar; stop: Char): PChar
|
|
|
* @param stop The character to start at
|
|
|
* @return A copy of all caracters after the first occurance of the specified
|
|
|
* character
|
|
|
- * @note The same as ap_getword_nulls(), except it doesn't use const char **.
|
|
|
+ * @note The same as ap_getword_nulls(), except it doesn't use const AnsiChar **.
|
|
|
}
|
|
|
-function ap_getword_nulls_nc(p: Papr_pool_t; line: PPChar; stop: Char): PChar;
|
|
|
+function ap_getword_nulls_nc(p: Papr_pool_t; line: PPAnsiChar; stop: AnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_nulls_nc' + LibSuff12;
|
|
|
|
|
|
@@ -1349,7 +1349,7 @@ function ap_getword_nulls_nc(p: Papr_pool_t; line: PPChar; stop: Char): PChar;
|
|
|
* @param line The line to traverse
|
|
|
* @return A copy of the string
|
|
|
}
|
|
|
-function ap_getword_conf(p: Papr_pool_t; const line: PPChar): PChar;
|
|
|
+function ap_getword_conf(p: Papr_pool_t; const line: PPAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_conf' + LibSuff8;
|
|
|
|
|
|
@@ -1358,9 +1358,9 @@ function ap_getword_conf(p: Papr_pool_t; const line: PPChar): PChar;
|
|
|
* @param p The pool to allocate from
|
|
|
* @param line The line to traverse
|
|
|
* @return A copy of the string
|
|
|
- * @note The same as ap_getword_conf(), except it doesn't use const char **.
|
|
|
+ * @note The same as ap_getword_conf(), except it doesn't use const AnsiChar **.
|
|
|
}
|
|
|
-function ap_getword_conf_nc(p: Papr_pool_t; line: PPChar): PChar;
|
|
|
+function ap_getword_conf_nc(p: Papr_pool_t; line: PPAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getword_conf_nc' + LibSuff8;
|
|
|
|
|
|
@@ -1374,8 +1374,8 @@ function ap_getword_conf_nc(p: Papr_pool_t; line: PPChar): PChar;
|
|
|
* @param word The string to check
|
|
|
* @return The string with the replaced environment variables
|
|
|
}
|
|
|
-//AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word);
|
|
|
-function ap_resolve_env(p: Papr_pool_t; const word_: PChar): PChar;
|
|
|
+//AP_DECLARE(const AnsiChar *) ap_resolve_env(apr_pool_t *p, const AnsiChar * word);
|
|
|
+function ap_resolve_env(p: Papr_pool_t; const word_: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_resolve_env' + LibSuff8;
|
|
|
|
|
|
@@ -1388,8 +1388,8 @@ function ap_resolve_env(p: Papr_pool_t; const word_: PChar): PChar;
|
|
|
* address of field is shifted to the next non-comma, non-whitespace
|
|
|
* character. len is the length of the item excluding any beginning whitespace.
|
|
|
}
|
|
|
-//AP_DECLARE(const char *) ap_size_list_item(const char **field, int *len);
|
|
|
-function ap_size_list_item(const field: PPChar; len: PInteger): PChar;
|
|
|
+//AP_DECLARE(const AnsiChar *) ap_size_list_item(const AnsiChar **field, int *len);
|
|
|
+function ap_size_list_item(const field: PPAnsiChar; len: PInteger): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_size_list_item' + LibSuff8;
|
|
|
|
|
|
@@ -1403,7 +1403,7 @@ function ap_size_list_item(const field: PPChar; len: PInteger): PChar;
|
|
|
* item (or NULL if none) and the address pointed to by field is
|
|
|
* shifted to the next non-comma, non-whitespace.
|
|
|
}
|
|
|
-function ap_get_list_item(p: Papr_pool_t; const field: PPChar): PChar;
|
|
|
+function ap_get_list_item(p: Papr_pool_t; const field: PPAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_get_list_item' + LibSuff8;
|
|
|
|
|
|
@@ -1415,7 +1415,7 @@ function ap_get_list_item(p: Papr_pool_t; const field: PPChar): PChar;
|
|
|
* @param tok The token to search for
|
|
|
* @return 1 if found, 0 if not found.
|
|
|
}
|
|
|
-function ap_find_list_item(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
+function ap_find_list_item(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_find_list_item' + LibSuff12;
|
|
|
|
|
|
@@ -1429,7 +1429,7 @@ function ap_find_list_item(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
* @param accept_white Is it delimited by whitespace
|
|
|
* @return the token
|
|
|
}
|
|
|
-function ap_get_token(p: Papr_pool_t; const accept_line: PPChar; accept_white: Integer): PChar;
|
|
|
+function ap_get_token(p: Papr_pool_t; const accept_line: PPAnsiChar; accept_white: Integer): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_get_token' + LibSuff12;
|
|
|
|
|
|
@@ -1440,7 +1440,7 @@ function ap_get_token(p: Papr_pool_t; const accept_line: PPChar; accept_white: I
|
|
|
* @param tok The token to find
|
|
|
* @return 1 if the token is found, 0 otherwise
|
|
|
}
|
|
|
-function ap_find_token(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
+function ap_find_token(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_find_token' + LibSuff12;
|
|
|
|
|
|
@@ -1451,7 +1451,7 @@ function ap_find_token(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
* @param tok The token to find
|
|
|
* @return 1 if the token is found, 0 otherwise
|
|
|
}
|
|
|
-function ap_find_last_token(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
+function ap_find_last_token(p: Papr_pool_t; const line, tok: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_find_last_token' + LibSuff12;
|
|
|
|
|
|
@@ -1460,7 +1460,7 @@ function ap_find_last_token(p: Papr_pool_t; const line, tok: PChar): Integer;
|
|
|
* @param u The string to check
|
|
|
* @return 1 if URI, 0 otherwise
|
|
|
}
|
|
|
-function ap_is_url(const u: PChar): Integer;
|
|
|
+function ap_is_url(const u: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_is_url' + LibSuff4;
|
|
|
|
|
|
@@ -1469,7 +1469,7 @@ function ap_is_url(const u: PChar): Integer;
|
|
|
* @param url The string to unescape
|
|
|
* @return 0 on success, non-zero otherwise
|
|
|
}
|
|
|
-function ap_unescape_all(url: PChar): Integer;
|
|
|
+function ap_unescape_all(url: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_unescape_all' + LibSuff4;
|
|
|
|
|
|
@@ -1478,7 +1478,7 @@ function ap_unescape_all(url: PChar): Integer;
|
|
|
* @param url The url to unescape
|
|
|
* @return 0 on success, non-zero otherwise
|
|
|
}
|
|
|
-function ap_unescape_url(url: PChar): Integer;
|
|
|
+function ap_unescape_url(url: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_unescape_url' + LibSuff4;
|
|
|
|
|
|
@@ -1488,7 +1488,7 @@ function ap_unescape_url(url: PChar): Integer;
|
|
|
* @param decode_slashes Whether or not slashes should be decoded
|
|
|
* @return 0 on success, non-zero otherwise
|
|
|
}
|
|
|
-function ap_unescape_url_keep2f(url: PChar; decode_slashes: Integer): Integer;
|
|
|
+function ap_unescape_url_keep2f(url: PAnsiChar; decode_slashes: Integer): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_unescape_url_keep2f' + LibSuff8;
|
|
|
|
|
|
@@ -1497,7 +1497,7 @@ function ap_unescape_url_keep2f(url: PChar; decode_slashes: Integer): Integer;
|
|
|
* @param query The query to unescape
|
|
|
* @return 0 on success, non-zero otherwise
|
|
|
}
|
|
|
-function ap_unescape_urlencoded(query: PChar): Integer;
|
|
|
+function ap_unescape_urlencoded(query: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_unescape_urlencoded' + LibSuff4;
|
|
|
|
|
|
@@ -1505,7 +1505,7 @@ function ap_unescape_urlencoded(query: PChar): Integer;
|
|
|
* Convert all double slashes to single slashes
|
|
|
* @param name The string to convert
|
|
|
}
|
|
|
-procedure ap_no2slash(name: PChar);
|
|
|
+procedure ap_no2slash(name: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_no2slash' + LibSuff4;
|
|
|
|
|
|
@@ -1514,7 +1514,7 @@ procedure ap_no2slash(name: PChar);
|
|
|
* any leading ../ or /../ substrings.
|
|
|
* @param name the file name to parse
|
|
|
}
|
|
|
-procedure ap_getparents(name: PChar);
|
|
|
+procedure ap_getparents(name: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_getparents' + LibSuff4;
|
|
|
|
|
|
@@ -1524,7 +1524,7 @@ procedure ap_getparents(name: PChar);
|
|
|
* @param s The path to convert
|
|
|
* @return The converted URL
|
|
|
}
|
|
|
-function ap_escape_path_segment(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
+function ap_escape_path_segment(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_path_segment' + LibSuff8;
|
|
|
|
|
|
@@ -1534,7 +1534,7 @@ function ap_escape_path_segment(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
* @param s The path to convert
|
|
|
* @return The converted URL (c)
|
|
|
}
|
|
|
-function ap_escape_path_segment_buffer(c: PChar; const s: PChar): PChar;
|
|
|
+function ap_escape_path_segment_buffer(c: PAnsiChar; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_path_segment_buffer' + LibSuff8;
|
|
|
|
|
|
@@ -1546,7 +1546,7 @@ function ap_escape_path_segment_buffer(c: PChar; const s: PChar): PChar;
|
|
|
* with a '/' in it (and thus does not prefix "./")
|
|
|
* @return The converted URL
|
|
|
}
|
|
|
-function ap_os_escape_path(p: Papr_pool_t; const path: PChar; partial: Integer): PChar;
|
|
|
+function ap_os_escape_path(p: Papr_pool_t; const path: PAnsiChar; partial: Integer): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_os_escape_path' + LibSuff12;
|
|
|
|
|
|
@@ -1556,7 +1556,7 @@ function ap_os_escape_path(p: Papr_pool_t; const path: PChar; partial: Integer):
|
|
|
{ argument types are unknown }
|
|
|
{ return type might be wrong }
|
|
|
//#define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
|
|
|
-function ap_escape_uri(ppool: Papr_pool_t; const path: PChar) : PChar;
|
|
|
+function ap_escape_uri(ppool: Papr_pool_t; const path: PAnsiChar) : PAnsiChar;
|
|
|
|
|
|
{*
|
|
|
* Escape a string as application/x-www-form-urlencoded
|
|
|
@@ -1564,7 +1564,7 @@ function ap_escape_uri(ppool: Papr_pool_t; const path: PChar) : PChar;
|
|
|
* @param s The path to convert
|
|
|
* @return The converted URL
|
|
|
}
|
|
|
-function ap_escape_urlencoded(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
+function ap_escape_urlencoded(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_urlencoded' + LibSuff8;
|
|
|
|
|
|
@@ -1574,7 +1574,7 @@ function ap_escape_urlencoded(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
* @param s The path to convert
|
|
|
* @return The converted URL (c)
|
|
|
}
|
|
|
-function ap_escape_urlencoded_buffer(c: PChar; const s: PChar): PChar;
|
|
|
+function ap_escape_urlencoded_buffer(c: PAnsiChar; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_urlencoded_buffer' + LibSuff8;
|
|
|
|
|
|
@@ -1585,7 +1585,7 @@ function ap_escape_urlencoded_buffer(c: PChar; const s: PChar): PChar;
|
|
|
* @return The escaped string
|
|
|
}
|
|
|
//#define ap_escape_html(p,s) ap_escape_html2(p,s,0)
|
|
|
-function ap_escape_html(p: Papr_pool_t; const s: PChar) : PChar;
|
|
|
+function ap_escape_html(p: Papr_pool_t; const s: PAnsiChar) : PAnsiChar;
|
|
|
|
|
|
{*
|
|
|
* Escape an html string
|
|
|
@@ -1594,7 +1594,7 @@ function ap_escape_html(p: Papr_pool_t; const s: PChar) : PChar;
|
|
|
* @param toasc Whether to escape all non-ASCII chars to \&\#nnn;
|
|
|
* @return The escaped string
|
|
|
}
|
|
|
-function ap_escape_html2(p: Papr_pool_t; const s: PChar; toasc: Integer): PChar;
|
|
|
+function ap_escape_html2(p: Papr_pool_t; const s: PAnsiChar; toasc: Integer): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_html2' + LibSuff12;
|
|
|
|
|
|
@@ -1604,7 +1604,7 @@ function ap_escape_html2(p: Papr_pool_t; const s: PChar; toasc: Integer): PChar;
|
|
|
* @param str The string to escape
|
|
|
* @return The escaped string
|
|
|
}
|
|
|
-function ap_escape_logitem(p: Papr_pool_t; const str: PChar): PChar;
|
|
|
+function ap_escape_logitem(p: Papr_pool_t; const str: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_logitem' + LibSuff8;
|
|
|
|
|
|
@@ -1615,7 +1615,7 @@ function ap_escape_logitem(p: Papr_pool_t; const str: PChar): PChar;
|
|
|
* @param buflen The buffer size for the escaped string (including "\0")
|
|
|
* @return The len of the escaped string (always < maxlen)
|
|
|
}
|
|
|
-function ap_escape_errorlog_item(dest: PChar; const source: PChar;
|
|
|
+function ap_escape_errorlog_item(dest: PAnsiChar; const source: PAnsiChar;
|
|
|
buflen: apr_size_t): apr_size_t;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_errorlog_item' + LibSuff12;
|
|
|
@@ -1628,8 +1628,8 @@ function ap_escape_errorlog_item(dest: PChar; const source: PChar;
|
|
|
* @param r The current request
|
|
|
* @return The server's hostname
|
|
|
}
|
|
|
-function ap_construct_server(p: Papr_pool_t; const hostname: PChar;
|
|
|
- port: apr_port_t; const r: Prequest_rec): PChar;
|
|
|
+function ap_construct_server(p: Papr_pool_t; const hostname: PAnsiChar;
|
|
|
+ port: apr_port_t; const r: Prequest_rec): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_construct_server' + LibSuff16;
|
|
|
|
|
|
@@ -1639,7 +1639,7 @@ function ap_construct_server(p: Papr_pool_t; const hostname: PChar;
|
|
|
* @param s The command to escape
|
|
|
* @return The escaped shell command
|
|
|
}
|
|
|
-function ap_escape_shell_cmd(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
+function ap_escape_shell_cmd(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_shell_cmd' + LibSuff8;
|
|
|
|
|
|
@@ -1648,7 +1648,7 @@ function ap_escape_shell_cmd(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
* @param path The path to count
|
|
|
* @return The number of directories
|
|
|
}
|
|
|
-function ap_count_dirs(const path: PChar): Integer;
|
|
|
+function ap_count_dirs(const path: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_count_dirs' + LibSuff4;
|
|
|
|
|
|
@@ -1663,7 +1663,7 @@ function ap_count_dirs(const path: PChar): Integer;
|
|
|
* @note on platforms with drive letters, n = 0 returns the "/" root,
|
|
|
* whereas n = 1 returns the "d:/" root. On all other platforms, n = 0
|
|
|
* returns the empty string. }
|
|
|
-function ap_make_dirstr_prefix(d: PChar; const s: PChar; n: Integer): PChar;
|
|
|
+function ap_make_dirstr_prefix(d: PAnsiChar; const s: PAnsiChar; n: Integer): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_make_dirstr_prefix' + LibSuff12;
|
|
|
|
|
|
@@ -1674,7 +1674,7 @@ function ap_make_dirstr_prefix(d: PChar; const s: PChar; n: Integer): PChar;
|
|
|
* @param s The file to get the parent of
|
|
|
* @return A copy of the file's parent directory
|
|
|
}
|
|
|
-function ap_make_dirstr_parent(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
+function ap_make_dirstr_parent(p: Papr_pool_t; const s: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_make_dirstr_parent' + LibSuff8;
|
|
|
|
|
|
@@ -1690,7 +1690,7 @@ function ap_make_dirstr_parent(p: Papr_pool_t; const s: PChar): PChar;
|
|
|
* names that need to remain canonical, unless you are merging an apr_dir_read
|
|
|
* path and returned filename. Otherwise, the result is not canonical.
|
|
|
}
|
|
|
-function ap_make_full_path(a: Papr_pool_t; const dir, f: PChar): PChar;
|
|
|
+function ap_make_full_path(a: Papr_pool_t; const dir, f: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_make_full_path' + LibSuff12;
|
|
|
|
|
|
@@ -1702,7 +1702,7 @@ function ap_make_full_path(a: Papr_pool_t; const dir, f: PChar): PChar;
|
|
|
* multiple forms of absolute paths. This only reports if the path is absolute
|
|
|
* in a canonical sense.
|
|
|
}
|
|
|
-function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PChar): Integer;
|
|
|
+function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_os_is_path_absolute' + LibSuff8;
|
|
|
|
|
|
@@ -1713,7 +1713,7 @@ function ap_os_is_path_absolute(p: Papr_pool_t; const dir: PChar): Integer;
|
|
|
* @param str The string to check
|
|
|
* @return 1 if the string has wildcards, 0 otherwise
|
|
|
}
|
|
|
-function ap_is_matchexp(const str: PChar): Integer;
|
|
|
+function ap_is_matchexp(const str: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_is_matchexp' + LibSuff4;
|
|
|
|
|
|
@@ -1723,7 +1723,7 @@ function ap_is_matchexp(const str: PChar): Integer;
|
|
|
* @param expected The pattern to match against
|
|
|
* @return 0 if the two strings match, 1 otherwise
|
|
|
}
|
|
|
-function ap_strcmp_match(const str, expected: PChar): Integer;
|
|
|
+function ap_strcmp_match(const str, expected: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_strcmp_match' + LibSuff8;
|
|
|
|
|
|
@@ -1734,7 +1734,7 @@ function ap_strcmp_match(const str, expected: PChar): Integer;
|
|
|
* @param expected The pattern to match against
|
|
|
* @return 0 if the two strings match, 1 otherwise
|
|
|
}
|
|
|
-function ap_strcasecmp_match(const str, expected: PChar): Integer;
|
|
|
+function ap_strcasecmp_match(const str, expected: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_strcasecmp_match' + LibSuff8;
|
|
|
|
|
|
@@ -1745,7 +1745,7 @@ function ap_strcasecmp_match(const str, expected: PChar): Integer;
|
|
|
* @return A pointer to the beginning of the substring
|
|
|
* @remark See apr_strmatch() for a faster alternative
|
|
|
}
|
|
|
-function ap_strcasestr(const s1, s2: PChar): PChar;
|
|
|
+function ap_strcasestr(const s1, s2: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_strcasestr' + LibSuff8;
|
|
|
|
|
|
@@ -1755,7 +1755,7 @@ function ap_strcasestr(const s1, s2: PChar): PChar;
|
|
|
* @param prefix The prefix to strip away
|
|
|
* @return A pointer relative to bigstring after prefix
|
|
|
}
|
|
|
-function ap_stripprefix(const bigstring, prefix: PChar): PChar;
|
|
|
+function ap_stripprefix(const bigstring, prefix: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_stripprefix' + LibSuff8;
|
|
|
|
|
|
@@ -1765,7 +1765,7 @@ function ap_stripprefix(const bigstring, prefix: PChar): PChar;
|
|
|
* @param bufcoded The encoded string
|
|
|
* @return The decoded string
|
|
|
}
|
|
|
-function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PChar): PChar;
|
|
|
+function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_pbase64decode' + LibSuff8;
|
|
|
|
|
|
@@ -1775,8 +1775,8 @@ function ap_pbase64decode(p: Papr_pool_t; const bufcoded: PChar): PChar;
|
|
|
* @param string The plaintext string
|
|
|
* @return The encoded string
|
|
|
}
|
|
|
-//AP_DECLARE(char *) ap_pbase64encode(apr_pool_t *p, char *string);
|
|
|
-function ap_pbase64encode(p: Papr_pool_t; string_: PChar): PChar;
|
|
|
+//AP_DECLARE(AnsiChar *) ap_pbase64encode(apr_pool_t *p, AnsiChar *string);
|
|
|
+function ap_pbase64encode(p: Papr_pool_t; string_: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_pbase64encode' + LibSuff8;
|
|
|
|
|
|
@@ -1793,7 +1793,7 @@ function ap_pbase64encode(p: Papr_pool_t; string_: PChar): PChar;
|
|
|
* @li REG_NEWLINE - Match-any-character operators don't match new-line
|
|
|
* @return The compiled regular expression
|
|
|
}
|
|
|
-function ap_pregcomp(p: Papr_pool_t; const pattern: PChar; cflags: Integer): Pap_regex_t;
|
|
|
+function ap_pregcomp(p: Papr_pool_t; const pattern: PAnsiChar; cflags: Integer): Pap_regex_t;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_pregcomp' + LibSuff12;
|
|
|
|
|
|
@@ -1821,11 +1821,11 @@ procedure ap_pregfree(p: Papr_pool_t; reg: Pap_regex_t);
|
|
|
* @param pmatch the pmatch array returned from ap_pregex
|
|
|
* @return The substituted string, or NULL on error
|
|
|
}
|
|
|
-//AP_DECLARE(char *) ap_pregsub(apr_pool_t *p, const char *input,
|
|
|
-// const char *source, apr_size_t nmatch,
|
|
|
+//AP_DECLARE(AnsiChar *) ap_pregsub(apr_pool_t *p, const AnsiChar *input,
|
|
|
+// const AnsiChar *source, apr_size_t nmatch,
|
|
|
// ap_regmatch_t pmatch[]);
|
|
|
-function ap_pregsub(p: Papr_pool_t; const input, source: PChar;
|
|
|
- nmatch: apr_size_t; pmatch: array of ap_regmatch_t): PChar;
|
|
|
+function ap_pregsub(p: Papr_pool_t; const input, source: PAnsiChar;
|
|
|
+ nmatch: apr_size_t; pmatch: array of ap_regmatch_t): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_pregsub' + LibSuff20;
|
|
|
|
|
|
@@ -1843,12 +1843,12 @@ function ap_pregsub(p: Papr_pool_t; const input, source: PChar;
|
|
|
* @param maxlen the maximum string length to return, 0 for unlimited
|
|
|
* @return The substituted string, or NULL on error
|
|
|
}
|
|
|
-//AP_DECLARE(apr_status_t) ap_pregsub_ex(apr_pool_t *p, char **result,
|
|
|
-// const char *input, const char *source,
|
|
|
+//AP_DECLARE(apr_status_t) ap_pregsub_ex(apr_pool_t *p, AnsiChar **result,
|
|
|
+// const AnsiChar *input, const AnsiChar *source,
|
|
|
// apr_size_t nmatch,
|
|
|
// ap_regmatch_t pmatch[],
|
|
|
// apr_size_t maxlen);
|
|
|
-function ap_pregsub_ex(p: Papr_pool_t; result_: PPChar; const input, source: PChar;
|
|
|
+function ap_pregsub_ex(p: Papr_pool_t; result_: PPAnsiChar; const input, source: PAnsiChar;
|
|
|
nmatch: apr_size_t;
|
|
|
pmatch: array of ap_regmatch_t;
|
|
|
maxlen: apr_size_t): apr_status_t;
|
|
|
@@ -1860,7 +1860,7 @@ function ap_pregsub_ex(p: Papr_pool_t; result_: PPChar; const input, source: PCh
|
|
|
* but nothing else because ;parameter=foo values are case sensitive.
|
|
|
* @param s The content-type to convert to lowercase
|
|
|
}
|
|
|
-procedure ap_content_type_tolower(s: PChar);
|
|
|
+procedure ap_content_type_tolower(s: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_content_type_tolower' + LibSuff4;
|
|
|
|
|
|
@@ -1868,7 +1868,7 @@ procedure ap_content_type_tolower(s: PChar);
|
|
|
* convert a string to all lowercase
|
|
|
* @param s The string to convert to lowercase
|
|
|
}
|
|
|
-procedure ap_str_tolower(s: PChar);
|
|
|
+procedure ap_str_tolower(s: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_str_tolower' + LibSuff4;
|
|
|
|
|
|
@@ -1876,7 +1876,7 @@ procedure ap_str_tolower(s: PChar);
|
|
|
* convert a string to all uppercase
|
|
|
* @param s The string to convert to uppercase
|
|
|
}
|
|
|
-procedure ap_str_toupper(s: PChar);
|
|
|
+procedure ap_str_toupper(s: PAnsiChar);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_str_toupper' + LibSuff4;
|
|
|
|
|
|
@@ -1887,8 +1887,8 @@ procedure ap_str_toupper(s: PChar);
|
|
|
* @param c The character to search for
|
|
|
* @return The index of the first occurrence of c in str
|
|
|
}
|
|
|
-//AP_DECLARE(int) ap_ind(const char *str, char c); /* Sigh... */
|
|
|
-function ap_ind(const str: PChar; c: Char): Integer;
|
|
|
+//AP_DECLARE(int) ap_ind(const AnsiChar *str, AnsiChar c); /* Sigh... */
|
|
|
+function ap_ind(const str: PAnsiChar; c: AnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_ind' + LibSuff8;
|
|
|
|
|
|
@@ -1899,7 +1899,7 @@ function ap_ind(const str: PChar; c: Char): Integer;
|
|
|
* @param c The character to search for
|
|
|
* @return The index of the first occurrence of c in str
|
|
|
}
|
|
|
-function ap_rind(const str: PChar; c: Char): Integer;
|
|
|
+function ap_rind(const str: PAnsiChar; c: AnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_rind' + LibSuff8;
|
|
|
|
|
|
@@ -1909,7 +1909,7 @@ function ap_rind(const str: PChar; c: Char): Integer;
|
|
|
* @param instring The string to search for "
|
|
|
* @return A copy of the string with escaped quotes
|
|
|
}
|
|
|
-function ap_escape_quotes(p: Papr_pool_t; const instring: PChar): PChar;
|
|
|
+function ap_escape_quotes(p: Papr_pool_t; const instring: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_escape_quotes' + LibSuff8;
|
|
|
|
|
|
@@ -1923,7 +1923,7 @@ function ap_escape_quotes(p: Papr_pool_t; const instring: PChar): PChar;
|
|
|
* @param delim The string to use to deliminate the string from the PID
|
|
|
* @return A copy of the string with the PID appended
|
|
|
}
|
|
|
-function ap_append_pid(p: Papr_pool_t; const string_, delim: PChar): PChar;
|
|
|
+function ap_append_pid(p: Papr_pool_t; const string_, delim: PAnsiChar): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_append_pid' + LibSuff12;
|
|
|
|
|
|
@@ -1945,9 +1945,9 @@ function ap_append_pid(p: Papr_pool_t; const string_, delim: PChar): PChar;
|
|
|
* in timeout_parameter.
|
|
|
* @return Status value indicating whether the parsing was successful or not.
|
|
|
}
|
|
|
-function ap_timeout_parameter_parse(const timeout_parameter: PChar;
|
|
|
+function ap_timeout_parameter_parse(const timeout_parameter: PAnsiChar;
|
|
|
timeout: Papr_interval_time_t;
|
|
|
- const default_time_unit: PChar): apr_status_t;
|
|
|
+ const default_time_unit: PAnsiChar): apr_status_t;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_timeout_parameter_parse' + LibSuff12;
|
|
|
|
|
|
@@ -1971,8 +1971,8 @@ function ap_request_has_body(r: Prequest_rec): Integer;
|
|
|
* @param dest cleaned up, allocated string
|
|
|
* @return Status value indicating whether the cleaning was successful or not.
|
|
|
}
|
|
|
-function ap_pstr2_alnum(p: Papr_pool_t; const src: PChar;
|
|
|
- const dest: PPChar): apr_status_t;
|
|
|
+function ap_pstr2_alnum(p: Papr_pool_t; const src: PAnsiChar;
|
|
|
+ const dest: PPAnsiChar): apr_status_t;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_pstr2_alnum' + LibSuff12;
|
|
|
|
|
|
@@ -1985,7 +1985,7 @@ function ap_pstr2_alnum(p: Papr_pool_t; const src: PChar;
|
|
|
* @param dest cleaned up, pre-allocated string
|
|
|
* @return Status value indicating whether the cleaning was successful or not.
|
|
|
}
|
|
|
-function ap_str2_alnum(const src: PChar; dest: PChar): apr_status_t;
|
|
|
+function ap_str2_alnum(const src: PAnsiChar; dest: PAnsiChar): apr_status_t;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_str2_alnum' + LibSuff8;
|
|
|
|
|
|
@@ -1993,7 +1993,7 @@ function ap_str2_alnum(const src: PChar; dest: PChar): apr_status_t;
|
|
|
* Structure to store the contents of an HTTP form of the type
|
|
|
* application/x-www-form-urlencoded.
|
|
|
*
|
|
|
- * Currently it contains the name as a char* of maximum length
|
|
|
+ * Currently it contains the name as a AnsiChar* of maximum length
|
|
|
* HUGE_STRING_LEN, and a value in the form of a bucket brigade
|
|
|
* of arbitrary length.
|
|
|
}
|
|
|
@@ -2001,7 +2001,7 @@ function ap_str2_alnum(const src: PChar; dest: PChar): apr_status_t;
|
|
|
|
|
|
type
|
|
|
ap_form_pair_t = record
|
|
|
- name : PChar;
|
|
|
+ name : PAnsiChar;
|
|
|
value : Papr_bucket_brigade;
|
|
|
end;
|
|
|
{*
|
|
|
@@ -2030,7 +2030,7 @@ function ap_parse_form_data(r: Prequest_rec; f: Pap_filter_t;
|
|
|
* @param name The name of the object to check
|
|
|
* @return 1 if it is a directory, 0 otherwise
|
|
|
}
|
|
|
-function ap_is_rdirectory(p: Papr_pool_t; const name: PChar): Integer;
|
|
|
+function ap_is_rdirectory(p: Papr_pool_t; const name: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_is_rdirectory' + LibSuff8;
|
|
|
|
|
|
@@ -2040,15 +2040,15 @@ function ap_is_rdirectory(p: Papr_pool_t; const name: PChar): Integer;
|
|
|
* @param name The name of the object to check
|
|
|
* @return 1 if it is a directory, 0 otherwise
|
|
|
}
|
|
|
-function ap_is_directory(p: Papr_pool_t; const name: PChar): Integer;
|
|
|
+function ap_is_directory(p: Papr_pool_t; const name: PAnsiChar): Integer;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_is_directory' + LibSuff8;
|
|
|
|
|
|
//#ifdef _OSD_POSIX
|
|
|
-//extern int os_init_job_environment(server_rec *s, const char *user_name, int one_process);
|
|
|
+//extern int os_init_job_environment(server_rec *s, const AnsiChar *user_name, int one_process);
|
|
|
//#endif /* _OSD_POSIX */
|
|
|
//{$ifdef _OSD_POSIX}
|
|
|
-//function os_init_job_environment(s:Pserver_rec; const user_name:Pchar; one_process:integer):integer;cdecl;
|
|
|
+//function os_init_job_environment(s:Pserver_rec; const user_name:PAnsiChar; one_process:integer):integer;cdecl;
|
|
|
//{$endif} { _OSD_POSIX }
|
|
|
|
|
|
{*
|
|
|
@@ -2056,7 +2056,7 @@ function ap_is_directory(p: Papr_pool_t; const name: PChar): Integer;
|
|
|
* @param p The pool to allocate from
|
|
|
* @return A copy of the local host name
|
|
|
}
|
|
|
-//char *ap_get_local_host(apr_pool_t *p);
|
|
|
+//AnsiChar *ap_get_local_host(apr_pool_t *p);
|
|
|
|
|
|
{*
|
|
|
* Log an assertion to the error log
|
|
|
@@ -2064,7 +2064,7 @@ function ap_is_directory(p: Papr_pool_t; const name: PChar): Integer;
|
|
|
* @param szFile The file the assertion is in
|
|
|
* @param nLine The line the assertion is defined on
|
|
|
}
|
|
|
-procedure ap_log_assert(const szExp, szFile: PChar; nLine: Integer);
|
|
|
+procedure ap_log_assert(const szExp, szFile: PAnsiChar; nLine: Integer);
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_log_assert' + LibSuff12;
|
|
|
|
|
|
@@ -2117,7 +2117,7 @@ extern int raise_sigstop_flags;
|
|
|
* @param r The request_rec
|
|
|
* @return HTML describing the server, allocated in @a r's pool.
|
|
|
}
|
|
|
-function ap_psignature(const prefix: PChar; r: Prequest_rec): PChar;
|
|
|
+function ap_psignature(const prefix: PAnsiChar; r: Prequest_rec): PAnsiChar;
|
|
|
{$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
|
|
|
external LibHTTPD name LibNamePrefix + 'ap_psignature' + LibSuff8;
|
|
|
|
|
|
@@ -2142,12 +2142,12 @@ function ap_psignature(const prefix: PChar; r: Prequest_rec): PChar;
|
|
|
}
|
|
|
{#include <string.h>
|
|
|
|
|
|
-AP_DECLARE(char *) ap_strchr(char *s, int c);
|
|
|
-AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
|
|
|
-AP_DECLARE(char *) ap_strrchr(char *s, int c);
|
|
|
-AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
|
|
|
-AP_DECLARE(char *) ap_strstr(char *s, const char *c);
|
|
|
-AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
|
|
|
+AP_DECLARE(AnsiChar *) ap_strchr(AnsiChar *s, int c);
|
|
|
+AP_DECLARE(const AnsiChar *) ap_strchr_c(const AnsiChar *s, int c);
|
|
|
+AP_DECLARE(AnsiChar *) ap_strrchr(AnsiChar *s, int c);
|
|
|
+AP_DECLARE(const AnsiChar *) ap_strrchr_c(const AnsiChar *s, int c);
|
|
|
+AP_DECLARE(AnsiChar *) ap_strstr(AnsiChar *s, const AnsiChar *c);
|
|
|
+AP_DECLARE(const AnsiChar *) ap_strstr_c(const AnsiChar *s, const AnsiChar *c);
|
|
|
|
|
|
#ifdef AP_DEBUG
|
|
|
|
Michaël Van Canneyt