Diff for /embedaddon/php/main/SAPI.h between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:48:05 version 1.1.1.4, 2014/06/15 20:04:01
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 105  typedef struct { Line 105  typedef struct {
         /* this is necessary for the CGI SAPI module */          /* this is necessary for the CGI SAPI module */
         char *argv0;          char *argv0;
   
         /* this is necessary for Safe Mode */  
         char *current_user;          char *current_user;
         int current_user_length;          int current_user_length;
   
Line 129  typedef struct _sapi_globals_struct { Line 128  typedef struct _sapi_globals_struct {
         long post_max_size;          long post_max_size;
         int options;          int options;
         zend_bool sapi_started;          zend_bool sapi_started;
        time_t global_request_time;        double global_request_time;
         HashTable known_post_content_types;          HashTable known_post_content_types;
           zval *callback_func;
           zend_fcall_info_cache fci_cache;
           zend_bool callback_run;
 } sapi_globals_struct;  } sapi_globals_struct;
   
   
Line 190  SAPI_API void sapi_handle_post(void *arg TSRMLS_DC); Line 192  SAPI_API void sapi_handle_post(void *arg TSRMLS_DC);
 SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entry TSRMLS_DC);  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 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 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_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));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));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 int sapi_flush(TSRMLS_D);
 SAPI_API struct stat *sapi_get_stat(TSRMLS_D);  SAPI_API struct stat *sapi_get_stat(TSRMLS_D);
Line 208  SAPI_API int sapi_force_http_10(TSRMLS_D); Line 210  SAPI_API int sapi_force_http_10(TSRMLS_D);
   
 SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);  SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
 SAPI_API int sapi_get_target_gid(gid_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);  SAPI_API void sapi_terminate_process(TSRMLS_D);
 END_EXTERN_C()  END_EXTERN_C()
   
Line 237  struct _sapi_module_struct { Line 239  struct _sapi_module_struct {
         char *(*read_cookies)(TSRMLS_D);          char *(*read_cookies)(TSRMLS_D);
   
         void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);          void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
        void (*log_message)(char *message);        void (*log_message)(char *message TSRMLS_DC);
        time_t (*get_request_time)(TSRMLS_D);        double (*get_request_time)(TSRMLS_D);
         void (*terminate_process)(TSRMLS_D);          void (*terminate_process)(TSRMLS_D);
   
         char *php_ini_path_override;          char *php_ini_path_override;
Line 251  struct _sapi_module_struct { Line 253  struct _sapi_module_struct {
         char *executable_location;          char *executable_location;
   
         int php_ini_ignore;          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);          int (*get_fd)(int *fd TSRMLS_DC);
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>