[BACK]Return to mod_php5.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / sapi / apache_hooks

Diff for /embedaddon/php/sapi/apache_hooks/mod_php5.c between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 23:48:06 version 1.1.1.3, 2013/07/22 01:32:13
Line 1 Line 1
 /*  /*
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | PHP Version 5                                                                                                            |   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                                            |   | Copyright (c) 1997-2013 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        |
   | available at through the world-wide-web at                                               |   | available at through the world-wide-web at                           |
   | http://www.php.net/license/3_01.txt                                                              |   | http://www.php.net/license/3_01.txt                                  |
    | If you did not receive a copy of the PHP license and are unable to   |     | If you did not receive a copy of the PHP license and are unable to   |
   | obtain it through the world-wide-web, please send a note to                  |   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.                           |   | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Authors: Rasmus Lerdorf <rasmus@php.net>                                                     |   | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
   | (with helpful hints from Dean Gaudet <dgaudet@arctic.org>                    |   | (with helpful hints from Dean Gaudet <dgaudet@arctic.org>            |
   | PHP 4.0 patches by Zeev Suraski <zeev@zend.com>                                      |   | PHP 4.0 patches by Zeev Suraski <zeev@zend.com>                      |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
  */   */
 /* $Id$ */  /* $Id$ */
Line 275  static int sapi_apache_read_post(char *buffer, uint co Line 275  static int sapi_apache_read_post(char *buffer, uint co
   
         /*          /*
          * This handles the situation where the browser sends a Expect: 100-continue header           * This handles the situation where the browser sends a Expect: 100-continue header
         * and needs to recieve confirmation from the server on whether or not it can send         * and needs to receive confirmation from the server on whether or not it can send
          * the rest of the request. RFC 2616           * the rest of the request. RFC 2616
          *           *
          */           */
Line 403  static void sapi_apache_register_server_variables(zval Line 403  static void sapi_apache_register_server_variables(zval
         /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */          /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */
         if (track_vars_array) {          if (track_vars_array) {
                 symbol_table = track_vars_array->value.ht;                  symbol_table = track_vars_array->value.ht;
         } else if (PG(register_globals)) {  
                 /* should never happen nowadays */  
                 symbol_table = EG(active_symbol_table);  
         } else {          } else {
                 symbol_table = NULL;                  symbol_table = NULL;
         }          }
Line 433  static int php_apache_startup(sapi_module_struct *sapi Line 430  static int php_apache_startup(sapi_module_struct *sapi
   
 /* {{{ php_apache_log_message  /* {{{ php_apache_log_message
  */   */
static void php_apache_log_message(char *message)static void php_apache_log_message(char *message TSRMLS_DC)
 {  {
         TSRMLS_FETCH();  
   
         if (SG(server_context)) {          if (SG(server_context)) {
 #if MODULE_MAGIC_NUMBER >= 19970831  #if MODULE_MAGIC_NUMBER >= 19970831
                 aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);                  aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);
Line 456  static void php_apache_request_shutdown(void *dummy) Line 451  static void php_apache_request_shutdown(void *dummy)
 {  {
         TSRMLS_FETCH();          TSRMLS_FETCH();
         AP(current_hook) = AP_CLEANUP;          AP(current_hook) = AP_CLEANUP;
        php_output_set_status(0 TSRMLS_CC);        php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC);
         SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */          SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */
         if(SG(sapi_started)) {          if(SG(sapi_started)) {
                 php_request_shutdown(dummy);                  php_request_shutdown(dummy);
Line 1256  static void php_init_handler(server_rec *s, pool *p) Line 1251  static void php_init_handler(server_rec *s, pool *p)
         {          {
                 TSRMLS_FETCH();                  TSRMLS_FETCH();
                 if (PG(expose_php)) {                  if (PG(expose_php)) {
 #if SUHOSIN_PATCH  
                         ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch");  
 #else  
                         ap_add_version_component("PHP/" PHP_VERSION);                          ap_add_version_component("PHP/" PHP_VERSION);
 #endif  
                 }                  }
         }          }
 #endif  #endif
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3

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