Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/SAPI.h

On 2012-03-31, David Soria Parra <dsp@php.net> wrote: > Commit: 3bf53aa911e1e2128a11aee45c126000635de006 > Author: David Soria Parra <dsp@php.net> Sat, 31 Mar 2012 09:34:25 +0200 > Parents: aa774a51d5c45b98103e0f67914d4c0b152e80ae ff8be9845f14a8156e7551033c2e98dad459f6fd > Branches: PHP-5.4 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=3bf53aa911e1e2128a11aee45c126000635de006 > > Log: > Merge branch 'PHP-5.3' into PHP-5.4 > > * PHP-5.3: > Cleanup Safe Mode related comment in SG(request_info) > > Changed paths: > MM main/SAPI.h The diff is strange. Git and Gitweb show both that just the comment changed. The diff here displays the overall differneces between SAPI.h in PHP-5.3 and PHP-5.4 and not what I actually changed. I verified that the SAPI.h on the PHP-5.4 branch just had the comment removed. > > Diff: > 3bf53aa911e1e2128a11aee45c126000635de006 > diff --combined main/SAPI.h > index f868f85,9a063d3..8f2536b > --- a/main/SAPI.h > +++ b/main/SAPI.h > @@@ -105,7 -105,6 +105,6 @@@ typedef struct > /* this is necessary for the CGI SAPI module */ > char *argv0; > > - /* this is necessary for Safe Mode */ > char *current_user; > int current_user_length; > > @@@ -129,11 -128,8 +128,11 @@@ typedef struct _sapi_globals_struct > long post_max_size; > int options; > zend_bool sapi_started; > - time_t global_request_time; > + double global_request_time; > HashTable known_post_content_types; > + zval *callback_func; > + zend_fcall_info_cache fci_cache; > + zend_bool callback_run; > } sapi_globals_struct; > > > @@@ -193,9 -189,9 +192,9 @@@ SAPI_API void sapi_handle_post(void *ar > SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry TSRMLS_DC); > SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry TSRMLS_DC); > SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry TSRMLS_DC); > -SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D)); > -SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray > TSRMLS_DC)); > -SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char > **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int > (*input_filter_init)(TSRMLS_D)); > +SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) > TSRMLS_DC); > +SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray > TSRMLS_DC) TSRMLS_DC); > +SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char > **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int > (*input_filter_init)(TSRMLS_D) TSRMLS_DC); > > SAPI_API int sapi_flush(TSRMLS_D); > SAPI_API struct stat *sapi_get_stat(TSRMLS_D); > @@@ -211,7 -207,7 +210,7 @@@ SAPI_API int sapi_force_http_10(TSRMLS_ > > SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC); > SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC); > -SAPI_API time_t sapi_get_request_time(TSRMLS_D); > +SAPI_API double sapi_get_request_time(TSRMLS_D); > SAPI_API void sapi_terminate_process(TSRMLS_D); > END_EXTERN_C() > > @@@ -240,8 -236,8 +239,8 @@@ struct _sapi_module_struct > char *(*read_cookies)(TSRMLS_D); > > void (*register_server_variables)(zval *track_vars_array TSRMLS_DC); > - void (*log_message)(char *message); > - time_t (*get_request_time)(TSRMLS_D); > + void (*log_message)(char *message TSRMLS_DC); > + double (*get_request_time)(TSRMLS_D); > void (*terminate_process)(TSRMLS_D); > > char *php_ini_path_override; > @@@ -254,7 -250,6 +253,7 @@@ > char *executable_location; > > int php_ini_ignore; > + int php_ini_ignore_cwd; /* don't look for php.ini in the current directory */ > > int (*get_fd)(int *fd TSRMLS_DC); >