[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
pajoye Tue Jun 9 10:23:10 2009 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
- fix build (test before commit maybe?)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.15r2=1.16diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.15 php-src/sapi/apache/mod_php.c:1.16
--- php-src/sapi/apache/mod_php.c:1.15 Sat May 23 18:03:27 2009
+++ php-src/sapi/apache/mod_php.c Tue Jun 9 10:23:10 2009
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski z...@zend.com |
+--+
*/
-/* $Id: mod_php.c,v 1.15 2009/05/23 18:03:27 andrei Exp $ */
+/* $Id: mod_php.c,v 1.16 2009/06/09 10:23:10 pajoye Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -257,7 +257,7 @@
zval **path_translated;
HashTable *symbol_table;
unsigned int new_val_len;
- UConveter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
+ UConverter *conv = ZEND_U_CONVERTER(UG(runtime_encoding_conv));
for (i = 0; i arr-nelts; i++) {
char *val;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
stasSat Nov 29 00:46:27 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
MFB: init server context before config variables are processed
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.11r2=1.12diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.11 php-src/sapi/apache/mod_php.c:1.12
--- php-src/sapi/apache/mod_php.c:1.11 Tue Nov 25 00:33:10 2008
+++ php-src/sapi/apache/mod_php.c Sat Nov 29 00:46:27 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */
+/* $Id: mod_php.c,v 1.12 2008/11/29 00:46:27 stas Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -606,6 +606,8 @@
return OK;
}
+ SG(server_context) = r;
+
zend_first_try {
/* Make sure file exists */
@@ -663,8 +665,6 @@
/* Init timeout */
hard_timeout(send, r);
- SG(server_context) = r;
-
php_save_umask();
add_common_vars(r);
add_cgi_vars(r);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c /sapi/apache2handler apache_config.c
stasTue Nov 25 00:33:11 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c
/php-src/sapi/apache2handlerapache_config.c
Log:
MFB: fix php_value application order for Apache
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.10r2=1.11diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.10 php-src/sapi/apache/mod_php.c:1.11
--- php-src/sapi/apache/mod_php.c:1.10 Thu Nov 13 10:33:08 2008
+++ php-src/sapi/apache/mod_php.c Tue Nov 25 00:33:10 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.10 2008/11/13 10:33:08 lbarnaud Exp $ */
+/* $Id: mod_php.c,v 1.11 2008/11/25 00:33:10 stas Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -738,11 +738,11 @@
return 1; /* does not exist in dest, copy from source */
}
- if (new_per_dir_entry-type==PHP_INI_SYSTEM
-orig_per_dir_entry-type!=PHP_INI_SYSTEM) {
- return 1;
- } else {
+ if (orig_per_dir_entry-type==PHP_INI_SYSTEM
+new_per_dir_entry-type!=PHP_INI_SYSTEM) {
return 0;
+ } else {
+ return 1;
}
}
/* }}} */
@@ -779,9 +779,9 @@
/* need a copy of addv to merge */
new = php_create_dir(p, php_merge_dir);
- zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+ zend_hash_copy(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
- zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
return new;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.15r2=1.16diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.15
php-src/sapi/apache2handler/apache_config.c:1.16
--- php-src/sapi/apache2handler/apache_config.c:1.15Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache2handler/apache_config.c Tue Nov 25 00:33:11 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.15 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.16 2008/11/25 00:33:11 stas Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -117,6 +117,23 @@
return NULL;
}
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
+{
+ php_dir_entry *orig_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key-arKey.s, hash_key-nKeyLength,
(void **) orig_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
+ if (new_per_dir_entry-status = orig_per_dir_entry-status) {
+ /* use new entry */
+ phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n,
hash_key-arKey.s, new_per_dir_entry-status, orig_per_dir_entry-status));
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
{
@@ -128,9 +145,12 @@
ulong num_index;
n = create_php_config(p, merge_php_config);
- zend_hash_copy(n-config, e-config, NULL, NULL,
sizeof(php_dir_entry));
-
+ /* copy old config */
+ zend_hash_copy(n-config, d-config, NULL, NULL,
sizeof(php_dir_entry));
+ /* merge new config */
phpapdebug((stderr, Merge dir (%p)+(%p)=(%p)\n, base_conf, new_conf,
n));
+ zend_hash_merge_ex(n-config, e-config, NULL, sizeof(php_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
+#if STAS_0
for (zend_hash_internal_pointer_reset(d-config);
zend_hash_get_current_key_ex(d-config, str,
str_len,
num_index, 0, NULL) == HASH_KEY_IS_STRING;
@@ -143,7 +163,7 @@
zend_hash_update(n-config, str.s, str_len, data,
sizeof(*data), NULL);
phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n,
str.s, data-status, pe?pe-status:-1));
}
-
+#endif
return n;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c php_apache.c
indeyetsSat Jun 28 10:16:25 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c php_apache.c
Log:
updated to the new parameter-parsing api (port from 5.3)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.8r2=1.9diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.8 php-src/sapi/apache/mod_php.c:1.9
--- php-src/sapi/apache/mod_php.c:1.8 Sun Jun 1 16:10:46 2008
+++ php-src/sapi/apache/mod_php.c Sat Jun 28 10:16:24 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.8 2008/06/01 16:10:46 scottmac Exp $ */
+/* $Id: mod_php.c,v 1.9 2008/06/28 10:16:24 indeyets Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -243,7 +243,7 @@
table_entry *elts = (table_entry *) arr-elts;
zval **path_translated;
HashTable *symbol_table;
- int new_val_len;
+ unsigned int new_val_len;
for (i = 0; i arr-nelts; i++) {
char *val;
@@ -676,7 +676,7 @@
TSRMLS_FETCH();
ap_table_setn(r-notes, mod_php_memory_usage,
- ap_psprintf(r-pool, %u, zend_memory_peak_usage(1
TSRMLS_CC)));
+ ap_psprintf(r-pool, %lu, zend_memory_peak_usage(1
TSRMLS_CC)));
return result;
}
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.103r2=1.104diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.103
php-src/sapi/apache/php_apache.c:1.104
--- php-src/sapi/apache/php_apache.c:1.103 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache/php_apache.cSat Jun 28 10:16:25 2008
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.103 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.104 2008/06/28 10:16:25 indeyets Exp $ */
#include php_apache_http.h
@@ -141,28 +141,26 @@
Get and set Apache request notes */
PHP_FUNCTION(apache_note)
{
- zval **arg_name, **arg_val;
- char *note_val;
+ char *note_name, *note_val;
+ long note_name_len, note_val_len;
+ char *old_val;
int arg_count = ZEND_NUM_ARGS();
- if (arg_count1 || arg_count2 ||
- zend_get_parameters_ex(arg_count, arg_name, arg_val)
==FAILURE ) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(arg_count TSRMLS_CC, s|s, note_name,
note_name_len, note_val, note_val_len) == FAILURE) {
+ return;
}
-
- convert_to_string_ex(arg_name);
- note_val = (char *) table_get(((request_rec
*)SG(server_context))-notes, (*arg_name)-value.str.val);
-
+
+ old_val = (char *) table_get(((request_rec
*)SG(server_context))-notes, note_name);
+
if (arg_count == 2) {
- convert_to_string_ex(arg_val);
- table_set(((request_rec *)SG(server_context))-notes,
(*arg_name)-value.str.val, (*arg_val)-value.str.val);
+ table_set(((request_rec *)SG(server_context))-notes,
note_name, note_val);
}
- if (note_val) {
- RETURN_STRING(note_val, 1);
- } else {
- RETURN_FALSE;
+ if (old_val) {
+ RETURN_STRING(old_val, 1);
}
+
+ RETURN_FALSE;
}
/* }}} */
@@ -310,23 +308,25 @@
*/
PHP_FUNCTION(virtual)
{
- zval **filename;
+ char *filename;
+ long filename_len;
request_rec *rr = NULL;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, filename) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename,
filename_len) == FAILURE) {
+ return;
}
- convert_to_string_ex(filename);
- if (!(rr = sub_req_lookup_uri ((*filename)-value.str.val,
((request_rec *) SG(server_context) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
'%s' - URI lookup failed, (*filename)-value.str.val);
- if (rr) destroy_sub_req (rr);
+ if (!(rr = sub_req_lookup_uri (filename, ((request_rec *)
SG(server_context) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
'%s' - URI lookup failed, filename);
+ if (rr)
+ destroy_sub_req (rr);
RETURN_FALSE;
}
if (rr-status != 200) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
'%s' - error finding URI, (*filename)-value.str.val);
- if (rr) destroy_sub_req (rr);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to include
'%s' - error finding URI, filename);
+
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
scottmacSun Jun 1 16:10:46 2008 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
MFB: Fixed bug #45144 (ap_child_terminate() isn't available on threaded
builds)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.7r2=1.8diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.7 php-src/sapi/apache/mod_php.c:1.8
--- php-src/sapi/apache/mod_php.c:1.7 Wed Mar 19 16:37:48 2008
+++ php-src/sapi/apache/mod_php.c Sun Jun 1 16:10:46 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.7 2008/03/19 16:37:48 rasmus Exp $ */
+/* $Id: mod_php.c,v 1.8 2008/06/01 16:10:46 scottmac Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -435,7 +435,9 @@
*/
static void sapi_apache_child_terminate(TSRMLS_D)
{
+#ifndef MULTITHREAD
ap_child_terminate((request_rec *)SG(server_context));
+#endif
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
tony2001Mon Aug 6 12:54:35 2007 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.4r2=1.5diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.4 php-src/sapi/apache/mod_php.c:1.5
--- php-src/sapi/apache/mod_php.c:1.4 Fri Aug 3 01:40:05 2007
+++ php-src/sapi/apache/mod_php.c Mon Aug 6 12:54:35 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.4 2007/08/03 01:40:05 stas Exp $ */
+/* $Id: mod_php.c,v 1.5 2007/08/06 12:54:35 tony2001 Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -541,7 +541,7 @@
*/
static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry
TSRMLS_DC)
{
- zend_alter_ini_entry(per_dir_entry-key, per_dir_entry-key_length+1,
per_dir_entry-value, per_dir_entry-value_length, per_dir_entry-type,
data-htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE);
+ zend_alter_ini_entry(per_dir_entry-key, per_dir_entry-key_length+1,
per_dir_entry-value, per_dir_entry-value_length, per_dir_entry-type,
per_dir_entry-htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE);
return 0;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
scottmacMon Jun 18 15:57:00 2007 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
MFB: Fixed bug #41628 (PHP settings leak between Virtual Hosts in Apache 1.3).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.2 php-src/sapi/apache/mod_php.c:1.3
--- php-src/sapi/apache/mod_php.c:1.2 Thu Jan 11 23:18:11 2007
+++ php-src/sapi/apache/mod_php.c Mon Jun 18 15:57:00 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.2 2007/01/11 23:18:11 andrei Exp $ */
+/* $Id: mod_php.c,v 1.3 2007/06/18 15:57:00 scottmac Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -749,9 +749,15 @@
*/
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
- /* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev,
(copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
- return addv;
+ /* This function *must* not modify addv or basev */
+ HashTable *new;
+
+ /* need a copy of addv to merge */
+ new = php_create_dir(p, php_merge_dir);
+ zend_hash_copy(new, (HashTable *) addv, (copy_ctor_func_t)
copy_per_dir_entry, NULL, sizeof(php_per_dir_entry));
+
+ zend_hash_merge_ex(new, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ return new;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache mod_php.c
andrei Thu Jan 11 23:18:11 2007 UTC
Modified files:
/php-src/sapi/apachemod_php.c
Log:
Fake out the module name, since the filename is different now.
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.1 php-src/sapi/apache/mod_php.c:1.2
--- php-src/sapi/apache/mod_php.c:1.1 Wed Jan 10 23:46:09 2007
+++ php-src/sapi/apache/mod_php.c Thu Jan 11 23:18:11 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php.c,v 1.1 2007/01/10 23:46:09 andrei Exp $ */
+/* $Id: mod_php.c,v 1.2 2007/01/11 23:18:11 andrei Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -963,7 +963,13 @@
*/
module MODULE_VAR_EXPORT php6_module =
{
- STANDARD_MODULE_STUFF,
+ MODULE_MAGIC_NUMBER_MAJOR,
+ MODULE_MAGIC_NUMBER_MINOR,
+ -1,
+ mod_php6.c,
+ NULL,
+ NULL,
+ MODULE_MAGIC_COOKIE,
php_init_handler, /* initializer */
php_create_dir, /* per-directory config creator
*/
php_merge_dir, /* dir merger */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
