diff options
Diffstat (limited to 'srclib/apr-util/include')
| -rw-r--r-- | srclib/apr-util/include/apr_buckets.h | 11 | ||||
| -rw-r--r-- | srclib/apr-util/include/apr_ldap.h.in | 2 | ||||
| -rw-r--r-- | srclib/apr-util/include/apr_memcache.h | 29 | ||||
| -rw-r--r-- | srclib/apr-util/include/apr_reslist.h | 10 | ||||
| -rw-r--r-- | srclib/apr-util/include/apr_xml.h | 6 | ||||
| -rw-r--r-- | srclib/apr-util/include/apu_version.h | 4 | ||||
| -rw-r--r-- | srclib/apr-util/include/private/apu_config.h.in | 3 |
7 files changed, 34 insertions, 31 deletions
diff --git a/srclib/apr-util/include/apr_buckets.h b/srclib/apr-util/include/apr_buckets.h index 6ee97f2c..7434864c 100644 --- a/srclib/apr-util/include/apr_buckets.h +++ b/srclib/apr-util/include/apr_buckets.h @@ -679,10 +679,11 @@ APU_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b); APU_DECLARE(apr_status_t) apr_brigade_cleanup(void *data); /** - * Move the buckets from the tail end of the existing brigade @param b into - * the brigade @param a. If @param a is NULL a new brigade is created. Buckets - * from @param e to the last bucket (inclusively) of brigade @param b are moved - * from @param b to the returned brigade @param a. + * Move the buckets from the tail end of the existing brigade @a b into + * the brigade @a a. If @a a is NULL a new brigade is created. Buckets + * from @a e to the last bucket (inclusively) of brigade @a b are moved + * from @a b to the returned brigade @a a. + * * @param b The brigade to split * @param e The first bucket to move * @param a The brigade which should be used for the result or NULL if @@ -774,7 +775,7 @@ APU_DECLARE(apr_status_t) apr_brigade_split_line(apr_bucket_brigade *bbOut, apr_off_t maxbytes); /** - * create an iovec of the elements in a bucket_brigade... return number + * Create an iovec of the elements in a bucket_brigade... return number * of elements used. This is useful for writing to a file or to the * network efficiently. * @param b The bucket brigade to create the iovec from diff --git a/srclib/apr-util/include/apr_ldap.h.in b/srclib/apr-util/include/apr_ldap.h.in index 6087783d..e30d3448 100644 --- a/srclib/apr-util/include/apr_ldap.h.in +++ b/srclib/apr-util/include/apr_ldap.h.in @@ -192,6 +192,6 @@ typedef struct apr_ldap_err_t { #include "apr_ldap_option.h" #include "apr_ldap_rebind.h" -/** @} */ #endif /* APR_HAS_LDAP */ +/** @} */ #endif /* APU_LDAP_H */ diff --git a/srclib/apr-util/include/apr_memcache.h b/srclib/apr-util/include/apr_memcache.h index 85287be8..766c0f01 100644 --- a/srclib/apr-util/include/apr_memcache.h +++ b/srclib/apr-util/include/apr_memcache.h @@ -120,6 +120,7 @@ typedef struct /** * Creates a crc32 hash used to split keys between servers + * @param mc The memcache client object to use * @param data Data to be hashed * @param data_len Length of the data to use * @return crc32 hash of data @@ -150,21 +151,20 @@ APU_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton, * @return server that controls specified hash * @see apr_memcache_hash */ -APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc, +APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc, const apr_uint32_t hash); /** * server selection compatible with the standard Perl Client. */ -APU_DECLARE(apr_memcache_server_t *) -apr_memcache_find_server_hash_default(void *baton, - apr_memcache_t *mc, - const apr_uint32_t hash); +APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash_default(void *baton, + apr_memcache_t *mc, + const apr_uint32_t hash); /** * Adds a server to a client object * @param mc The memcache client object to use - * @param ms Server to add + * @param server Server to add * @remark Adding servers is not thread safe, and should be done once at startup. * @warning Changing servers after startup may cause keys to go to * different servers. @@ -267,7 +267,7 @@ APU_DECLARE(void) apr_memcache_add_multget_key(apr_pool_t *data_pool, /** * Gets multiple values from the server, allocating the values out of p * @param mc client to use - * @param temp_pool Pool used for tempoary allocations. May be cleared inside this + * @param temp_pool Pool used for temporary allocations. May be cleared inside this * call. * @param data_pool Pool used to allocate data for the returned values. * @param values hash of apr_memcache_value_t keyed by strings, contains the @@ -284,9 +284,12 @@ APU_DECLARE(apr_status_t) apr_memcache_multgetp(apr_memcache_t *mc, * @param mc client to use * @param key null terminated string containing the key * @param baton data to store on the server - * @param len length of data at baton + * @param data_size length of data at baton * @param timeout time in seconds for the data to live on the server * @param flags any flags set by the client for this key + * @bug timeout is not implemented + * @bug timeouts for apr must be prototyped in apr_interval_time_t; + * this changes in 2.0 */ APU_DECLARE(apr_status_t) apr_memcache_set(apr_memcache_t *mc, const char *key, @@ -300,7 +303,7 @@ APU_DECLARE(apr_status_t) apr_memcache_set(apr_memcache_t *mc, * @param mc client to use * @param key null terminated string containing the key * @param baton data to store on the server - * @param len length of data at baton + * @param data_size length of data at baton * @param timeout time for the data to live on the server * @param flags any flags set by the client for this key * @return APR_SUCCESS if the key was added, APR_EEXIST if the key @@ -318,7 +321,7 @@ APU_DECLARE(apr_status_t) apr_memcache_add(apr_memcache_t *mc, * @param mc client to use * @param key null terminated string containing the key * @param baton data to store on the server - * @param len length of data at baton + * @param data_size length of data at baton * @param timeout time for the data to live on the server * @param flags any flags set by the client for this key * @return APR_SUCCESS if the key was added, APR_EEXIST if the key @@ -326,7 +329,7 @@ APU_DECLARE(apr_status_t) apr_memcache_add(apr_memcache_t *mc, */ APU_DECLARE(apr_status_t) apr_memcache_replace(apr_memcache_t *mc, const char *key, - char *data, + char *baton, const apr_size_t data_size, apr_uint32_t timeout, apr_uint16_t flags); @@ -345,7 +348,7 @@ APU_DECLARE(apr_status_t) apr_memcache_delete(apr_memcache_t *mc, * @param mc client to use * @param key null terminated string containing the key * @param n number to increment by - * @param nv new value after incrmenting + * @param nv new value after incrementing */ APU_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc, const char *key, @@ -357,7 +360,7 @@ APU_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc, * @param mc client to use * @param key null terminated string containing the key * @param n number to decrement by - * @param nv new value after decrementing + * @param new_value new value after decrementing */ APU_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc, const char *key, diff --git a/srclib/apr-util/include/apr_reslist.h b/srclib/apr-util/include/apr_reslist.h index 76a18648..273f7dd1 100644 --- a/srclib/apr-util/include/apr_reslist.h +++ b/srclib/apr-util/include/apr_reslist.h @@ -70,11 +70,13 @@ typedef apr_status_t (*apr_reslist_destructor)(void *resource, void *params, * list will be stored. * @param min Allowed minimum number of available resources. Zero * creates new resources only when needed. - * @param smax Resources will be destroyed to meet this maximum - * restriction as they expire. + * @param smax Resources will be destroyed during reslist maintenance to + * meet this maximum restriction as they expire (reach their ttl). * @param hmax Absolute maximum limit on the number of total resources. - * @param ttl If non-zero, sets the maximum amount of time in microseconds a - * resource may be available while exceeding the soft limit. + * @param ttl If non-zero, sets the maximum amount of time in microseconds an + * unused resource is valid. Any resource which has exceeded this + * time will be destroyed, either when encountered by + * apr_reslist_acquire() or during reslist maintenance. * @param con Constructor routine that is called to create a new resource. * @param de Destructor routine that is called to destroy an expired resource. * @param params Passed to constructor and deconstructor diff --git a/srclib/apr-util/include/apr_xml.h b/srclib/apr-util/include/apr_xml.h index 2a43b283..ac7f003b 100644 --- a/srclib/apr-util/include/apr_xml.h +++ b/srclib/apr-util/include/apr_xml.h @@ -218,7 +218,7 @@ APU_DECLARE(apr_xml_parser *) apr_xml_parser_create(apr_pool_t *pool); * Parse a File, producing a xml_doc * @param p The pool for allocating the parse results. * @param parser A pointer to *parser (needed so calling function can get - * errors), will be set to NULL on successfull completion. + * errors), will be set to NULL on successful completion. * @param ppdoc A pointer to *apr_xml_doc (which has the parsed results in it) * @param xmlfd A file to read from. * @param buffer_length Buffer length which would be suitable @@ -304,10 +304,10 @@ APU_DECLARE(const char *) apr_xml_empty_elem(apr_pool_t *p, /** * quote an XML string - * Replace '<', '>', and '&' with '<', '>', and '&'. + * Replace '\<', '\>', and '\&' with '\<', '\>', and '\&'. * @param p The pool to allocate out of * @param s The string to quote - * @param quotes If quotes is true, then replace '"' with '"'. + * @param quotes If quotes is true, then replace '"' with '\"'. * @return The quoted string * @note If the string does not contain special characters, it is not * duplicated into the pool and the original string is returned. diff --git a/srclib/apr-util/include/apu_version.h b/srclib/apr-util/include/apu_version.h index a7e0ed14..607c4ae2 100644 --- a/srclib/apr-util/include/apu_version.h +++ b/srclib/apr-util/include/apu_version.h @@ -59,14 +59,14 @@ * The Patch Level never includes API changes, simply bug fixes. * Reset to 0 when upgrading APR_MINOR_VERSION */ -#define APU_PATCH_VERSION 9 +#define APU_PATCH_VERSION 10 /** * The symbol APU_IS_DEV_VERSION is only defined for internal, * "development" copies of APU. It is undefined for released versions * of APU. */ -/* #undef APU_IS_DEV_VERSION */ +/* #define APU_IS_DEV_VERSION */ #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN) diff --git a/srclib/apr-util/include/private/apu_config.h.in b/srclib/apr-util/include/private/apu_config.h.in index 59274174..2bb7b69a 100644 --- a/srclib/apr-util/include/private/apu_config.h.in +++ b/srclib/apr-util/include/private/apu_config.h.in @@ -141,9 +141,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION |