[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon May 7 01:31:11 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2680r2=1.2681diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2680 php-src/ChangeLog:1.2681 --- php-src/ChangeLog:1.2680Sun May 6 01:31:15 2007 +++ php-src/ChangeLog Mon May 7 01:31:10 2007 @@ -1,3 +1,61 @@ +2007-05-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/soap/soap.c: + + Allow SOAP extension's handler() to work even when + always_populate_raw_post_data is off. + + +* (PHP_5_2) + NEWS + main/php_content_types.c: + + Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no + default post handler). + +* tests/basic/025.phpt + tests/basic/025.phpt: + + file 025.phpt was initially added on branch PHP_5_2. + +* tests/basic/024.phpt + tests/basic/024.phpt: + + file 024.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS: + + Clarify bug fix details + +2007-05-06 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + main/php_ini.c: + MFH: Fixed PHP CLI to use the php.ini from the binary location + +2007-05-06 Johannes Schlüter [EMAIL PROTECTED] + +* ZendEngine2/tests/concat_001.phpt: + - Fix test + +2007-05-06 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/general_functions/ini_get_all.phpt: + Fix test + +* ext/standard/tests/general_functions/ini_get_all.phpt: + Fix test + +2007-05-06 Johannes Schlüter [EMAIL PROTECTED] + +* sapi/cli/php_cli.c: + - Fix build without reflection + 2007-05-05 Antony Dovgal [EMAIL PROTECTED] * ZendEngine2/tests/compare_001.phpt
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
johannesSun May 6 12:57:28 2007 UTC Modified files: /php-src/sapi/cli php_cli.c Log: - Fix build without reflection # reflection_what is used fby --ri, too http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.178r2=1.179diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.178 php-src/sapi/cli/php_cli.c:1.179 --- php-src/sapi/cli/php_cli.c:1.178Sat May 5 12:46:30 2007 +++ php-src/sapi/cli/php_cli.c Sun May 6 12:57:27 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.178 2007/05/05 12:46:30 helly Exp $ */ +/* $Id: php_cli.c,v 1.179 2007/05/06 12:57:27 johannes Exp $ */ #include php.h #include php_globals.h @@ -595,9 +595,7 @@ zend_file_handle file_handle; /* temporary locals */ enum behavior_mode behavior = PHP_MODE_STANDARD; -#ifdef HAVE_REFLECTION char *reflection_what = NULL; -#endif int orig_optind=php_optind; char *orig_optarg=php_optarg; char *arg_free=NULL, **arg_excp=arg_free; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cli php_cli.c
johannesSun May 6 12:57:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cli php_cli.c Log: - MFH: Fix build without reflection http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.19r2=1.129.2.13.2.20diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.19 php-src/sapi/cli/php_cli.c:1.129.2.13.2.20 --- php-src/sapi/cli/php_cli.c:1.129.2.13.2.19 Sat May 5 16:21:07 2007 +++ php-src/sapi/cli/php_cli.c Sun May 6 12:57:50 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.129.2.13.2.19 2007/05/05 16:21:07 helly Exp $ */ +/* $Id: php_cli.c,v 1.129.2.13.2.20 2007/05/06 12:57:50 johannes Exp $ */ #include php.h #include php_globals.h @@ -580,9 +580,7 @@ zend_file_handle file_handle; /* temporary locals */ int behavior=PHP_MODE_STANDARD; -#ifdef HAVE_REFLECTION char *reflection_what = NULL; -#endif int orig_optind=php_optind; char *orig_optarg=php_optarg; char *arg_free=NULL, **arg_excp=arg_free; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions ini_get_all.phpt
bjori Sun May 6 13:11:11 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions ini_get_all.phpt Log: Fix test # pcre is required for the test suite so no need to check for it # reflection can however be disabled http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/ini_get_all.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/ini_get_all.phpt diff -u php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.2 php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.3 --- php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.2 Tue Feb 13 13:01:18 2007 +++ php-src/ext/standard/tests/general_functions/ini_get_all.phpt Sun May 6 13:11:11 2007 @@ -1,7 +1,7 @@ --TEST-- ini_get_all() tests --SKIPIF-- -?php if (!extension_loaded(pcre)) die(skip); ? +?php if (!extension_loaded(reflection)) die(skip); ? --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions ini_get_all.phpt
bjori Sun May 6 13:11:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions ini_get_all.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/ini_get_all.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/ini_get_all.phpt diff -u php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.1 Tue Feb 13 12:59:53 2007 +++ php-src/ext/standard/tests/general_functions/ini_get_all.phpt Sun May 6 13:11:31 2007 @@ -1,7 +1,7 @@ --TEST-- ini_get_all() tests --SKIPIF-- -?php if (!extension_loaded(pcre)) die(skip); ? +?php if (!extension_loaded(reflection)) die(skip); ? --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main php_ini.c
bjori Sun May 6 14:01:27 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_ini.c
/php-srcNEWS
Log:
MFH: Fixed PHP CLI to use the php.ini from the binary location
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.8r2=1.136.2.4.2.9diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.8
php-src/main/php_ini.c:1.136.2.4.2.9
--- php-src/main/php_ini.c:1.136.2.4.2.8Mon Apr 16 08:09:56 2007
+++ php-src/main/php_ini.c Sun May 6 14:01:26 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.8 2007/04/16 08:09:56 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.9 2007/05/06 14:01:26 bjori Exp $ */
#include php.h
#include ext/standard/info.h
@@ -353,7 +353,26 @@
#else
if (sapi_module.executable_location) {
binary_location = (char *)emalloc(PATH_MAX);
- if (!realpath(sapi_module.executable_location,
binary_location)) {
+ if (!strchr(sapi_module.executable_location, '/')) {
+ char *path;
+ int found = 0;
+
+ if ((path = getenv(PATH)) != NULL) {
+ char *search_dir,
search_path[MAXPATHLEN];
+
+ while ((search_dir = strsep(path,
:)) != NULL) {
+ snprintf(search_path,
MAXPATHLEN, %s/%s, search_dir, sapi_module.executable_location);
+ if (VCWD_REALPATH(search_path,
binary_location) !VCWD_ACCESS(binary_location, X_OK)) {
+ found = 1;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ efree(binary_location);
+ binary_location = NULL;
+ }
+ } else if
(!VCWD_REALPATH(sapi_module.executable_location, binary_location) ||
VCWD_ACCESS(binary_location, X_OK)) {
efree(binary_location);
binary_location = NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.682r2=1.2027.2.547.2.683diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.682 php-src/NEWS:1.2027.2.547.2.683
--- php-src/NEWS:1.2027.2.547.2.682 Sat May 5 15:36:15 2007
+++ php-src/NEWSSun May 6 14:01:26 2007
@@ -4,6 +4,7 @@
- Fixed ext/filter Email Validation Vulnerability (MOPB-24 by Stefan Esser)
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
+- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be
optional). (Rob)
- Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Sun May 6 15:37:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Clarify bug fix details http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.683r2=1.2027.2.547.2.684diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.683 php-src/NEWS:1.2027.2.547.2.684 --- php-src/NEWS:1.2027.2.547.2.683 Sun May 6 14:01:26 2007 +++ php-src/NEWSSun May 6 15:37:07 2007 @@ -9,8 +9,8 @@ optional). (Rob) - Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled sqlite2 lib). (Ilia) -- Fixed bug #41283 (Bug with serializing array key that are doubles or - floats). (Ilia) +- Fixed bug #41283 (Bug with deserializing array key that are doubles or + floats in wddx). (Ilia) - Fixed bug #41257: (lookupNamespaceURI does not work as expected). (Rob) - Fixed bug #41097 (ext/soap returning associative array as indexed without using WSDL). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 024.phpt
iliaa Sun May 6 16:26:11 2007 UTC Added files: (Branch: PHP_5_2) /php-src/tests/basic024.phpt Log: Added $HTTP_RAW_POST_DATA test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/024.phpt?view=markuprev=1.1 Index: php-src/tests/basic/024.phpt +++ php-src/tests/basic/024.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 025.phpt
iliaa Sun May 6 16:30:09 2007 UTC Added files: (Branch: PHP_5_2) /php-src/tests/basic025.phpt Log: Added HTTP_RAW_POST_DATA test for instances where post length exceeds post_max_size. http://cvs.php.net/viewvc.cgi/php-src/tests/basic/025.phpt?view=markuprev=1.1 Index: php-src/tests/basic/025.phpt +++ php-src/tests/basic/025.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main php_content_types.c
iliaa Sun May 6 16:34:15 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main php_content_types.c
Log:
Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no
default post handler).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.684r2=1.2027.2.547.2.685diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.684 php-src/NEWS:1.2027.2.547.2.685
--- php-src/NEWS:1.2027.2.547.2.684 Sun May 6 15:37:07 2007
+++ php-src/NEWSSun May 6 16:34:14 2007
@@ -5,6 +5,8 @@
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
+- Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no
+ default post handler). (Ilia)
- Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be
optional). (Rob)
- Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled
http://cvs.php.net/viewvc.cgi/php-src/main/php_content_types.c?r1=1.32.2.1.2.2r2=1.32.2.1.2.3diff_format=u
Index: php-src/main/php_content_types.c
diff -u php-src/main/php_content_types.c:1.32.2.1.2.2
php-src/main/php_content_types.c:1.32.2.1.2.3
--- php-src/main/php_content_types.c:1.32.2.1.2.2 Sun Apr 1 19:09:36 2007
+++ php-src/main/php_content_types.cSun May 6 16:34:14 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_content_types.c,v 1.32.2.1.2.2 2007/04/01 19:09:36 iliaa Exp $ */
+/* $Id: php_content_types.c,v 1.32.2.1.2.3 2007/05/06 16:34:14 iliaa Exp $ */
#include php.h
#include SAPI.h
@@ -37,21 +37,19 @@
*/
SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader)
{
- char *data = NULL;
- int length = 0;
+ char *data;
+ int length;
/* $HTTP_RAW_POST_DATA registration */
- if(!strcmp(SG(request_info).request_method, POST)) {
- if(NULL == SG(request_info).post_entry
SG(request_info).post_data) {
+ if (!strcmp(SG(request_info).request_method, POST)) {
+ if (NULL == SG(request_info).post_entry) {
/* no post handler registered, so we just swallow the
data */
sapi_read_standard_form_data(TSRMLS_C);
+ }
+
+ if (PG(always_populate_raw_post_data)
SG(request_info).post_data) {
length = SG(request_info).post_data_length;
data = estrndup(SG(request_info).post_data, length);
- } else if(PG(always_populate_raw_post_data)
SG(request_info).post_data) {
- length = SG(request_info).post_data_length;
- data = estrndup(SG(request_info).post_data, length);
- }
- if(data) {
SET_VAR_STRINGL(HTTP_RAW_POST_DATA, data, length);
}
}
@@ -62,11 +60,10 @@
in the long run post handlers should be changed to not touch
request_info.post_data for memory preservation reasons
*/
- if(SG(request_info).post_data) {
+ if (SG(request_info).post_data) {
SG(request_info).raw_post_data =
estrndup(SG(request_info).post_data, SG(request_info).post_data_length);
SG(request_info).raw_post_data_length =
SG(request_info).post_data_length;
}
-
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c
iliaa Sun May 6 17:21:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Allow SOAP extension's handler() to work even when
always_populate_raw_post_data is off.
# Tests will be updated in the next few days
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.685r2=1.2027.2.547.2.686diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.685 php-src/NEWS:1.2027.2.547.2.686
--- php-src/NEWS:1.2027.2.547.2.685 Sun May 6 16:34:14 2007
+++ php-src/NEWSSun May 6 17:21:13 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2007, PHP 5.2.3
+- Allow SOAP extension's handler() to work even when
+ always_populate_raw_post_data is off. (Ilia)
- Fixed ext/filter Email Validation Vulnerability (MOPB-24 by Stefan Esser)
(Ilia)
- Fixed altering $this via argument named this. (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.23r2=1.156.2.28.2.24diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.23
php-src/ext/soap/soap.c:1.156.2.28.2.24
--- php-src/ext/soap/soap.c:1.156.2.28.2.23 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/soap.c Sun May 6 17:21:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.24 2007/05/06 17:21:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -140,8 +140,6 @@
SOAP_GLOBAL(soap_version) = _old_soap_version;
#endif
-#define HTTP_RAW_POST_DATA HTTP_RAW_POST_DATA
-
#define ZERO_PARAM() \
if (ZEND_NUM_ARGS() != 0) \
WRONG_PARAM_COUNT;
@@ -1403,7 +1401,7 @@
sdlPtr old_sdl = NULL;
soapServicePtr service;
xmlDocPtr doc_request=NULL, doc_return;
- zval function_name, **params, **raw_post, *soap_obj, retval;
+ zval function_name, **params, *soap_obj, retval;
char *fn_name, cont_len[30];
int num_params = 0, size, i, call_status = 0;
xmlChar *buf;
@@ -1478,8 +1476,9 @@
}
if (ZEND_NUM_ARGS() == 0) {
- if (zend_hash_find(EG(symbol_table), HTTP_RAW_POST_DATA,
sizeof(HTTP_RAW_POST_DATA), (void **) raw_post)!=FAILURE
-((*raw_post)-type==IS_STRING)) {
+ if (SG(request_info).raw_post_data) {
+ char *post_data = SG(request_info).raw_post_data;
+ int post_data_length =
SG(request_info).raw_post_data_length;
zval **server_vars, **encoding;
zend_is_auto_global(_SERVER, sizeof(_SERVER)-1
TSRMLS_CC);
@@ -1497,13 +1496,13 @@
zend_hash_exists(EG(function_table),
gzinflate, sizeof(gzinflate))) {
ZVAL_STRING(func, gzinflate, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post)+10, Z_STRLEN_PP(raw_post)-10, 0);
+ ZVAL_STRINGL(params[0], post_data+10,
post_data_length-10, 0);
INIT_PZVAL(params[0]);
} else if
(strcmp(Z_STRVAL_PP(encoding),deflate) == 0
zend_hash_exists(EG(function_table), gzuncompress,
sizeof(gzuncompress))) {
ZVAL_STRING(func, gzuncompress, 0);
params[0] = param;
- ZVAL_STRINGL(params[0],
Z_STRVAL_PP(raw_post), Z_STRLEN_PP(raw_post), 0);
+ ZVAL_STRINGL(params[0], post_data,
post_data_length, 0);
INIT_PZVAL(params[0]);
} else {
php_error_docref(NULL TSRMLS_CC,
E_ERROR,Request is compressed with unknown compression
'%s',Z_STRVAL_PP(encoding));
@@ -1516,16 +1515,9 @@
php_error_docref(NULL TSRMLS_CC,
E_ERROR,Can't uncompress compressed request);
}
} else {
- doc_request =
soap_xmlParseMemory(Z_STRVAL_PP(raw_post),Z_STRLEN_PP(raw_post));
+ doc_request = soap_xmlParseMemory(post_data,
post_data_length);
}
} else {
- if (SG(request_info).request_method
- strcmp(SG(request_info).request_method, POST) == 0) {
-
