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

2005-03-10 Thread Joe Orton 
jorton  Thu Mar 10 06:39:04 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: - 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.1.2.38r2=1.1.2.39ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38 Mon Jan 17 07:36:44 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Mar 10 06:39:04 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.38 2005/01/17 12:36:44 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.39 2005/03/10 11:39:04 jorton Exp $ */
 
 #include fcntl.h
 
@@ -471,6 +471,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2005-01-17 Thread Joe Orton 
jorton  Mon Jan 17 07:36:44 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH - 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.1.2.37r2=1.1.2.38ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.37 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.38
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.37 Thu Dec 16 07:36:43 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Jan 17 07:36:44 2005
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.37 2004/12/16 12:36:43 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.38 2005/01/17 12:36:44 jorton Exp $ */
 
 #include fcntl.h
 
@@ -119,9 +119,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2004-12-06 Thread Stanislav Malyshev 
stasMon Dec  6 13:51:40 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/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.1.2.34r2=1.1.2.35ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.34 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.35
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.34 Thu Oct 21 15:43:37 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Dec  6 13:51:40 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.34 2004/10/21 19:43:37 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.35 2004/12/06 18:51:40 stas Exp $ */
 
 #include fcntl.h
 
@@ -544,9 +544,8 @@
 #if MEMORY_LIMIT
{
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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

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

  Modified files:  (Branch: PHP_4_3)
/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.1.2.35r2=1.1.2.36ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.35 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.36
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.35 Mon Dec  6 13:51:40 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Mon Dec  6 13:55:16 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.35 2004/12/06 18:51:40 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.36 2004/12/06 18:55:16 stas Exp $ */
 
 #include fcntl.h
 
@@ -399,7 +399,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;
@@ -432,7 +432,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)
@@ -511,7 +511,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2004-10-21 Thread Joe Orton 
jorton  Thu Oct 21 15:43:37 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: 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.1.2.33r2=1.1.2.34ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.34
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33 Tue Jul 20 16:48:01 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Oct 21 15:43:37 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.33 2004/07/20 20:48:01 moriyoshi Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.34 2004/10/21 19:43:37 jorton Exp $ */
 
 #include fcntl.h
 
@@ -562,7 +562,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2004-07-20 Thread Moriyoshi Koizumi 
moriyoshi   Tue Jul 20 16:48:02 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  - MFH (sapi_apache2.c: 1.41): request_dtor() should be called if a fatal
error occurs during activation phase.
  # 4.3.8 patches need to be committed to this branch, otherwise...
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.32r2=1.1.2.33ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.32 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.32 Fri Jun 25 08:51:38 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Jul 20 16:48:01 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.32 2004/06/25 12:51:38 edink Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.33 2004/07/20 20:48:01 moriyoshi Exp $ */
 
 #include fcntl.h
 
@@ -552,6 +552,8 @@
 #endif
}
 
+} zend_end_try();
+
if (!parent_req) {
php_apache_request_dtor(r TSRMLS_CC);
ctx-request_processed = 1;
@@ -566,8 +568,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2004-06-25 Thread Edin Kadribasic 
edink   Fri Jun 25 08:51:38 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  Memory leak fix (patch by Joe Orton)
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.31r2=1.1.2.32ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.31 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.32
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.31 Thu Jun 17 20:37:02 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Fri Jun 25 08:51:38 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.31 2004/06/18 00:37:02 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.32 2004/06/25 12:51:38 edink Exp $ */
 
 #include fcntl.h
 
@@ -67,30 +67,15 @@
 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. */
 }
@@ -246,8 +231,6 @@
 php_apache_sapi_flush(void *server_context)
 {
php_struct *ctx;
-   apr_bucket_brigade *brigade;
-   apr_bucket *bucket;
request_rec *r;
TSRMLS_FETCH();
 
@@ -260,20 +243,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)

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

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

2004-02-11 Thread Ilia Alshanetsky 
iliaa   Wed Feb 11 11:53:03 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH: fixed a compilation error.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.27r2=1.1.2.28ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.27 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.28
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.27 Mon Feb  9 18:28:47 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Feb 11 11:53:03 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.27 2004/02/09 23:28:47 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.28 2004/02/11 16:53:03 iliaa Exp $ */
 
 #include fcntl.h
 
@@ -429,7 +429,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(PHP_4_3) /sapi/apache2handler sapi_apache2.c

2003-08-03 Thread Uwe Schindler 
thetaphiSun Aug  3 07:23:25 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  MFH
  
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.20
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19 Sat Aug  2 14:30:21 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sun Aug  3 07:23:25 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.19 2003/08/02 18:30:21 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.20 2003/08/03 11:23:25 thetaphi Exp $ */
 
 #include fcntl.h
 
@@ -248,6 +248,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