[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2008-01-16 Thread Ilia Alshanetsky 
iliaa   Wed Jan 16 15:50:53 2008 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  
  MFB: Fixed bug #42779 (Incorrect forcing from HTTP/1.0 request to HTTP/1.1
  response)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.85r2=1.86diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.85 
php-src/sapi/apache2handler/sapi_apache2.c:1.86
--- php-src/sapi/apache2handler/sapi_apache2.c:1.85 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jan 16 15:50:53 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.85 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.86 2008/01/16 15:50:53 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -134,8 +134,6 @@
ctx-r-proto_num = 1000 + (sline[7]-'0');
if ((sline[7]-'0') == 0) {
apr_table_set(ctx-r-subprocess_env, 
force-response-1.0, true);
-   } else {
-   apr_table_set(ctx-r-subprocess_env, 
force-response-1.1, true);
}
}


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2007-06-28 Thread Antony Dovgal 
tony2001Thu Jun 28 17:22:56 2007 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fix crash on shutdown on Win32
  patch by Scott
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.83r2=1.84diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.83 
php-src/sapi/apache2handler/sapi_apache2.c:1.84
--- php-src/sapi/apache2handler/sapi_apache2.c:1.83 Fri Jun  1 10:02:41 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Jun 28 17:22:56 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.83 2007/06/01 10:02:41 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.84 2007/06/28 17:22:56 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -349,8 +349,7 @@
STANDARD_SAPI_MODULE_PROPERTIES
 };
 
-static apr_status_t
-php_apache_server_shutdown(void *tmp)
+static apr_status_t php_apache_server_shutdown(void *tmp)
 {
apache2_sapi_module.shutdown(apache2_sapi_module);
sapi_shutdown();
@@ -360,6 +359,15 @@
return APR_SUCCESS;
 }
 
+static apr_status_t php_apache_child_shutdown(void *tmp)
+{
+   apache2_sapi_module.shutdown(apache2_sapi_module);
+#if defined(ZTS)  !defined(PHP_WIN32)
+   tsrm_shutdown();
+#endif
+   return APR_SUCCESS;
+}
+
 static void php_apache_add_version(apr_pool_t *p)
 {
TSRMLS_FETCH();
@@ -648,7 +656,7 @@
 
 static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
 {
-   apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, 
apr_pool_cleanup_null);
+   apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, 
apr_pool_cleanup_null);
 }
 
 void php_ap2_register_hook(apr_pool_t *p)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2007-06-01 Thread Antony Dovgal 
tony2001Fri Jun  1 10:02:41 2007 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fix #39330 (apache2handler does not call shutdown actions before apache child 
die)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.82r2=1.83diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.82 
php-src/sapi/apache2handler/sapi_apache2.c:1.83
--- php-src/sapi/apache2handler/sapi_apache2.c:1.82 Wed Feb  7 09:35:09 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Jun  1 10:02:41 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.82 2007/02/07 09:35:09 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.83 2007/06/01 10:02:41 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -646,11 +646,17 @@
return OK;
 }
 
+static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
+{
+   apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, 
apr_pool_cleanup_null);
+}
+
 void php_ap2_register_hook(apr_pool_t *p)
 {
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(php_apache_server_startup, NULL, NULL, 
APR_HOOK_MIDDLE);
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
+   ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-12-12 Thread Ilia Alshanetsky 
iliaa   Tue Dec 12 18:05:38 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB: Fixed bug #39797 (virtual() does not reset changed INI settings).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.77r2=1.78diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.77 
php-src/sapi/apache2handler/sapi_apache2.c:1.78
--- php-src/sapi/apache2handler/sapi_apache2.c:1.77 Thu Nov  9 19:10:27 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Dec 12 18:05:38 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.77 2006/11/09 19:10:27 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.78 2006/12/12 18:05:38 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -462,6 +462,20 @@
 {
if (strcmp(r-protocol, INCLUDED)) {
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+   } else {
+typedef struct {
+   HashTable config;
+} php_conf_rec;
+   char *str;
+   uint str_len;
+   php_conf_rec *c = ap_get_module_config(r-per_dir_config, 
php5_module);
+
+   for (zend_hash_internal_pointer_reset(c-config); 
+   zend_hash_get_current_key_ex(c-config, str, 
str_len, NULL, 0,  NULL) == HASH_KEY_IS_STRING;
+   zend_hash_move_forward(c-config)
+   ) {
+   zend_restore_ini_entry(str, str_len, 
ZEND_INI_STAGE_SHUTDOWN);
+   }   
}
if (p) {
((php_struct *)SG(server_context))-r = p;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-12-12 Thread Ilia Alshanetsky 
iliaa   Wed Dec 13 00:41:45 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB: Fixed bug #39201 (Possible crash in Apache 2 with 413 ErrorHandler).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.78r2=1.79diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.78 
php-src/sapi/apache2handler/sapi_apache2.c:1.79
--- php-src/sapi/apache2handler/sapi_apache2.c:1.78 Tue Dec 12 18:05:38 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Dec 13 00:41:45 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.78 2006/12/12 18:05:38 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.79 2006/12/13 00:41:45 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -582,8 +582,13 @@
}
}

-   /* check if comming due to ErrorDocument */
-   if (parent_req  parent_req-status != HTTP_OK  
strcmp(r-protocol, INCLUDED)) {
+   /* 
+* check if comming due to ErrorDocument 
+* We make a special exception of 413 (Invalid POST request) as 
the invalidity of the request occurs
+* during processing of the request by PHP during POST 
processing. Therefor we need to re-use the exiting
+* PHP instance to handle the request rather then creating a 
new one.
+   */
+   if (parent_req  parent_req-status != HTTP_OK  
parent_req-status != 413  strcmp(r-protocol, INCLUDED)) {
parent_req = NULL;
goto normal;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-11-09 Thread Ilia Alshanetsky 
iliaa   Thu Nov  9 19:10:27 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB: Fixed bug #38456 (Apache2 segfaults when virtual() is called in .php
  ErrorDocument).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.76r2=1.77diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.76 
php-src/sapi/apache2handler/sapi_apache2.c:1.77
--- php-src/sapi/apache2handler/sapi_apache2.c:1.76 Thu Nov  9 00:13:39 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Nov  9 19:10:27 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.76 2006/11/09 00:13:39 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.77 2006/11/09 19:10:27 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -569,7 +569,7 @@
}

/* check if comming due to ErrorDocument */
-   if (parent_req  parent_req-status != HTTP_OK) {
+   if (parent_req  parent_req-status != HTTP_OK  
strcmp(r-protocol, INCLUDED)) {
parent_req = NULL;
goto normal;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-11-08 Thread Ilia Alshanetsky 
iliaa   Thu Nov  9 00:13:39 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB: Fixed bug #38602 (header( HTTP/1.0 ... ) does not change proto
  version).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.75r2=1.76diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.75 
php-src/sapi/apache2handler/sapi_apache2.c:1.76
--- php-src/sapi/apache2handler/sapi_apache2.c:1.75 Mon Oct 23 19:17:51 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Nov  9 00:13:39 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.75 2006/10/23 19:17:51 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.76 2006/11/09 00:13:39 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -129,9 +129,14 @@
 
/* httpd requires that r-status_line is set to the first digit of
 * the status-code: */
-   if (sline  strlen(sline)  12  strncmp(sline, HTTP/1., 7) == 0 
-sline[8] == ' ') {
+   if (sline  strlen(sline)  12  strncmp(sline, HTTP/1., 7) == 0  
sline[8] == ' ') {
ctx-r-status_line = apr_pstrdup(ctx-r-pool, sline + 9);
+   ctx-r-proto_num = 1000 + (sline[7]-'0');
+   if ((sline[7]-'0') == 0) {
+   apr_table_set(ctx-r-subprocess_env, 
force-response-1.0, true);
+   } else {
+   apr_table_set(ctx-r-subprocess_env, 
force-response-1.1, true);
+   }
}

/*  call ap_set_content_type only once, else each time we call it, 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-08-08 Thread Stanislav Malyshev 
stasTue Aug  8 13:12:37 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fix bug with variables clobbered by longjmp
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.72r2=1.73diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.72 
php-src/sapi/apache2handler/sapi_apache2.c:1.73
--- php-src/sapi/apache2handler/sapi_apache2.c:1.72 Wed Jul 26 10:30:45 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Aug  8 13:12:37 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.72 2006/07/26 10:30:45 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.73 2006/08/08 13:12:37 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -460,12 +460,12 @@
 
 static int php_handler(request_rec *r)
 {
-   php_struct *ctx;
+   php_struct * volatile ctx;
void *conf;
-   apr_bucket_brigade *brigade;
+   apr_bucket_brigade * volatile brigade;
apr_bucket *bucket;
apr_status_t rv;
-   request_rec *parent_req = NULL;
+   request_rec * volatile parent_req = NULL;
TSRMLS_FETCH();
 
 #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2006-07-26 Thread Antony Dovgal 
tony2001Wed Jul 26 10:30:45 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  nuke unused variable
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.71r2=1.72diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.71 
php-src/sapi/apache2handler/sapi_apache2.c:1.72
--- php-src/sapi/apache2handler/sapi_apache2.c:1.71 Tue Jul 25 13:41:08 2006
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jul 26 10:30:45 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.71 2006/07/25 13:41:08 dmitry Exp $ */
+/* $Id: sapi_apache2.c,v 1.72 2006/07/26 10:30:45 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -416,7 +416,6 @@
 
 static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
 {
-   char *content_type;
char *content_length;
const char *auth;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-12-13 Thread Ilia Alshanetsky 
iliaa   Wed Dec 14 03:36:58 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB51: Fixed bug #35571 (Fixed crash in Apache 2 SAPI when more then one php 
  script is loaded via SSI include). (Ilia)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.64r2=1.65diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.64 
php-src/sapi/apache2handler/sapi_apache2.c:1.65
--- php-src/sapi/apache2handler/sapi_apache2.c:1.64 Fri Nov 18 19:01:50 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Dec 14 03:36:58 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.64 2005/11/18 19:01:50 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.65 2005/12/14 03:36:58 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -471,7 +471,7 @@
 
/* apply_config() needs r in some cases, so allocate server_context 
early */
ctx = SG(server_context);
-   if (ctx == NULL) {
+   if (ctx == NULL || (ctx  ctx-request_processed  
!strcmp(r-protocol, INCLUDED))) {
 normal:
ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-11-18 Thread Ilia Alshanetsky 
iliaa   Fri Nov 18 14:01:50 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB51: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module)
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.63r2=1.64ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.63 
php-src/sapi/apache2handler/sapi_apache2.c:1.64
--- php-src/sapi/apache2handler/sapi_apache2.c:1.63 Thu Nov 17 15:56:09 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Nov 18 14:01:50 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.63 2005/11/17 20:56:09 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.64 2005/11/18 19:01:50 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -443,6 +443,18 @@
php_request_shutdown(NULL);
 }
 
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+   if (strcmp(r-protocol, INCLUDED)) {
+   zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+   }
+   if (p) {
+   ((php_struct *)SG(server_context))-r = p;
+   } else {
+   apr_pool_cleanup_run(r-pool, (void *)SG(server_context), 
php_server_context_cleanup);
+   }
+}
+
 static int php_handler(request_rec *r)
 {
php_struct *ctx;
@@ -453,11 +465,7 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
 
-#define PHPAP_INI_OFF \
-   if (strcmp(r-protocol, INCLUDED)) { \
-   zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
-   } \
-   apr_pool_cleanup_run(r-pool, (void *)SG(server_context), 
php_server_context_cleanup); \
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
 
conf = ap_get_module_config(r-per_dir_config, php5_module);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-11-17 Thread Ilia Alshanetsky 
iliaa   Thu Nov 17 15:56:09 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Hopefully resolve all the Apache 2 sub-request problems on non-linux systems.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.62r2=1.63ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.62 
php-src/sapi/apache2handler/sapi_apache2.c:1.63
--- php-src/sapi/apache2handler/sapi_apache2.c:1.62 Wed Oct 26 11:08:42 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Nov 17 15:56:09 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.62 2005/10/26 15:08:42 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.63 2005/11/17 20:56:09 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -457,6 +457,7 @@
if (strcmp(r-protocol, INCLUDED)) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
} \
+   apr_pool_cleanup_run(r-pool, (void *)SG(server_context), 
php_server_context_cleanup); \
 
conf = ap_get_module_config(r-per_dir_config, php5_module);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-10-26 Thread Ilia Alshanetsky 
iliaa   Wed Oct 26 11:08:42 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB51: Additional tweaks to the patch for bug #34249.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.61r2=1.62ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.61 
php-src/sapi/apache2handler/sapi_apache2.c:1.62
--- php-src/sapi/apache2handler/sapi_apache2.c:1.61 Wed Oct 12 17:31:49 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Oct 26 11:08:42 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.61 2005/10/12 21:31:49 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.62 2005/10/26 15:08:42 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -535,7 +535,10 @@
if (!parent_req) {
parent_req = ctx-r;
}
-   if (parent_req  strcmp(parent_req-handler, PHP_MAGIC_TYPE) 
 strcmp(parent_req-handler, PHP_SOURCE_MAGIC_TYPE)  
strcmp(parent_req-handler, PHP_SCRIPT)) {
+   if (parent_req  parent_req-handler  
+   strcmp(parent_req-handler, PHP_MAGIC_TYPE)  
+   strcmp(parent_req-handler, 
PHP_SOURCE_MAGIC_TYPE)  
+   strcmp(parent_req-handler, PHP_SCRIPT)) {
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) 
{
zend_bailout();
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-10-12 Thread Antony Dovgal 
tony2001Wed Oct 12 17:31:58 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MF51: fix bug #34581 (crash with mod_rewrite)
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.60r2=1.61ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.60 
php-src/sapi/apache2handler/sapi_apache2.c:1.61
--- php-src/sapi/apache2handler/sapi_apache2.c:1.60 Tue Oct  4 20:42:54 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Oct 12 17:31:49 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.60 2005/10/05 00:42:54 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.61 2005/10/12 21:31:49 tony2001 Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -473,6 +473,7 @@
ctx-r = r;
ctx = NULL; /* May look weird to null it here, but it is to 
catch the right case in the first_try later on */
} else {
+   parent_req = ctx-r;
ctx-r = r;
}
apply_config(conf);
@@ -531,7 +532,15 @@
zend_bailout();
}
} else {
-   parent_req = ctx-r;
+   if (!parent_req) {
+   parent_req = ctx-r;
+   }
+   if (parent_req  strcmp(parent_req-handler, PHP_MAGIC_TYPE) 
 strcmp(parent_req-handler, PHP_SOURCE_MAGIC_TYPE)  
strcmp(parent_req-handler, PHP_SCRIPT)) {
+   if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) 
{
+   zend_bailout();
+   }
+   }
+   
/* check if comming due to ErrorDocument */
if (parent_req  parent_req-status != HTTP_OK) {
parent_req = NULL;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-10-04 Thread Ilia Alshanetsky 
iliaa   Tue Oct  4 20:42:58 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: Fixed possible INI setting leak via virtual() in Apache 2 sapi.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.59r2=1.60ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.59 
php-src/sapi/apache2handler/sapi_apache2.c:1.60
--- php-src/sapi/apache2handler/sapi_apache2.c:1.59 Fri Sep  2 09:50:39 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Oct  4 20:42:54 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.59 2005/09/02 13:50:39 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.60 2005/10/05 00:42:54 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -453,6 +453,11 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
 
+#define PHPAP_INI_OFF \
+   if (strcmp(r-protocol, INCLUDED)) { \
+   zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
+   } \
+
conf = ap_get_module_config(r-per_dir_config, php5_module);
 
/* apply_config() needs r in some cases, so allocate server_context 
early */
@@ -475,9 +480,7 @@
if (strcmp(r-handler, PHP_MAGIC_TYPE)  strcmp(r-handler, 
PHP_SOURCE_MAGIC_TYPE)  strcmp(r-handler, PHP_SCRIPT)) {
/* Check for xbithack in this case. */
if (!AP2(xbithack) || strcmp(r-handler, text/html) || 
!(r-finfo.protection  APR_UEXECUTE)) {
-   zend_try {
-   zend_ini_deactivate(TSRMLS_C);
-   } zend_end_try();
+   PHPAP_INI_OFF;
return DECLINED;
}
}
@@ -486,32 +489,24 @@
 * the configuration; default behaviour is to accept. */ 
if (r-used_path_info == AP_REQ_REJECT_PATH_INFO
 r-path_info  r-path_info[0]) {
-   zend_try {
-   zend_ini_deactivate(TSRMLS_C);
-   } zend_end_try();
+   PHPAP_INI_OFF;
return HTTP_NOT_FOUND;
}
 
/* handle situations where user turns the engine off */
if (!AP2(engine)) {
-   zend_try {
-   zend_ini_deactivate(TSRMLS_C);
-   } zend_end_try();
+   PHPAP_INI_OFF;
return DECLINED;
}
 
if (r-finfo.filetype == 0) {
php_apache_sapi_log_message_ex(script '%s' not found or unable 
to stat, r);
-   zend_try {
-   zend_ini_deactivate(TSRMLS_C);
-   } zend_end_try();
+   PHPAP_INI_OFF;
return HTTP_NOT_FOUND;
}
if (r-finfo.filetype == APR_DIR) {
php_apache_sapi_log_message_ex(attempt to invoke directory 
'%s' as script, r);
-   zend_try {
-   zend_ini_deactivate(TSRMLS_C);
-   } zend_end_try();
+   PHPAP_INI_OFF;
return HTTP_FORBIDDEN;
}
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-09-02 Thread Jani Taskinen 
sniper  Fri Sep  2 09:50:41 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Check the status properly
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.58r2=1.59ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.58 
php-src/sapi/apache2handler/sapi_apache2.c:1.59
--- php-src/sapi/apache2handler/sapi_apache2.c:1.58 Wed Aug 17 21:11:13 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Sep  2 09:50:39 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.58 2005/08/18 01:11:13 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.59 2005/09/02 13:50:39 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -538,7 +538,7 @@
} else {
parent_req = ctx-r;
/* check if comming due to ErrorDocument */
-   if (parent_req != HTTP_OK) {
+   if (parent_req  parent_req-status != HTTP_OK) {
parent_req = NULL;
goto normal;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-08-17 Thread Ilia Alshanetsky 
iliaa   Wed Aug 17 21:11:17 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #33987 (php script as ErrorDocument causes crash in Apache 2).
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57r2=1.58ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57 
php-src/sapi/apache2handler/sapi_apache2.c:1.58
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57 Wed Aug  3 10:08:48 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Aug 17 21:11:13 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.57 2005/08/03 14:08:48 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.58 2005/08/18 01:11:13 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -458,6 +458,7 @@
/* apply_config() needs r in some cases, so allocate server_context 
early */
ctx = SG(server_context);
if (ctx == NULL) {
+normal:
ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
/* register a cleanup so we clear out the SG(server_context)
 * after each request. Note: We pass in the pointer to the
@@ -536,6 +537,11 @@
}
} else {
parent_req = ctx-r;
+   /* check if comming due to ErrorDocument */
+   if (parent_req != HTTP_OK) {
+   parent_req = NULL;
+   goto normal;
+   }
ctx-r = r;
brigade = ctx-brigade;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-03-10 Thread Joe Orton 
jorton  Thu Mar 10 06:09:32 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  - Fixed bug #31717: Reject PATH_INFO if AcceptPathInfo off is used.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.51r2=1.52ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.51 
php-src/sapi/apache2handler/sapi_apache2.c:1.52
--- php-src/sapi/apache2handler/sapi_apache2.c:1.51 Mon Jan 17 07:24:40 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Mar 10 06:09:32 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.51 2005/01/17 12:24:40 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.52 2005/03/10 11:09:32 jorton Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -472,6 +472,16 @@
}
}
 
+   /* Give a 404 if PATH_INFO is used but is explicitly disabled in
+* the configuration; default behaviour is to accept. */ 
+   if (r-used_path_info == AP_REQ_REJECT_PATH_INFO
+r-path_info  r-path_info[0]) {
+   zend_try {
+   zend_ini_deactivate(TSRMLS_C);
+   } zend_end_try();
+   return HTTP_NOT_FOUND;
+   }
+
/* handle situations where user turns the engine off */
if (!AP2(engine)) {
zend_try {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2005-01-17 Thread Joe Orton 
jorton  Mon Jan 17 07:24:41 2005 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #31519: Set r-status_line to SAPI-provided status-line.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.50r2=1.51ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.50 
php-src/sapi/apache2handler/sapi_apache2.c:1.51
--- php-src/sapi/apache2handler/sapi_apache2.c:1.50 Thu Dec 16 07:34:32 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Jan 17 07:24:40 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.50 2004/12/16 12:34:32 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.51 2005/01/17 12:24:40 jorton Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -121,9 +121,17 @@
 php_apache_sapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 {
php_struct *ctx = SG(server_context);
+   const char *sline = SG(sapi_headers).http_status_line;
 
ctx-r-status = SG(sapi_headers).http_response_code;
 
+   /* httpd requires that r-status_line is set to the first digit of
+* the status-code: */
+   if (sline  strlen(sline)  12  strncmp(sline, HTTP/1., 7) == 0 
+sline[8] == ' ') {
+   ctx-r-status_line = apr_pstrdup(ctx-r-pool, sline + 9);
+   }
+
return SAPI_HEADER_SENT_SUCCESSFULLY;
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-12-06 Thread Stanislav Malyshev 
stasMon Dec  6 13:48:35 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  do not zero out peak - MM shutdown would do that
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.47r2=1.48ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.47 
php-src/sapi/apache2handler/sapi_apache2.c:1.48
--- php-src/sapi/apache2handler/sapi_apache2.c:1.47 Sat Oct 23 09:48:05 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Dec  6 13:48:35 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.47 2004/10/23 13:48:05 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.48 2004/12/06 18:48:35 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -547,7 +547,6 @@
char *mem_usage;
 
mem_usage = apr_psprintf(ctx-r-pool, %u, 
AG(allocated_memory_peak));
-   AG(allocated_memory_peak) = 0;
apr_table_set(r-notes, mod_php_memory_usage, 
mem_usage);
}
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-12-06 Thread Stanislav Malyshev 
stasMon Dec  6 13:55:30 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fix startup - if startup did not succeed, do not continue with execution
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.48r2=1.49ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.48 
php-src/sapi/apache2handler/sapi_apache2.c:1.49
--- php-src/sapi/apache2handler/sapi_apache2.c:1.48 Mon Dec  6 13:48:35 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Dec  6 13:55:30 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.48 2004/12/06 18:48:35 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.49 2004/12/06 18:55:30 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -400,7 +400,7 @@
return APR_SUCCESS;
 }
 
-static void php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
+static int php_apache_request_ctor(request_rec *r, php_struct *ctx TSRMLS_DC)
 {
char *content_type;
char *content_length;
@@ -433,7 +433,7 @@
SG(request_info).auth_user = NULL;
SG(request_info).auth_password = NULL;
}
-   php_request_startup(TSRMLS_C);
+   return php_request_startup(TSRMLS_C);
 }
 
 static void php_apache_request_dtor(request_rec *r TSRMLS_DC)
@@ -512,7 +512,9 @@
brigade = apr_brigade_create(r-pool, 
r-connection-bucket_alloc);
ctx-brigade = brigade;
 
-   php_apache_request_ctor(r, ctx TSRMLS_CC);
+   if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
+   zend_bailout();
+   }
} else {
parent_req = ctx-r;
ctx-r = r;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-10-20 Thread Joe Orton 
jorton  Wed Oct 20 05:28:47 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fix case where php_handle_aborted_connection was called outside a
  try/end_try block (#25570).
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.44r2=1.45ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.44 
php-src/sapi/apache2handler/sapi_apache2.c:1.45
--- php-src/sapi/apache2handler/sapi_apache2.c:1.44 Wed Aug 11 16:51:41 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Oct 20 05:28:47 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.44 2004/08/11 20:51:41 helly Exp $ */
+/* $Id: sapi_apache2.c,v 1.45 2004/10/20 09:28:47 jorton Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -567,7 +567,9 @@
 
rv = ap_pass_brigade(r-output_filters, brigade);
if (rv != APR_SUCCESS || r-connection-aborted) {
+zend_first_try {
php_handle_aborted_connection();
+} zend_end_try();
}
apr_brigade_cleanup(brigade);
} else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-08-11 Thread Marcus Boerger 
helly   Wed Aug 11 16:51:41 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  TSRM fix
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.43r2=1.44ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.43 
php-src/sapi/apache2handler/sapi_apache2.c:1.44
--- php-src/sapi/apache2handler/sapi_apache2.c:1.43 Tue Aug 10 13:40:00 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Aug 11 16:51:41 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.43 2004/08/10 17:40:00 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.44 2004/08/11 20:51:41 helly Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -278,8 +278,10 @@
 }
 
 static time_t php_apache_sapi_get_request_time(void) {
-   php_struct *ctx = SG(server_context);
+   php_struct *ctx;
TSRMLS_FETCH();
+   
+   ctx = SG(server_context);
 
return ctx-r-request_time;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-07-20 Thread Ilia Alshanetsky 
By all means, go ahead.

Ilia

On July 20, 2004 04:13 pm, Moriyoshi Koizumi wrote:
 I'm going to merge this patch to 4.3 branch if there's no problem.

 Moriyoshi

 On 2004/07/18, at 6:29, Moriyoshi Koizumi wrote:
  moriyoshi   Sat Jul 17 17:29:52 2004 EDT
 
Modified files:
  /php-src/sapi/apache2handlersapi_apache2.c
Log:
- request_dtor() should be called if a fatal error occurs during
  activation
  phase.
 
 
  http://cvs.php.net/diff.php/php-src/sapi/apache2handler/
  sapi_apache2.c?r1=1.40r2=1.41ty=u
  Index: php-src/sapi/apache2handler/sapi_apache2.c
  diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40
  php-src/sapi/apache2handler/sapi_apache2.c:1.41
  --- php-src/sapi/apache2handler/sapi_apache2.c:1.40 Fri Jun 25
  09:00:48 2004
  +++ php-src/sapi/apache2handler/sapi_apache2.c  Sat Jul 17 17:29:50 2004
  @@ -18,7 +18,7 @@
 
  +--
  +
*/
 
  -/* $Id: sapi_apache2.c,v 1.40 2004/06/25 13:00:48 edink Exp $ */
  +/* $Id: sapi_apache2.c,v 1.41 2004/07/17 21:29:50 moriyoshi Exp $ */
 
   #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
  @@ -547,6 +547,8 @@
   #endif
  }
 
  +} zend_end_try();
  +
  if (!parent_req) {
  php_apache_request_dtor(r TSRMLS_CC);
  ctx-request_processed = 1;
  @@ -561,8 +563,6 @@
  } else {
  ctx-r = parent_req;
  }
  -
  -} zend_end_try();
 
  return OK;
   }
 
  --
  PHP CVS Mailing List (http://www.php.net/)
  To unsubscribe, visit: http://www.php.net/unsub.php

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-07-17 Thread Moriyoshi Koizumi 
moriyoshi   Sat Jul 17 17:29:52 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  - request_dtor() should be called if a fatal error occurs during activation
phase.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40r2=1.41ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40 
php-src/sapi/apache2handler/sapi_apache2.c:1.41
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40 Fri Jun 25 09:00:48 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sat Jul 17 17:29:50 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.40 2004/06/25 13:00:48 edink Exp $ */
+/* $Id: sapi_apache2.c,v 1.41 2004/07/17 21:29:50 moriyoshi Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -547,6 +547,8 @@
 #endif
}
 
+} zend_end_try();
+
if (!parent_req) {
php_apache_request_dtor(r TSRMLS_CC);
ctx-request_processed = 1;
@@ -561,8 +563,6 @@
} else {
ctx-r = parent_req;
}
-
-} zend_end_try();
 
return OK;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-06-25 Thread Edin Kadribasic 
edink   Fri Jun 25 09:00:48 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFB: Memory leak fix (patch by Joe Orton)
  Fixes #28113. Adapted to php5 by Magnus Määttä.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.39r2=1.40ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.39 
php-src/sapi/apache2handler/sapi_apache2.c:1.40
--- php-src/sapi/apache2handler/sapi_apache2.c:1.39 Thu Jun 17 20:36:58 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Jun 25 09:00:48 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.39 2004/06/18 00:36:58 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.40 2004/06/25 13:00:48 edink Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -48,7 +48,7 @@
 #include http_log.h
 #include http_main.h
 #include util_script.h
-#include http_core.h 
+#include http_core.h
 #include ap_mpm.h
 
 #include php_apache.h
@@ -58,7 +58,7 @@
  * file does not use the system call shutdown, it is safe to #undef it.K
  */
 #undef shutdown
- 
+
 #define PHP_MAGIC_TYPE application/x-httpd-php
 #define PHP_SOURCE_MAGIC_TYPE application/x-httpd-php-source
 #define PHP_SCRIPT php5-script
@@ -69,31 +69,16 @@
 static int
 php_apache_sapi_ub_write(const char *str, uint str_length TSRMLS_DC)
 {
-   apr_bucket *bucket;
-   apr_bucket_brigade *brigade;
request_rec *r;
php_struct *ctx;
-   char *copy_str;
-
-   if (str_length == 0) {
-   return 0;
-   }
 
ctx = SG(server_context);
r = ctx-r;
-   brigade = ctx-brigade;
-   
-   copy_str = apr_pmemdup(r-pool, str, str_length);
-   bucket = apr_bucket_pool_create(copy_str, str_length, r-pool, 
r-connection-bucket_alloc);
-
-   APR_BRIGADE_INSERT_TAIL(brigade, bucket);
 
-   if (ap_pass_brigade(r-output_filters, brigade) != APR_SUCCESS || 
r-connection-aborted) {
+   if (ap_rwrite(str, str_length, r)  0) {
php_handle_aborted_connection();
}
-   /* Ensure this brigade is empty for the next usage. */
-   apr_brigade_cleanup(brigade);
-   
+
return str_length; /* we always consume all the data passed to us. */
 }
 
@@ -241,8 +226,6 @@
 php_apache_sapi_flush(void *server_context)
 {
php_struct *ctx;
-   apr_bucket_brigade *brigade;
-   apr_bucket *bucket;
request_rec *r;
TSRMLS_FETCH();
 
@@ -255,20 +238,15 @@
}
 
r = ctx-r;
-   brigade = ctx-brigade;
 
sapi_send_headers(TSRMLS_C);
 
r-status = SG(sapi_headers).http_response_code;
SG(headers_sent) = 1;
 
-   /* Send a flush bucket down the filter chain. */
-   bucket = apr_bucket_flush_create(r-connection-bucket_alloc);
-   APR_BRIGADE_INSERT_TAIL(brigade, bucket);
-   if (ap_pass_brigade(r-output_filters, brigade) != APR_SUCCESS || 
r-connection-aborted) {
+   if (ap_rflush(r)  0 || r-connection-aborted) {
php_handle_aborted_connection();
}
-   apr_brigade_cleanup(brigade);
 }
 
 static void php_apache_sapi_log_message(char *msg)
@@ -277,7 +255,7 @@
TSRMLS_FETCH();
 
ctx = SG(server_context);
-   
+
/* We use APLOG_STARTUP because it keeps us from printing the
 * data and time information at the beginning of the error log
 * line.  Not sure if this is correct, but it mirrors what happens
@@ -504,8 +482,8 @@
}
 
/* Setup the CGI variables if this is the main request */
-   if (r-main == NULL || 
-   /* .. or if the sub-request envinronment differs from the 
main-request. */ 
+   if (r-main == NULL ||
+   /* .. or if the sub-request envinronment differs from the 
main-request. */
r-subprocess_env != r-main-subprocess_env
) {
/* setup standard CGI variables */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-03-16 Thread Ilia Alshanetsky 
iliaa   Tue Mar 16 17:38:08 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #27580 (pre-initialization errors in ap2 handler are not being
  written to vhost error log).
  Stop using depreciated and ignored APLOG_NOERRNO directive.
  Make file not found  directory as script invocation error messages more
  descriptive.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.37r2=1.38ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.37 
php-src/sapi/apache2handler/sapi_apache2.c:1.38
--- php-src/sapi/apache2handler/sapi_apache2.c:1.37 Sun Mar  7 22:15:45 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Mar 16 17:38:07 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.37 2004/03/08 03:15:45 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.38 2004/03/16 22:38:07 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -55,7 +55,7 @@
 
 /* UnixWare and Netware define shutdown to _shutdown, which causes problems later
  * on when using a structure member named shutdown. Since this source
- * file does not use the system call shutdown, it is safe to #undef it.
+ * file does not use the system call shutdown, it is safe to #undef it.K
  */
 #undef shutdown
  
@@ -283,11 +283,18 @@
 * with Apache 1.3 -- rbb
 */
if (ctx == NULL) { /* we haven't initialized our ctx yet, oh well */
-   ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP,
-0, NULL, %s, msg);
+   ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, NULL, %s, 
msg);
} else {
-   ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP,
-0, ctx-r, %s, msg);
+   ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, ctx-r, %s, 
msg);
+   }
+}
+
+static void php_apache_sapi_log_message_ex(char *msg, request_rec *r)
+{
+   if (r) {
+   ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, r, msg, 
r-filename);
+   } else {
+   php_apache_sapi_log_message(msg);
}
 }
 
@@ -481,14 +488,14 @@
}
 
if (r-finfo.filetype == 0) {
-   php_apache_sapi_log_message(script not found or unable to stat);
+   php_apache_sapi_log_message_ex(script '%s' not found or unable to 
stat, r);
zend_try {
zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
return HTTP_NOT_FOUND;
}
if (r-finfo.filetype == APR_DIR) {
-   php_apache_sapi_log_message(attempt to invoke directory as script);
+   php_apache_sapi_log_message_ex(attempt to invoke directory '%s' as 
script, r);
zend_try {
zend_ini_deactivate(TSRMLS_C);
} zend_end_try();

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-02-10 Thread Rui Hirokawa 
hirokawaTue Feb 10 19:45:08 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  fixed a compilation error.
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.35r2=1.36ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.35 
php-src/sapi/apache2handler/sapi_apache2.c:1.36
--- php-src/sapi/apache2handler/sapi_apache2.c:1.35 Mon Feb  9 18:27:42 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Feb 10 19:45:07 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.35 2004/02/09 23:27:42 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.36 2004/02/11 00:45:07 hirokawa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -424,7 +424,7 @@
ap_set_content_type(r, apr_pstrdup(r-pool, content_type));
efree(content_type);
 
-   content_length = (char *) apr_table_get(f-r-headers_in, Content-Length);
+   content_length = (char *) apr_table_get(r-headers_in, Content-Length);
SG(request_info).content_length = (content_length ? atoi(content_length) : 0);
 
apr_table_unset(r-headers_out, Content-Length);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-01-28 Thread Ilia Alshanetsky 
iliaa   Wed Jan 28 21:16:47 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #27037 (fixed possible crash in apache2handler output code).
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.32r2=1.33ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.32 
php-src/sapi/apache2handler/sapi_apache2.c:1.33
--- php-src/sapi/apache2handler/sapi_apache2.c:1.32 Thu Jan  8 03:18:05 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Jan 28 21:16:47 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.32 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: sapi_apache2.c,v 1.33 2004/01/29 02:16:47 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -83,7 +83,7 @@
r = ctx-r;
brigade = ctx-brigade;

-   copy_str = apr_pmemdup(r-pool, str, str_length + 1);
+   copy_str = apr_pmemdup(r-pool, str, str_length);
bucket = apr_bucket_pool_create(copy_str, str_length, r-pool, 
r-connection-bucket_alloc);
 
APR_BRIGADE_INSERT_TAIL(brigade, bucket);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2003-09-18 Thread Ilia Alshanetsky 
iliaa   Thu Sep 18 20:44:50 2003 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called 
  outside of zend_try {} block).
  
  
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.26 
php-src/sapi/apache2handler/sapi_apache2.c:1.27
--- php-src/sapi/apache2handler/sapi_apache2.c:1.26 Wed Aug  6 18:33:18 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Sep 18 20:44:50 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.26 2003/08/06 22:33:18 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.27 2003/09/19 00:44:50 iliaa Exp $ */
 
 #include fcntl.h
 
@@ -487,6 +487,8 @@
ap_add_cgi_vars(r);
}
 
