clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Apache build

Browse Source
This commit is contained in:
Zeev Suraski 2000-10-31 18:28:04 +00:00
parent 8aecb3c984
commit 0ee12a6488
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_highlight.h
View File

@ -40,8 +40,8 @@ typedef struct _zend_syntax_highlighter_ini {
BEGIN_EXTERN_C() BEGIN_EXTERN_C()
ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini); ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini);
int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini); ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name); ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name);
ZEND_API void zend_html_putc(char c); ZEND_API void zend_html_putc(char c);
ZEND_API void zend_html_puts(char *s, uint len); ZEND_API void zend_html_puts(char *s, uint len);
END_EXTERN_C() END_EXTERN_C()

5
sapi/apache/mod_php4.c
View File

@ -124,7 +124,7 @@ void php_save_umask(void)
static int sapi_apache_ub_write(const char *str, uint str_length) static int sapi_apache_ub_write(const char *str, uint str_length)
{ {
int ret; uint ret;
SLS_FETCH(); SLS_FETCH();
if (SG(server_context)) { if (SG(server_context)) {
@ -576,11 +576,8 @@ static void *php_create_dir(pool *p, char *dummy)
static void *php_merge_dir(pool *p, void *basev, void *addv) static void *php_merge_dir(pool *p, void *basev, void *addv)
{ {
php_per_dir_entry tmp;
/* This function *must* return addv, and not modify basev */ /* This function *must* return addv, and not modify basev */
zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry); zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
/*zend_hash_merge((HashTable *) addv, (HashTable *) basev, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 0);*/
return addv; return addv;
} }