+zend_first_try {
+
ctx = SG(server_context);
if (ctx == NULL) {
ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
@@ -555,6 +557,8 @@
} else {
ctx-r = parent_req;
}
+
+} zend_end_try();
 
return OK;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2003-08-08 Thread Ilia Alshanetsky 
iliaa   Wed Aug  6 18:33:18 2003 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fixed bug #24958 (Incorrect handling of 404s)
  
  
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.25 
php-src/sapi/apache2handler/sapi_apache2.c:1.26
--- php-src/sapi/apache2handler/sapi_apache2.c:1.25 Sun Aug  3 07:22:53 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Aug  6 18:33:18 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.25 2003/08/03 11:22:53 thetaphi Exp $ */
+/* $Id: sapi_apache2.c,v 1.26 2003/08/06 22:33:18 iliaa Exp $ */
 
 #include fcntl.h
 
@@ -468,6 +468,15 @@
return DECLINED;
}
 
+   if (r-finfo.filetype == 0) {
+   php_apache_sapi_log_message(script not found or unable to stat);
+   return HTTP_NOT_FOUND;
+   }
+   if (r-finfo.filetype == APR_DIR) {
+   php_apache_sapi_log_message(attempt to invoke directory as script);
+   return HTTP_FORBIDDEN;
+   }
+
/* Setup the CGI variables if this is the main request */
if (r-main == NULL || 
/* .. or if the sub-request envinronment differs from the 
main-request. */ 
@@ -496,15 +505,6 @@
parent_req = ctx-r;
ctx-r = r;
brigade = ctx-brigade;
-   }
-
-   if (r-finfo.filetype == 0) {
-   php_apache_sapi_log_message(script not found or unable to stat);
-   return HTTP_NOT_FOUND;
-   }
-   if (r-finfo.filetype == APR_DIR) {
-   php_apache_sapi_log_message(attempt to invoke directory as script);
-   return HTTP_FORBIDDEN;
}
 
if (AP2(last_modified)) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2003-08-03 Thread Uwe Schindler 
thetaphiSun Aug  3 07:22:53 2003 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Fix Win32 Build because of missint TSRM stuff
  
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.24 
php-src/sapi/apache2handler/sapi_apache2.c:1.25
--- php-src/sapi/apache2handler/sapi_apache2.c:1.24 Sat Aug  2 14:29:30 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sun Aug  3 07:22:53 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.24 2003/08/02 18:29:30 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.25 2003/08/03 11:22:53 thetaphi Exp $ */
 
 #include fcntl.h
 
@@ -243,6 +243,7 @@
apr_bucket_brigade *brigade;
apr_bucket *bucket;
request_rec *r;
+   TSRMLS_FETCH();
 
ctx = server_context;
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php