[PHP-CVS] cvs: php-src / NEWS
kalle Thu Jul 2 17:24:55 2009 UTC Modified files: /php-srcNEWS Log: As Jani would say; Fix NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2184&r2=1.2185&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2184 php-src/NEWS:1.2185 --- php-src/NEWS:1.2184 Sun Jun 28 15:41:25 2009 +++ php-src/NEWSThu Jul 2 17:24:55 2009 @@ -45,5 +45,5 @@ - Added stream_resolve_include_path() function which checks which file fopen() with a relative path will open. (Sara) -- Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) - Fixed bug #46647 (SplFileObject::fgetcsv segfaults). (Etienne) +- Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiSun Jun 28 15:41:25 2009 UTC Modified files: /php-srcNEWS Log: - dot dot dot.. :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2183&r2=1.2184&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2183 php-src/NEWS:1.2184 --- php-src/NEWS:1.2183 Sat Jun 27 15:22:06 2009 +++ php-src/NEWSSun Jun 28 15:41:25 2009 @@ -6,7 +6,8 @@ - Changed "allow_url_fopen" and "allow_url_include" php.ini directives to allow per-wrapper enable/disable and runtime tightening. (Sara) -- Changed config-file-scan-dir/PHP_INI_SCAN_DIR to allow multiple paths (Mikko) +- Changed --with-config-file-scan-dir / PHP_INI_SCAN_DIR to allow multiple + paths. (Mikko) - Removed undocumented and incomplete support for strings in list() operator. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main php_ini.c
mkoppanen Sat Jun 27 15:22:06 2009 UTC
Modified files:
/php-srcNEWS
/php-src/main php_ini.c
Log:
[DOC]
Support multiple paths (separated by path_separator) in
config-file-scan-dir/PHP_INI_SCAN_DIR
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2182&r2=1.2183&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2182 php-src/NEWS:1.2183
--- php-src/NEWS:1.2182 Tue May 19 09:47:06 2009
+++ php-src/NEWSSat Jun 27 15:22:06 2009
@@ -6,6 +6,8 @@
- Changed "allow_url_fopen" and "allow_url_include" php.ini directives to allow
per-wrapper enable/disable and runtime tightening. (Sara)
+- Changed config-file-scan-dir/PHP_INI_SCAN_DIR to allow multiple paths (Mikko)
+
- Removed undocumented and incomplete support for strings in list() operator.
(Dmitry)
- Removed old legacy:
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.173&r2=1.174&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.173 php-src/main/php_ini.c:1.174
--- php-src/main/php_ini.c:1.173Mon May 18 21:28:42 2009
+++ php-src/main/php_ini.c Sat Jun 27 15:22:06 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.173 2009/05/18 21:28:42 derick Exp $ */
+/* $Id: php_ini.c,v 1.174 2009/06/27 15:22:06 mkoppanen Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -349,7 +349,8 @@
char *open_basedir;
int free_ini_search_path = 0;
zend_file_handle fh;
-
+ static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
+
if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
config_zval_dtor, 1) == FAILURE) {
return FAILURE;
}
@@ -372,7 +373,6 @@
char *default_location;
char *env_location;
char *binary_location;
- static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0
};
#ifdef PHP_WIN32
char *reg_location;
#endif
@@ -608,72 +608,83 @@
/* Scan and parse any .ini files found in scan path if path not empty.
*/
if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
- struct dirent **namelist;
int ndir, i;
struct stat sb;
char ini_file[MAXPATHLEN];
- char *p;
+ char *p, *last, *path_copy, *ini_path = NULL;
zend_file_handle fh;
zend_llist scanned_ini_list;
zend_llist_element *element;
int l, total_l = 0;
- /* Reset active ini section */
- RESET_ACTIVE_INI_HASH();
-
- if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0,
php_alphasort)) > 0) {
- zend_llist_init(&scanned_ini_list, sizeof(char *),
(llist_dtor_func_t) free_estring, 1);
- memset(&fh, 0, sizeof(fh));
-
- for (i = 0; i < ndir; i++) {
-
- /* check for any file with .ini extension */
- if (!(p = strrchr(namelist[i]->d_name, '.')) ||
(p && strcmp(p, ".ini"))) {
- free(namelist[i]);
- continue;
- }
- if
(IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
- snprintf(ini_file, MAXPATHLEN, "%s%s",
php_ini_scanned_path, namelist[i]->d_name);
- } else {
- snprintf(ini_file, MAXPATHLEN,
"%s%c%s", php_ini_scanned_path, DEFAULT_SLASH, namelist[i]->d_name);
- }
- if (VCWD_STAT(ini_file, &sb) == 0) {
- if (S_ISREG(sb.st_mode)) {
- if ((fh.handle.fp =
VCWD_FOPEN(ini_file, "r"))) {
- fh.filename = ini_file;
- fh.type =
ZEND_HANDLE_FP;
-
- if
(zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)
php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
- /* Here, add it
to the list of ini files read */
- l =
strlen(ini_file);
- total_l += l +
2;
- p =
estrndup(ini_file, l);
-
zend_llist_add_element(&scanned_ini_list, &p);
+ /* List of found ini files */
+ zend_llis
[PHP-CVS] cvs: php-src / NEWS
janiTue May 19 09:47:06 2009 UTC Modified files: /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2181&r2=1.2182&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2181 php-src/NEWS:1.2182 --- php-src/NEWS:1.2181 Tue May 19 09:30:17 2009 +++ php-src/NEWSTue May 19 09:47:06 2009 @@ -3,7 +3,7 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Changed allow_url_fopen/allow_url_include to allow +- Changed "allow_url_fopen" and "allow_url_include" php.ini directives to allow per-wrapper enable/disable and runtime tightening. (Sara) - Removed undocumented and incomplete support for strings in list() operator. @@ -25,14 +25,15 @@ operands. (Dmitry) - Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) -- Improved ext/zlib; re-implemented non-file related functionality. (Mike) -- Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) +- Improved ext/zlib: re-implemented non-file related functionality. (Mike) +- Improved output layer. See README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) . Added keygen constants. . Added new functions: mhash_keygen_count, mhash_get_keygen_name, mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, mhash_keygen. -- Improved ext/dba; support for Tokyo Cabinet. (Michael) +- Improved ext/dba: + . Added support for Tokyo Cabinet. (Michael) - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) @@ -43,4 +44,3 @@ - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) - Fixed bug #46647 (SplFileObject::fgetcsv segfaults). (Etienne) - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
kalle Tue May 19 09:30:17 2009 UTC Modified files: /php-srcNEWS Log: Keep the style http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2180&r2=1.2181&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2180 php-src/NEWS:1.2181 --- php-src/NEWS:1.2180 Tue May 19 09:14:28 2009 +++ php-src/NEWSTue May 19 09:30:17 2009 @@ -32,7 +32,7 @@ . Added new functions: mhash_keygen_count, mhash_get_keygen_name, mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, mhash_keygen. -- Improved ext/dba; support for Tokyo Cabinet. (Michael Maclean) +- Improved ext/dba; support for Tokyo Cabinet. (Michael) - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
kalle Tue May 19 09:14:29 2009 UTC Modified files: /php-srcNEWS Log: DBA entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2179&r2=1.2180&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2179 php-src/NEWS:1.2180 --- php-src/NEWS:1.2179 Wed Dec 31 14:27:30 2008 +++ php-src/NEWSTue May 19 09:14:28 2009 @@ -32,6 +32,7 @@ . Added new functions: mhash_keygen_count, mhash_get_keygen_name, mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, mhash_keygen. +- Improved ext/dba; support for Tokyo Cabinet. (Michael Maclean) - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Wed Dec 31 14:27:30 2008 UTC Modified files: /php-srcNEWS Log: - Remove entry merged to 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2178&r2=1.2179&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2178 php-src/NEWS:1.2179 --- php-src/NEWS:1.2178 Wed Dec 24 00:44:51 2008 +++ php-src/NEWSWed Dec 31 14:27:30 2008 @@ -3,8 +3,6 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Changed dl() to be disabled by default. Enabled only when explicitly - registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
felipe Wed Dec 24 00:44:51 2008 UTC Modified files: /php-srcNEWS Log: - Merged into 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2177&r2=1.2178&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2177 php-src/NEWS:1.2178 --- php-src/NEWS:1.2177 Sat Dec 20 00:53:21 2008 +++ php-src/NEWSWed Dec 24 00:44:51 2008 @@ -41,7 +41,6 @@ (Sara) - Added stream_resolve_include_path() function which checks which file fopen() with a relative path will open. (Sara) -- Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) - Fixed bug #46647 (SplFileObject::fgetcsv segfaults). (Etienne) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
colder Sat Dec 20 00:53:21 2008 UTC Modified files: /php-srcNEWS Log: Fix #46647 (segfault in SplFileinfo::fgetcsv()) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2176&r2=1.2177&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2176 php-src/NEWS:1.2177 --- php-src/NEWS:1.2176 Tue Dec 9 10:21:53 2008 +++ php-src/NEWSSat Dec 20 00:53:21 2008 @@ -44,4 +44,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46647 (SplFileObject::fgetcsv segfaults). (Etienne) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Hannes Magnusson wrote: bjori Tue Dec 9 08:22:09 2008 UTC Modified files: /php-src NEWS Log: - Remove items that already done in earlier branches - It doesnt hurt to say what new functions do NEWS is not documentation. That's elsewhere. ;) --Jani http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2173&r2=1.2174&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2173 php-src/NEWS:1.2174 --- php-src/NEWS:1.2173 Sat Nov 22 14:50:00 2008 +++ php-src/NEWSTue Dec 9 08:22:08 2008 @@ -30,9 +30,6 @@ operands. (Dmitry) - Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) -- Moved extensions to PECL: - . ext/ncurses (Hartmut) - - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -43,11 +40,11 @@ - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added streams features: - . Second optional parameter to stream_context_create() to -set params during context creation. (Sara) - . "context" and "binary_pipes" params in "other_options" arg. (Sara) - . stream_resolve_include_path(). (Sara) +- Added "context" and "binary_pipes" params in "other_options" for proc_open(). + (Sara) +- Added stream_resolve_include_path() function which checks which file fopen() + with a relative path will open. (Sara) - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 10:21:54 2008 UTC Modified files: /php-srcNEWS Log: Merged to 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2175&r2=1.2176&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2175 php-src/NEWS:1.2176 --- php-src/NEWS:1.2175 Tue Dec 9 09:04:00 2008 +++ php-src/NEWSTue Dec 9 10:21:53 2008 @@ -5,7 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 09:04:01 2008 UTC Modified files: /php-srcNEWS Log: Merged to 5_3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2174&r2=1.2175&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2174 php-src/NEWS:1.2175 --- php-src/NEWS:1.2174 Tue Dec 9 08:22:08 2008 +++ php-src/NEWSTue Dec 9 09:04:00 2008 @@ -5,8 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed opendir/dir/scandir to use default context - when no context argument is passed. (Sara) - Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Tue Dec 9 08:22:09 2008 UTC Modified files: /php-srcNEWS Log: - Remove items that already done in earlier branches - It doesnt hurt to say what new functions do http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2173&r2=1.2174&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2173 php-src/NEWS:1.2174 --- php-src/NEWS:1.2173 Sat Nov 22 14:50:00 2008 +++ php-src/NEWSTue Dec 9 08:22:08 2008 @@ -30,9 +30,6 @@ operands. (Dmitry) - Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) -- Moved extensions to PECL: - . ext/ncurses (Hartmut) - - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -43,11 +40,11 @@ - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added streams features: - . Second optional parameter to stream_context_create() to -set params during context creation. (Sara) - . "context" and "binary_pipes" params in "other_options" arg. (Sara) - . stream_resolve_include_path(). (Sara) +- Added "context" and "binary_pipes" params in "other_options" for proc_open(). + (Sara) +- Added stream_resolve_include_path() function which checks which file fopen() + with a relative path will open. (Sara) - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:50:01 2008 UTC Modified files: /php-srcNEWS Log: - Removed my duplicate news entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2172&r2=1.2173&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2172 php-src/NEWS:1.2173 --- php-src/NEWS:1.2172 Sat Nov 22 14:35:39 2008 +++ php-src/NEWSSat Nov 22 14:50:00 2008 @@ -51,5 +51,3 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #46615 (Make SplHeap->key() returns the key count -1 instead - of the key count). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
> > only one NEWS file entry per change .. as in the earliest branch that will > get released with the change. > i have recently updated the README on this point: > http://php.net/reST/php-src/README.CVS-RULES Ah ok cool I'll remove it. -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
On 22.11.2008, at 15:35, David Coallier wrote: davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-src NEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171&r2=1.2172&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap->key() returns the key count -1 instead + of the key count). (David C.) only one NEWS file entry per change .. as in the earliest branch that will get released with the change. i have recently updated the README on this point: http://php.net/reST/php-src/README.CVS-RULES regards, Lukas Kahwe Smith [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
hi, only one NEWS entry is required, in the lower branch (in this case, 5.3) Cheers, On Sat, Nov 22, 2008 at 3:35 PM, David Coallier <[EMAIL PROTECTED]> wrote: > davidc Sat Nov 22 14:35:40 2008 UTC > > Modified files: >/php-srcNEWS > Log: > - Added the fixed bug #46615 > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171&r2=1.2172&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 > --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 > +++ php-src/NEWSSat Nov 22 14:35:39 2008 > @@ -51,3 +51,5 @@ > - Added shm_has_var() function. (Mike) > > - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) > +- Fixed bug #46615 (Make SplHeap->key() returns the key count -1 instead > + of the key count). (David C.) > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-srcNEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171&r2=1.2172&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap->key() returns the key count -1 instead + of the key count). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
thekid Mon Nov 10 14:46:50 2008 UTC Modified files: /php-srcNEWS Log: - Reverted my last commit # See http://news.php.net/php.cvs/54140 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2170&r2=1.2171&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2170 php-src/NEWS:1.2171 --- php-src/NEWS:1.2170 Mon Nov 10 11:57:10 2008 +++ php-src/NEWSMon Nov 10 14:46:50 2008 @@ -3,8 +3,6 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Added optional parameter "new" to sybase_connect() (Timm) - - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed opendir/dir/scandir to use default context @@ -52,7 +50,4 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) -- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) - - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Hi 2008/11/10 Timm Friebe <[EMAIL PROTECTED]>: > thekid Mon Nov 10 11:57:10 2008 UTC > > Modified files: >/php-srcNEWS > Log: > - Documented changes / fixes to sybase_ct > # MFB, all also in PHP_5_3 > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2169&r2=1.2170&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2169 php-src/NEWS:1.2170 > --- php-src/NEWS:1.2169 Sun Nov 2 18:30:31 2008 > +++ php-src/NEWSMon Nov 10 11:57:10 2008 > @@ -3,6 +3,8 @@ > ?? ??? 20??, PHP 6.0 > - Unicode support. (Andrei, Dmitry, et al) > > +- Added optional parameter "new" to sybase_connect() (Timm) > + > - Changed dl() to be disabled by default. Enabled only when explicitly > registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) > - Changed opendir/dir/scandir to use default context > @@ -50,4 +52,7 @@ > . stream_resolve_include_path(). (Sara) > - Added shm_has_var() function. (Mike) > > +- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) > + > - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) > +- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) I see you already put this in the 5.3 NEWS file. A NEWS entry should only be in the version this bug was fixed, a new feature was introduced ect. So if you add a feature in 5.2, you shouldn't put it in the 5.3 and HEAD NEWS files. Regrads -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
thekid Mon Nov 10 11:57:10 2008 UTC Modified files: /php-srcNEWS Log: - Documented changes / fixes to sybase_ct # MFB, all also in PHP_5_3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2169&r2=1.2170&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2169 php-src/NEWS:1.2170 --- php-src/NEWS:1.2169 Sun Nov 2 18:30:31 2008 +++ php-src/NEWSMon Nov 10 11:57:10 2008 @@ -3,6 +3,8 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) +- Added optional parameter "new" to sybase_connect() (Timm) + - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed opendir/dir/scandir to use default context @@ -50,4 +52,7 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) +- Fixed sybase_fetch_*() to continue reading after CS_ROW_FAIL status (Timm) + - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #30312 (sybase_unbuffered_query calls). (Timm) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
felipe Sun Nov 2 18:30:32 2008 UTC Modified files: /php-srcNEWS Log: - Remove str_getcsv() entry. (Backported to 5.3) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2168&r2=1.2169&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2168 php-src/NEWS:1.2169 --- php-src/NEWS:1.2168 Wed Oct 15 18:41:17 2008 +++ php-src/NEWSSun Nov 2 18:30:31 2008 @@ -49,6 +49,5 @@ . "context" and "binary_pipes" params in "other_options" arg. (Sara) . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) -- Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS php.ini-dist php.ini-recommended /ext/standard basic_functions.c basic_functions.h php_ext_syslog.h syslog.c /main main.c /win32/build registersyslog.php
kalle Wed Oct 15 18:41:18 2008 UTC
Modified files:
/php-srcNEWS php.ini-dist php.ini-recommended
/php-src/ext/standard basic_functions.c basic_functions.h
php_ext_syslog.h syslog.c
/php-src/main main.c
/php-src/win32/buildregistersyslog.php
Log:
[DOC] Remove define_syslog_variables() and define_syslog_variables ini option
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2167&r2=1.2168&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2167 php-src/NEWS:1.2168
--- php-src/NEWS:1.2167 Mon Sep 1 09:02:22 2008
+++ php-src/NEWSWed Oct 15 18:41:17 2008
@@ -24,6 +24,8 @@
options. (Pierre)
. Changed get_magic_quotes_gpc(), get_magic_quotes_runtime to always return
false and set_magic_quotes_runtime() to raise an E_CORE_ERROR.
+ . "define_syslog_variables" ini option and define_syslog_variables()
+(Kalle)
- Removed support for "continue" and "break" operators with non-constant
operands. (Dmitry)
- Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.279&r2=1.280&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.279 php-src/php.ini-dist:1.280
--- php-src/php.ini-dist:1.279 Thu Aug 28 05:31:15 2008
+++ php-src/php.ini-distWed Oct 15 18:41:17 2008
@@ -648,12 +648,6 @@
;phar.require_hash = On
;phar.cache_list =
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
SMTP = localhost
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.229&r2=1.230&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.229 php-src/php.ini-recommended:1.230
--- php-src/php.ini-recommended:1.229 Thu Aug 28 05:31:15 2008
+++ php-src/php.ini-recommended Wed Oct 15 18:41:17 2008
@@ -685,12 +685,6 @@
;phar.require_hash = On
;phar.cache_list =
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
SMTP = localhost
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.929&r2=1.930&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.929
php-src/ext/standard/basic_functions.c:1.930
--- php-src/ext/standard/basic_functions.c:1.929Sun Aug 31 00:19:20 2008
+++ php-src/ext/standard/basic_functions.c Wed Oct 15 18:41:18 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.929 2008/08/31 00:19:20 jani Exp $ */
+/* $Id: basic_functions.c,v 1.930 2008/10/15 18:41:18 kalle Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2886,9 +2886,6 @@
/* }}} */
/* {{{ syslog.c */
#ifdef HAVE_SYSLOG_H
-static
-ZEND_BEGIN_ARG_INFO(arginfo_define_syslog_variables, 0)
-ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_openlog, 0)
@@ -3702,7 +3699,6 @@
PHP_FE(openlog,
arginfo_openlog)
PHP_FE(syslog,
arginfo_syslog)
PHP_FE(closelog,
arginfo_closelog)
- PHP_FE(define_syslog_variables,
arginfo_define_syslog_variables)
#endif
/* functions from lcg.c */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.164&r2=1.165&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.164
php-src/ext/standard/basic_functions.h:1.165
--- php-src/ext/standard/basic_functions.h:1.164Sat May 24 14:36:16 2008
+++ php-src/ext/standard/basic_functions.h Wed Oct 15 18:41:18 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.164 2008/05/24 14:36:16 pajoye Exp $ */
+/* $Id: basic_functions.h,v 1.165 2008/10/15 18:41:18 kalle Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -200,7 +200,6 @@
zend_bool mt_rand_is_seeded; /* Whether mt_rand() has been seeded */
/* syslog.c */
- int syslog_started;
char *syslog_device;
/* var.c *
Re: [PHP-CVS] cvs: php-src / NEWS
Patrick van Kleef wrote: Hi Jani, iodbcMon Sep 1 08:37:22 2008 UTC Modified files: /php-srcNEWS Log: - fixes for ext/odbc http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2165&r2=1.2166&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2165 php-src/NEWS:1.2166 --- php-src/NEWS:1.2165Wed Aug 6 05:51:38 2008 +++ php-src/NEWSMon Sep 1 08:37:22 2008 @@ -50,3 +50,7 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). + (iodbc) +- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC + cursormodel). (iodbc) Do NOT add NEWS entries to "higher" branches if the same stuff is done in "lower" ones. And you still haven't merged this fix to PHP_5_2.. Would be handy if these "rules" was documented anywhere. I was thrown in deep end on friday, and i have tried to find out how you guys work. Yeah, well...I'm not keen on documenting this since it's kinda "fuzzy" logic. :) I apologize if i makde any mistakes, but since this is CVS, just go in and fix it. For now i will not touch NEWS and let you or someone else do that. Now you know basics, don't be afraid of doing it. Just try remember these basic rules. And I don't bite, I just bark. :D As for 5.2 i am testing right the patch right now. I will commit it as soon as it passes my testing. Excellent! It would be cool if you could fix the rest of the ODBC bugs too, there are only (!) 21 open bugs for odbc: http://bugs.php.net/search.php?cmd=display&bug_type[]=ODBC+related&status=Open --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Patrick van Kleef wrote: iodbc Mon Sep 1 08:37:22 2008 UTC Modified files: /php-src NEWS Log: - fixes for ext/odbc http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2165&r2=1.2166&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2165 php-src/NEWS:1.2166 --- php-src/NEWS:1.2165 Wed Aug 6 05:51:38 2008 +++ php-src/NEWSMon Sep 1 08:37:22 2008 @@ -50,3 +50,7 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). + (iodbc) +- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC + cursormodel). (iodbc) Also: Use your real name in there, NOT the cvs id.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Patrick van Kleef wrote: iodbc Mon Sep 1 08:37:22 2008 UTC Modified files: /php-src NEWS Log: - fixes for ext/odbc http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2165&r2=1.2166&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2165 php-src/NEWS:1.2166 --- php-src/NEWS:1.2165 Wed Aug 6 05:51:38 2008 +++ php-src/NEWSMon Sep 1 08:37:22 2008 @@ -50,3 +50,7 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). + (iodbc) +- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC + cursormodel). (iodbc) Last but not least: CHECK THE VERSION! You added the entries as the very last in the whole file!! I'm fixing these myself, please don't touch NEWS anymore. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiMon Sep 1 09:02:23 2008 UTC Modified files: /php-srcNEWS Log: Remove entries which are in previous release NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2166&r2=1.2167&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2166 php-src/NEWS:1.2167 --- php-src/NEWS:1.2166 Mon Sep 1 08:37:22 2008 +++ php-src/NEWSMon Sep 1 09:02:22 2008 @@ -50,7 +50,3 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). - (iodbc) -- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC - cursormodel). (iodbc) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Patrick van Kleef wrote: iodbc Mon Sep 1 08:37:22 2008 UTC Modified files: /php-src NEWS Log: - fixes for ext/odbc http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2165&r2=1.2166&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2165 php-src/NEWS:1.2166 --- php-src/NEWS:1.2165 Wed Aug 6 05:51:38 2008 +++ php-src/NEWSMon Sep 1 08:37:22 2008 @@ -50,3 +50,7 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). + (iodbc) +- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC + cursormodel). (iodbc) Do NOT add NEWS entries to "higher" branches if the same stuff is done in "lower" ones. And you still haven't merged this fix to PHP_5_2.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
iodbc Mon Sep 1 08:37:22 2008 UTC Modified files: /php-srcNEWS Log: - fixes for ext/odbc http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2165&r2=1.2166&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2165 php-src/NEWS:1.2166 --- php-src/NEWS:1.2165 Wed Aug 6 05:51:38 2008 +++ php-src/NEWSMon Sep 1 08:37:22 2008 @@ -50,3 +50,7 @@ - Added str_getcsv() function. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #43666) (Fixed code to use ODBC 3.52 datatypes for 64bit systems). + (iodbc) +- Fixed bug #43668) (Added odbc.default_cursortype to control the ODBC + cursormodel). (iodbc) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiWed Aug 6 05:51:39 2008 UTC Modified files: /php-srcNEWS Log: - Old news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2164&r2=1.2165&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2164 php-src/NEWS:1.2165 --- php-src/NEWS:1.2164 Mon Jul 14 10:06:21 2008 +++ php-src/NEWSWed Aug 6 05:51:38 2008 @@ -48,6 +48,5 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) -- Added ext/hash support to ext/session's ID generator. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiMon Jul 14 10:06:22 2008 UTC Modified files: /php-srcNEWS Log: - Closures come in 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2163&r2=1.2164&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2163 php-src/NEWS:1.2164 --- php-src/NEWS:1.2163 Tue Jul 8 07:05:03 2008 +++ php-src/NEWSMon Jul 14 10:06:21 2008 @@ -2,7 +2,6 @@ ||| ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Closures (Christian Seiler, Dmitry) - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS configure.in /ext/pcre php_pcre.c /ext/reflection php_reflection.c ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c zend_closures.c zend_closures.h ze
Hello Dmitry, Christian, great work! marcus Tuesday, July 8, 2008, 9:05:04 AM, you wrote: > dmitry Tue Jul 8 07:05:04 2008 UTC > Added files: > /ZendEngine2zend_closures.c zend_closures.h > /ZendEngine2/tests closure_001.phpt closure_002.phpt > closure_003.phpt closure_004.phpt > closure_005.phpt closure_006.phpt > closure_007.phpt closure_008.phpt > closure_009.phpt closure_010.phpt > closure_011.phpt closure_012.phpt > Modified files: > /php-srcNEWS configure.in > /ZendEngine2Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c > zend_compile.c zend_compile.h zend_default_classes.c > zend_execute.c zend_execute_API.c > zend_language_parser.y zend_vm_def.h zend_vm_execute.h > zend_vm_opcodes.h > /php-src/ext/pcre php_pcre.c > /php-src/ext/reflection php_reflection.c > Log: > Added closures support > > Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS configure.in /ext/pcre php_pcre.c /ext/reflection php_reflection.c ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c zend_closures.c zend_closures.h zend_c
dmitry Tue Jul 8 07:05:04 2008 UTC Added files: /ZendEngine2zend_closures.c zend_closures.h /ZendEngine2/tests closure_001.phpt closure_002.phpt closure_003.phpt closure_004.phpt closure_005.phpt closure_006.phpt closure_007.phpt closure_008.phpt closure_009.phpt closure_010.phpt closure_011.phpt closure_012.phpt Modified files: /php-srcNEWS configure.in /ZendEngine2Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c zend_compile.c zend_compile.h zend_default_classes.c zend_execute.c zend_execute_API.c zend_language_parser.y zend_vm_def.h zend_vm_execute.h zend_vm_opcodes.h /php-src/ext/pcre php_pcre.c /php-src/ext/reflection php_reflection.c Log: Added closures support http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2162&r2=1.2163&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2162 php-src/NEWS:1.2163 --- php-src/NEWS:1.2162 Wed May 7 15:51:34 2008 +++ php-src/NEWSTue Jul 8 07:05:03 2008 @@ -2,6 +2,7 @@ ||| ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) +- Closures (Christian Seiler, Dmitry) - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.657&r2=1.658&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.657 php-src/configure.in:1.658 --- php-src/configure.in:1.657 Mon Jun 2 16:29:25 2008 +++ php-src/configure.inTue Jul 8 07:05:03 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.657 2008/06/02 16:29:25 helly Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.658 2008/07/08 07:05:03 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1334,7 +1334,7 @@ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c zend_qsort.c zend_ts_hash.c zend_stream.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c \ -zend_strtol.c zend_gc.c) +zend_strtol.c zend_gc.c zend_closures.c) if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c \ http://cvs.php.net/viewvc.cgi/ZendEngine2/Makefile.am?r1=1.62&r2=1.63&diff_format=u Index: ZendEngine2/Makefile.am diff -u ZendEngine2/Makefile.am:1.62 ZendEngine2/Makefile.am:1.63 --- ZendEngine2/Makefile.am:1.62Wed Mar 26 14:23:01 2008 +++ ZendEngine2/Makefile.am Tue Jul 8 07:05:03 2008 @@ -17,7 +17,7 @@ zend_objects_API.c zend_ts_hash.c zend_stream.c \ zend_default_classes.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c \ - zend_strtod.c zend_strtod.c zend_strtol.c + zend_strtod.c zend_strtod.c zend_strtol.c zend_closures.c libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.dsp?r1=1.26&r2=1.27&diff_format=u Index: ZendEngine2/Zend.dsp diff -u ZendEngine2/Zend.dsp:1.26 ZendEngine2/Zend.dsp:1.27 --- ZendEngine2/Zend.dsp:1.26 Tue Dec 5 08:08:33 2006 +++ ZendEngine2/Zend.dspTue Jul 8 07:05:03 2008 @@ -123,6 +123,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_closures.c +# End Source File +# Begin Source File + SOURCE=.\zend_compile.c # End Source File # Begin Source File http://cvs.php.net/viewvc.cgi/ZendEngine2/ZendTS.dsp?r1=1.48&r2=1.49&diff_format=u Index: ZendEngine2/ZendTS.dsp diff -u ZendEngine2/ZendTS.dsp:1.48 ZendEngine2/ZendTS.dsp:1.49 --- ZendEngine2/ZendTS.dsp:1.48 Tue Dec 5 08:08:33 2006 +++ ZendEngine2/ZendTS.dsp Tue Jul 8 07:05:03 2008 @@ -148,6 +148,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_closures.c +# End Source File +# Begin Source File + SOURCE=.\zend_compile.c # End Source File # Begin Source File http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.355&r2=1.356&diff_format=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.355 ZendEngine2/zend.h:1.356 --- ZendEngine2/zend.h:1.355Fri Jun 27 18:45:15 2008 +++ ZendEngine2/zend.h Tue Jul 8 07:05:03 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend.h,v 1.355 2008/06/27 18:45:15 stas Exp $ */ +/* $Id: zend.h,v 1.356 2008/07/08 07:05:03 dmitry Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -561,6 +561,8 @@ #define IS_CONSTANT_TYPE_MASK 0x0f #define IS_CONSTANT_RT_NS_CHECK0x10 #define IS_CONSTANT_INDEX 0x80 +#define IS_LEXICAL_VAR 0x20 +#define IS_LEXICAL_REF 0x40 /* overload
[PHP-CVS] cvs: php-src / NEWS
tony2001Wed May 7 15:51:35 2008 UTC Modified files: /php-srcNEWS Log: no need to add this entry - it's in 5_2 already http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2161&r2=1.2162&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2161 php-src/NEWS:1.2162 --- php-src/NEWS:1.2161 Wed May 7 15:47:04 2008 +++ php-src/NEWSWed May 7 15:51:34 2008 @@ -51,5 +51,3 @@ - Added ext/hash support to ext/session's ID generator. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #44811 (Improve error message when creating a new SoapClient that - contains invalid data). (Markus Fischer, David C) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Wed May 7 15:47:04 2008 UTC Modified files: /php-srcNEWS Log: - Added news item to the NEWS (Fixed bug 44811) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2160&r2=1.2161&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2160 php-src/NEWS:1.2161 --- php-src/NEWS:1.2160 Fri Mar 28 23:59:37 2008 +++ php-src/NEWSWed May 7 15:47:04 2008 @@ -51,4 +51,5 @@ - Added ext/hash support to ext/session's ID generator. (Sara) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) - +- Fixed bug #44811 (Improve error message when creating a new SoapClient that + contains invalid data). (Markus Fischer, David C) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
felipe Fri Mar 28 23:59:37 2008 UTC Modified files: /php-srcNEWS Log: Merged into 5_3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2159&r2=1.2160&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2159 php-src/NEWS:1.2160 --- php-src/NEWS:1.2159 Thu Mar 27 00:11:22 2008 +++ php-src/NEWSFri Mar 28 23:59:37 2008 @@ -40,7 +40,6 @@ mhash_keygen. - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) -- Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) - Added streams features: . Second optional parameter to stream_context_create() to -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
felipe Thu Mar 27 00:11:22 2008 UTC Modified files: /php-srcNEWS Log: This was done in 5.1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2158&r2=1.2159&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2158 php-src/NEWS:1.2159 --- php-src/NEWS:1.2158 Wed Feb 6 10:57:34 2008 +++ php-src/NEWSThu Mar 27 00:11:22 2008 @@ -5,8 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() - functions to not call __autoload(). (Dmitry) - Changed opendir/dir/scandir to use default context when no context argument is passed. (Sara) - Changed open_basedir to allow tightening in runtime contexts. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Wed Feb 6 10:57:35 2008 UTC Modified files: /php-srcNEWS Log: - WS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2157&r2=1.2158&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2157 php-src/NEWS:1.2158 --- php-src/NEWS:1.2157 Fri Feb 1 17:40:58 2008 +++ php-src/NEWSWed Feb 6 10:57:34 2008 @@ -3,7 +3,7 @@ ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Changed dl() to be disabled by default. Enabled only when explicitly +- Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
felipe Fri Feb 1 17:40:58 2008 UTC Modified files: /php-srcNEWS Log: The new parameter was merged to 5.3 [DOC] http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2156&r2=1.2157&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2156 php-src/NEWS:1.2157 --- php-src/NEWS:1.2156 Mon Jan 28 11:34:23 2008 +++ php-src/NEWSFri Feb 1 17:40:58 2008 @@ -44,8 +44,6 @@ - Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added an optional parameter to strstr() and stristr() for retrieval of either - the part of haystack before or after first occurrence of needle. (Johannes) - Added streams features: . Second optional parameter to stream_context_create() to set params during context creation. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Mon Jan 28 11:34:23 2008 UTC Modified files: /php-srcNEWS Log: Remove items already in 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2155&r2=1.2156&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2155 php-src/NEWS:1.2156 --- php-src/NEWS:1.2155 Tue Jan 22 19:51:11 2008 +++ php-src/NEWSMon Jan 28 11:34:23 2008 @@ -33,10 +33,6 @@ - Moved extensions to PECL: . ext/ncurses (Hartmut) -- Improved ext/openssl (Dmitry) - . Added support for OpenSSL digest functions - . Added support for OpenSSL cipher functions - . Added access to internal values of DSA, RSA and DH keys - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -55,7 +51,6 @@ set params during context creation. (Sara) . "context" and "binary_pipes" params in "other_options" arg. (Sara) . stream_resolve_include_path(). (Sara) -- Added gmp_testbit() function. (Tony) - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/spl spl_dllist.c
colder Tue Jan 22 19:51:11 2008 UTC
Modified files:
/php-srcNEWS
/php-src/ext/splspl_dllist.c
Log:
News: already in 5_3
Typos (Dan Scott)
ctor inside the structure. dtor/ctor used on push/pop for better potential
interoperability
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2154&r2=1.2155&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2154 php-src/NEWS:1.2155
--- php-src/NEWS:1.2154 Mon Jan 21 21:54:00 2008
+++ php-src/NEWSTue Jan 22 19:51:11 2008
@@ -59,7 +59,6 @@
- Added shm_has_var() function. (Mike)
- Added str_getcsv() function. (Sara)
- Added ext/hash support to ext/session's ID generator. (Sara)
-- Added SplDoublyLinkedList, SplStack, SplQueue classes. (Etienne)
- Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_dllist.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/spl/spl_dllist.c
diff -u php-src/ext/spl/spl_dllist.c:1.4 php-src/ext/spl/spl_dllist.c:1.5
--- php-src/ext/spl/spl_dllist.c:1.4Sun Jan 20 12:51:33 2008
+++ php-src/ext/spl/spl_dllist.cTue Jan 22 19:51:11 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_dllist.c,v 1.4 2008/01/20 12:51:33 colder Exp $ */
+/* $Id: spl_dllist.c,v 1.5 2008/01/22 19:51:11 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -75,10 +75,10 @@
spl_ptr_llist_element *head;
spl_ptr_llist_element *tail;
spl_ptr_llist_dtor_func dtor;
+ spl_ptr_llist_ctor_func ctor;
int count;
} spl_ptr_llist;
-
typedef struct _spl_dllist_object spl_dllist_object;
typedef struct _spl_dllist_it spl_dllist_it;
@@ -109,9 +109,7 @@
static void spl_ptr_llist_zval_dtor(spl_ptr_llist_element *elem) { /* {{{ */
if (elem->data) {
zval_ptr_dtor((zval **)&elem->data);
- elem->data = NULL;
}
-
}
/* }}} */
@@ -120,7 +118,7 @@
}
/* }}} */
-static spl_ptr_llist *spl_ptr_llist_init(spl_ptr_llist_dtor_func dtor) /* {{{
*/
+static spl_ptr_llist *spl_ptr_llist_init(spl_ptr_llist_ctor_func ctor,
spl_ptr_llist_dtor_func dtor) /* {{{ */
{
spl_ptr_llist *llist = emalloc(sizeof(spl_ptr_llist));
@@ -128,6 +126,7 @@
llist->tail = NULL;
llist->count = 0;
llist->dtor = dtor;
+ llist->ctor = ctor;
return llist;
}
@@ -199,6 +198,10 @@
llist->head = elem;
llist->count++;
+
+ if (llist->ctor) {
+ llist->ctor(elem);
+ }
}
/* }}} */
@@ -219,6 +222,10 @@
llist->tail = elem;
llist->count++;
+
+ if (llist->ctor) {
+ llist->ctor(elem);
+ }
}
/* }}} */
@@ -240,6 +247,11 @@
llist->tail = tail->prev;
llist->count--;
data = tail->data;
+
+ if (llist->dtor) {
+ llist->dtor(tail);
+ }
+
tail->data = NULL;
SPL_LLIST_DELREF(tail);
@@ -290,6 +302,10 @@
llist->head = head->next;
llist->count--;
data = head->data;
+
+ if (llist->dtor) {
+ llist->dtor(head);
+ }
head->data = NULL;
SPL_LLIST_DELREF(head);
@@ -301,9 +317,15 @@
static void spl_dllist_object_free_storage(void *object TSRMLS_DC) /* {{{ */
{
spl_dllist_object *intern = (spl_dllist_object *)object;
+ zval *tmp= NULL;
zend_object_std_dtor(&intern->std TSRMLS_CC);
+ while(intern->llist->count > 0) {
+ tmp = (zval *)spl_ptr_llist_pop(intern->llist);
+ zval_ptr_dtor(&tmp);
+ }
+
spl_ptr_llist_destroy(intern->llist);
zval_ptr_dtor(&intern->retval);
@@ -311,15 +333,18 @@
}
/* }}} */
-static void spl_ptr_llist_copy(spl_ptr_llist *from, spl_ptr_llist *to,
spl_ptr_llist_ctor_func ctor) /* {{{ */
+static void spl_ptr_llist_copy(spl_ptr_llist *from, spl_ptr_llist *to) /* {{{
*/
{
- spl_ptr_llist_element *current = from->head, *next;
+ spl_ptr_llist_element *current = from->head, *next;
+ spl_ptr_llist_ctor_func ctor= from->ctor;
while (current) {
next = current->next;
+
if (ctor) {
ctor(current);
}
+
spl_ptr_llist_push(to, current->data);
current = next;
}
@@ -354,8 +379,8 @@
intern->ce_get_iterator = other->ce_get_iterator;
if (clone_orig) {
- intern->llist = (spl_ptr_llist
*)spl_ptr_llist_init(spl_ptr_llist_zval_dtor);
- spl_ptr_llist_copy(other->llist, intern->llist,
spl_ptr_llist_zval_ctor);
+ intern->llist = (spl_ptr_llist
*)spl_ptr_llist_init(other->llist->ctor, other->llist->dtor);
+ spl_ptr_llist_copy(other->llist, intern->llist);
intern->trav
[PHP-CVS] cvs: php-src / NEWS /ext/spl spl.php /ext/spl/internal spldoublylinkedlist.inc splqueue.inc splstack.inc
colder Mon Jan 21 21:54:01 2008 UTC Added files: /php-src/ext/spl/internal spldoublylinkedlist.inc splqueue.inc splstack.inc Modified files: /php-srcNEWS /php-src/ext/splspl.php Log: Add doxygen docs for SplDoublyLinkedList, SplStack, SplQueue http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2153&r2=1.2154&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2153 php-src/NEWS:1.2154 --- php-src/NEWS:1.2153 Tue Nov 6 09:45:24 2007 +++ php-src/NEWSMon Jan 21 21:54:00 2008 @@ -59,5 +59,7 @@ - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) +- Added SplDoublyLinkedList, SplStack, SplQueue classes. (Etienne) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) + http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl.php?r1=1.80&r2=1.81&diff_format=u Index: php-src/ext/spl/spl.php diff -u php-src/ext/spl/spl.php:1.80 php-src/ext/spl/spl.php:1.81 --- php-src/ext/spl/spl.php:1.80Sun Apr 22 17:13:39 2007 +++ php-src/ext/spl/spl.php Mon Jan 21 21:54:00 2008 @@ -105,13 +105,21 @@ * - interface SplSubject * - class SplObjectStorage * - * 8) @ref Examples + * 8) Datastructures + * + * SPL proposes a set of datastructures implemented internally. + * + * - class SplDoublyLinkedList + * - class SplStack extends SplDoublyLinkedList + * - class SplQueue extends SplDoublyLinkedList + * + * 9) @ref Examples * * The classes and interfaces in this group are contained as PHP code in the * examples subdirectory of ext/SPL. Sooner or later they will be moved to * c-code. * - * 9) Some articles about SPL: + * 10) Some articles about SPL: * - http://www.phpro.org/tutorials/Introduction-to-SPL.html";>Introduction to Standard PHP Library (SPL) * - http://www.sitepoint.com/article/php5-standard-library/1";>Introducing PHP 5's Standard Library * - http://www.ramikayyali.com/archives/2005/02/25/iterators";>Iterators in PHP5 @@ -120,13 +128,13 @@ * - http://www.devshed.com/c/a/PHP/The-Standard-PHP-Library-Part-2/";>The Standard PHP Library, Part 2 * - http://www.professionelle-softwareentwicklung-mit-php5.de/erste_auflage/oop.iterators.spl.html";>Die Standard PHP Library (SPL) [german] * - * 10) Talks on SPL: + * 11) Talks on SPL: * - SPL Update http://talks.somabo.de/200702_vancouver_spl_update.pps";>[pps], http://talks.somabo.de/200702_vancouver_spl_update.pdf";>[pdf] * - Happy SPLing http://talks.somabo.de/200509_toronto_happy_spling.pps";>[pps], http://talks.somabo.de/200509_toronto_happy_spling.pdf";>[pdf] * - From engine overloading to SPL http://talks.somabo.de/200505_cancun_from_engine_overloading_to_spl.pps";>[pps], http://talks.somabo.de/200505_cancun_from_engine_overloading_to_spl.pdf";>[pdf] * - SPL for the masses http://talks.somabo.de/200504_php_quebec_spl_for_the_masses.pps";>[pps], http://talks.somabo.de/200504_php_quebec_spl_for_the_masses.pdf";>[pdf] * - * 11) Debug sessions: + * 12) Debug sessions: * - Debug session 1 [pps], [pdf] * - Debug session 2 http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pps";>[pps], http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pdf";>[pdf], http://taks.somabo.de/200411_php_conference_frankfrurt_iterator_debug_session.swf";>[swf] * - Debug session 3 http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pps";>[pps], http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pdf";>[pdf] http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/spldoublylinkedlist.inc?view=markup&rev=1.1 Index: php-src/ext/spl/internal/spldoublylinkedlist.inc +++ php-src/ext/spl/internal/spldoublylinkedlist.inc http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/splqueue.inc?view=markup&rev=1.1 Index: php-src/ext/spl/internal/splqueue.inc +++ php-src/ext/spl/internal/splqueue.inc http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/splstack.inc?view=markup&rev=1.1 Index: php-src/ext/spl/internal/splstack.inc +++ php-src/ext/spl/internal/splstack.inc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiTue Nov 6 09:45:24 2007 UTC Modified files: /php-srcNEWS Log: - Move some entries to 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2152&r2=1.2153&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2152 php-src/NEWS:1.2153 --- php-src/NEWS:1.2152 Tue Oct 2 10:40:57 2007 +++ php-src/NEWSTue Nov 6 09:45:24 2007 @@ -37,8 +37,6 @@ . Added support for OpenSSL digest functions . Added support for OpenSSL cipher functions . Added access to internal values of DSA, RSA and DH keys -- Improved and cleaned CGI code. FastCGI is now always enabled and can not be - disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -53,7 +51,6 @@ - Added an optional parameter to strstr() and stristr() for retrieval of either the part of haystack before or after first occurrence of needle. (Johannes) - Added streams features: - . Context parameter for copy() function. (Sara) . Second optional parameter to stream_context_create() to set params during context creation. (Sara) . "context" and "binary_pipes" params in "other_options" arg. (Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
janiTue Oct 2 10:40:58 2007 UTC Modified files: /php-srcNEWS Log: fix news (stuff added in 5.3 wont be needed to mentioned here) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2151&r2=1.2152&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2151 php-src/NEWS:1.2152 --- php-src/NEWS:1.2151 Wed Sep 26 07:16:33 2007 +++ php-src/NEWSTue Oct 2 10:40:57 2007 @@ -2,8 +2,6 @@ ||| ?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Namespaces. (Dmitry, Stas) -- Late Static Binding (Dmitry, Etienne Kneuss) - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) @@ -30,7 +28,7 @@ false and set_magic_quotes_runtime() to raise an E_CORE_ERROR. - Removed support for "continue" and "break" operators with non-constant operands. (Dmitry) -- Removed Freetype 1.x and GD 1.x from GD extension. (Pierre) +- Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre) - Moved extensions to PECL: . ext/ncurses (Hartmut) @@ -49,8 +47,7 @@ mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, mhash_keygen. - -- Added runtime JIT auto-globals fetching and caching (Dmitry, Sara) +- Added runtime JIT auto-globals fetching and caching. (Dmitry, Sara) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) - Added an optional parameter to strstr() and stristr() for retrieval of either -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
iliaa Mon Aug 27 23:47:40 2007 UTC Modified files: /php-srcNEWS Log: Fixed typo http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2149&r2=1.2150&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2149 php-src/NEWS:1.2150 --- php-src/NEWS:1.2149 Mon Aug 6 08:43:43 2007 +++ php-src/NEWSMon Aug 27 23:47:40 2007 @@ -53,7 +53,7 @@ - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) - Added an optional parameter to strstr() and stristr() for retrieval of either - the part of haystack before or after first occurence of needle. (Johannes) + the part of haystack before or after first occurrence of needle. (Johannes) - Added streams features: . Context parameter for copy() function. (Sara) . Second optional parameter to stream_context_create() to -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/openssl openssl.c
On 8/6/07, Dmitry Stogov <[EMAIL PROTECTED]> wrote: > dmitry Mon Aug 6 08:43:43 2007 UTC > > Modified files: > /php-srcNEWS > /php-src/ext/opensslopenssl.c > Log: > Improved ext/openssl > . Added support for OpenSSL digest functions > . Added support for OpenSSL cipher functions > . Added access to internal values of DSA, RSA and DH keys Thanks! --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/openssl openssl.c
dmitry Mon Aug 6 08:43:43 2007 UTC
Modified files:
/php-srcNEWS
/php-src/ext/opensslopenssl.c
Log:
Improved ext/openssl
. Added support for OpenSSL digest functions
. Added support for OpenSSL cipher functions
. Added access to internal values of DSA, RSA and DH keys
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2148&r2=1.2149&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2148 php-src/NEWS:1.2149
--- php-src/NEWS:1.2148 Tue Jul 24 23:25:48 2007
+++ php-src/NEWSMon Aug 6 08:43:43 2007
@@ -34,6 +34,10 @@
- Moved extensions to PECL:
. ext/ncurses (Hartmut)
+- Improved ext/openssl (Dmitry)
+ . Added support for OpenSSL digest functions
+ . Added support for OpenSSL cipher functions
+ . Added access to internal values of DSA, RSA and DH keys
- Improved and cleaned CGI code. FastCGI is now always enabled and can not be
disabled. See sapi/cgi/CHANGES for more details. (Dmitry)
- Improved ext/zlib; re-implemented non-file related functionality. (Mike)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.145 php-src/ext/openssl/openssl.c:1.146
--- php-src/ext/openssl/openssl.c:1.145 Wed Jul 11 12:10:28 2007
+++ php-src/ext/openssl/openssl.c Mon Aug 6 08:43:43 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.145 2007/07/11 12:10:28 dmitry Exp $ */
+/* $Id: openssl.c,v 1.146 2007/08/06 08:43:43 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,6 +33,8 @@
#include "ext/standard/file.h"
#include "ext/standard/info.h"
#include "ext/standard/php_fopen_wrappers.h"
+#include "ext/standard/md5.h"
+#include "ext/standard/base64.h"
/* OpenSSL includes */
#include
@@ -88,6 +90,15 @@
PHP_OPENSSL_CIPHER_DEFAULT = PHP_OPENSSL_CIPHER_RC2_40
};
+PHP_FUNCTION(openssl_get_md_methods);
+PHP_FUNCTION(openssl_get_cipher_methods);
+
+PHP_FUNCTION(openssl_digest);
+PHP_FUNCTION(openssl_encrypt);
+PHP_FUNCTION(openssl_decrypt);
+
+PHP_FUNCTION(openssl_dh_compute_key);
+
/* {{{ openssl_functions[]
*/
zend_function_entry openssl_functions[] = {
@@ -126,10 +137,13 @@
PHP_FE(openssl_csr_get_subject, NULL)
PHP_FE(openssl_csr_get_public_key, NULL)
- PHP_FE(openssl_sign,second_arg_force_ref)
- PHP_FE(openssl_verify, NULL)
- PHP_FE(openssl_seal,arg2and3_force_ref)
- PHP_FE(openssl_open,second_arg_force_ref)
+ PHP_FE(openssl_digest, NULL)
+ PHP_FE(openssl_encrypt, NULL)
+ PHP_FE(openssl_decrypt, NULL)
+ PHP_FE(openssl_sign,second_arg_force_ref)
+ PHP_FE(openssl_verify, NULL)
+ PHP_FE(openssl_seal,arg2and3_force_ref)
+ PHP_FE(openssl_open,second_arg_force_ref)
/* for S/MIME handling */
PHP_FE(openssl_pkcs7_verify,NULL)
@@ -142,6 +156,11 @@
PHP_FE(openssl_public_encrypt, second_arg_force_ref)
PHP_FE(openssl_public_decrypt, second_arg_force_ref)
+ PHP_FE(openssl_get_md_methods, NULL)
+ PHP_FE(openssl_get_cipher_methods, NULL)
+
+ PHP_FE(openssl_dh_compute_key, NULL)
+
PHP_FE(openssl_error_string, NULL)
{NULL, NULL, NULL}
};
@@ -645,6 +664,34 @@
return mdtype;
}
/* }}} */
+
+static const EVP_CIPHER * php_openssl_get_evp_cipher_from_algo(long algo) { /*
{{{ */
+ switch (algo) {
+#ifndef OPENSSL_NO_RC2
+ case PHP_OPENSSL_CIPHER_RC2_40:
+ return EVP_rc2_40_cbc();
+ break;
+ case PHP_OPENSSL_CIPHER_RC2_64:
+ return EVP_rc2_64_cbc();
+ break;
+ case PHP_OPENSSL_CIPHER_RC2_128:
+ return EVP_rc2_cbc();
+ break;
+#endif
+
+#ifndef OPENSSL_NO_DES
+ case PHP_OPENSSL_CIPHER_DES:
+ return EVP_des_cbc();
+ break;
+ case PHP_OPENSSL_CIPHER_3DES:
+ return EVP_des_ede3_cbc();
+ break;
+#endif
+ default:
+ return NULL;
+ break;
+ }
+}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION
@@ -2476,6 +2523,25 @@
}
break;
#endif
+#if !defined(NO_DH)
+ case OPENSSL_KEYTYPE_DH:
+ {
+ DH *dhpar =
DH_generate_parameters(req->priv_key_bits, 2, NULL, NULL);
+ int c
[PHP-CVS] cvs: php-src / NEWS
johannesTue Jul 24 23:25:48 2007 UTC Modified files: /php-srcNEWS Log: - These functions where MFHd >1 year ago http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2147&r2=1.2148&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2147 php-src/NEWS:1.2148 --- php-src/NEWS:1.2147 Thu Jul 12 09:23:47 2007 +++ php-src/NEWSTue Jul 24 23:25:48 2007 @@ -50,8 +50,6 @@ - Added E_STRICT to E_ALL. (Dmitry) - Added an optional parameter to strstr() and stristr() for retrieval of either the part of haystack before or after first occurence of needle. (Johannes) -- Added possibility to check in which extension an internal function was - defined using reflection API. (Johannes) - Added streams features: . Context parameter for copy() function. (Sara) . Second optional parameter to stream_context_create() to -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/gmp gmp.c php_gmp.h /ext/gmp/tests 039.phpt
tony2001Mon Apr 23 14:57:37 2007 UTC
Added files:
/php-src/ext/gmp/tests 039.phpt
Modified files:
/php-srcNEWS
/php-src/ext/gmpgmp.c php_gmp.h
Log:
[DOC] add gmp_testbit() function
tests if the specified bit is set and returns false/true
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2145&r2=1.2146&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2145 php-src/NEWS:1.2146
--- php-src/NEWS:1.2145 Wed Apr 18 19:39:12 2007
+++ php-src/NEWSMon Apr 23 14:57:37 2007
@@ -57,6 +57,7 @@
set params during context creation. (Sara)
. "context" and "binary_pipes" params in "other_options" arg. (Sara)
. stream_resolve_include_path(). (Sara)
+- Added gmp_testbit() function. (Tony)
- Added shm_has_var() function. (Mike)
- Added str_getcsv() function. (Sara)
- Added ext/hash support to ext/session's ID generator. (Sara)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.62 php-src/ext/gmp/gmp.c:1.63
--- php-src/ext/gmp/gmp.c:1.62 Thu Apr 19 09:36:34 2007
+++ php-src/ext/gmp/gmp.c Mon Apr 23 14:57:37 2007
@@ -242,6 +242,12 @@
ZEND_ARG_INFO(0, index)
ZEND_END_ARG_INFO()
+ static
+ZEND_BEGIN_ARG_INFO(arginfo_gmp_testbit, 0)
+ ZEND_ARG_INFO(0, a)
+ ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
static
ZEND_BEGIN_ARG_INFO(arginfo_gmp_popcount, 0)
ZEND_ARG_INFO(0, a)
@@ -308,6 +314,7 @@
ZEND_FE(gmp_xor,arginfo_gmp_xor)
ZEND_FE(gmp_setbit, arginfo_gmp_setbit)
ZEND_FE(gmp_clrbit, arginfo_gmp_clrbit)
+ ZEND_FE(gmp_testbit,arginfo_gmp_testbit)
ZEND_FE(gmp_scan0, arginfo_gmp_scan0)
ZEND_FE(gmp_scan1, arginfo_gmp_scan1)
ZEND_FE(gmp_popcount, arginfo_gmp_popcount)
@@ -1531,6 +1538,35 @@
}
/* }}} */
+/* {{{ proto bool gmp_testbit(resource a, int index) U
+ Tests if bit is set in a */
+ZEND_FUNCTION(gmp_testbit)
+{
+ zval **a_arg, **ind_arg;
+ int index;
+ mpz_t *gmpnum_a;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &a_arg, &ind_arg)
== FAILURE){
+ WRONG_PARAM_COUNT;
+ }
+
+ ZEND_FETCH_RESOURCE(gmpnum_a, mpz_t *, a_arg, -1, GMP_RESOURCE_NAME,
le_gmp);
+
+ convert_to_long_ex(ind_arg);
+ index = Z_LVAL_PP(ind_arg);
+
+ if (index < 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Index must be
greater than or equal to zero");
+ RETURN_FALSE;
+ }
+
+ if (mpz_tstbit(*gmpnum_a, index)) {
+ RETURN_TRUE;
+ }
+ RETURN_FALSE;
+}
+/* }}} */
+
/* {{{ proto int gmp_popcount(resource a) U
Calculates the population count of a */
ZEND_FUNCTION(gmp_popcount)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/php_gmp.h?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/gmp/php_gmp.h
diff -u php-src/ext/gmp/php_gmp.h:1.16 php-src/ext/gmp/php_gmp.h:1.17
--- php-src/ext/gmp/php_gmp.h:1.16 Fri Jan 12 12:31:31 2007
+++ php-src/ext/gmp/php_gmp.h Mon Apr 23 14:57:37 2007
@@ -70,6 +70,7 @@
ZEND_FUNCTION(gmp_random);
ZEND_FUNCTION(gmp_setbit);
ZEND_FUNCTION(gmp_clrbit);
+ZEND_FUNCTION(gmp_testbit);
ZEND_FUNCTION(gmp_scan0);
ZEND_FUNCTION(gmp_scan1);
ZEND_FUNCTION(gmp_popcount);
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/tests/039.phpt?view=markup&rev=1.1
Index: php-src/ext/gmp/tests/039.phpt
+++ php-src/ext/gmp/tests/039.phpt
--TEST--
gmp_testbit() basic tests
--FILE--
--EXPECTF--
Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on
line %d
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on
line %d
bool(false)
bool(false)
bool(true)
string(7) "102"
bool(true)
string(7) "134"
bool(false)
bool(true)
string(30) "238462734628347239571823641266"
bool(false)
string(30) "238462734628347239571823641234"
Done
--UEXPECTF--
Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on
line %d
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on
line %d
bool(false)
bool(false)
bool(true)
unicode(7) "102"
bool(true)
unicode(7) "134"
bool(false)
bool(true)
unicode(30) "238462734628347239571823641266"
bool(false)
unicode(30) "238462734628347239571823641234"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/zlib zlib.c
mikeWed Apr 18 19:39:12 2007 UTC
Modified files:
/php-src/ext/zlib zlib.c
/php-srcNEWS
Log:
- fixed bug #40325 (Vary: header missing in gzip output handlers); no MFH
[DOC] since PHP 6 a Vary header will be sent without regards to whether
the negotiation was successful or not and unless the complete
output buffer gets discarded
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.214&r2=1.215&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.214 php-src/ext/zlib/zlib.c:1.215
--- php-src/ext/zlib/zlib.c:1.214 Fri Feb 2 17:11:10 2007
+++ php-src/ext/zlib/zlib.c Wed Apr 18 19:39:12 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.214 2007/02/02 17:11:10 mike Exp $ */
+/* $Id: zlib.c,v 1.215 2007/04/18 19:39:12 mike Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -124,6 +124,19 @@
PHP_OUTPUT_TSRMLS(output_context);
if (!php_zlib_output_encoding(TSRMLS_C)) {
+ /* "Vary: Accept-Encoding" header sent along uncompressed
content breaks caching in MSIE,
+ so let's just send it with successfully compressed
content or unless the complete
+ buffer gets discarded, see http://bugs.php.net/40325;
+
+ Test as follows:
+ +Vary: $ HTTP_ACCEPT_ENCODING=gzip ./sapi/cgi/php
<<<'op !=
(PHP_OUTPUT_HANDLER_START|PHP_OUTPUT_HANDLER_CLEAN|PHP_OUTPUT_HANDLER_FINAL)) {
+ sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"),
1, 1 TSRMLS_CC);
+ }
return FAILURE;
}
@@ -218,8 +231,6 @@
deflateEnd(&ctx->Z);
return FAILURE;
}
- /* "Vary: Accept-Encoding" header sent along
uncompressed content breaks caching in MSIE,
- so let's just send it with successfully compressed
content, see http://bugs.php.net/40325 */
sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"),
1, 1 TSRMLS_CC);
php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2144&r2=1.2145&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2144 php-src/NEWS:1.2145
--- php-src/NEWS:1.2144 Tue Apr 3 06:56:39 2007
+++ php-src/NEWSWed Apr 18 19:39:12 2007
@@ -61,4 +61,4 @@
- Added str_getcsv() function. (Sara)
- Added ext/hash support to ext/session's ID generator. (Sara)
-
+- Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sebastian Tue Apr 3 06:56:39 2007 UTC Modified files: /php-srcNEWS Log: Fugbix typo. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2143&r2=1.2144&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2143 php-src/NEWS:1.2144 --- php-src/NEWS:1.2143 Tue Apr 3 06:32:59 2007 +++ php-src/NEWSTue Apr 3 06:56:39 2007 @@ -13,7 +13,7 @@ - Changed allow_url_fopen/allow_url_include to allow per-wrapper enable/disable and runtime tightening. (Sara) -- Removed undocumnted and incomplete support for strings in list() operator. +- Removed undocumented and incomplete support for strings in list() operator. (Dmitry) - Removed old legacy: . "register_globals" support. (Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
wharmby Mon Mar 5 15:53:09 2007 UTC Modified files: /php-srcNEWS Log: Remove bug entry for 35872 as now in 5.2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2141&r2=1.2142&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2141 php-src/NEWS:1.2142 --- php-src/NEWS:1.2141 Mon Mar 5 12:56:26 2007 +++ php-src/NEWSMon Mar 5 15:53:09 2007 @@ -58,6 +58,5 @@ - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) -- Fixed bug #35872 (Prevent object store references during RSHUTDOWN) (Andy) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/com_dotnet com_extension.c com_wrapper.c php_com_dotnet.h
wharmby Mon Mar 5 12:56:26 2007 UTC
Modified files:
/php-src/ext/com_dotnet com_wrapper.c com_extension.c
php_com_dotnet.h
/php-srcNEWS
Log:
Fixed bug #35872 (Prevent object store references during RSHUTDOWN)
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_wrapper.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/com_dotnet/com_wrapper.c
diff -u php-src/ext/com_dotnet/com_wrapper.c:1.14
php-src/ext/com_dotnet/com_wrapper.c:1.15
--- php-src/ext/com_dotnet/com_wrapper.c:1.14 Sat Feb 24 16:25:53 2007
+++ php-src/ext/com_dotnet/com_wrapper.cMon Mar 5 12:56:26 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_wrapper.c,v 1.14 2007/02/24 16:25:53 helly Exp $ */
+/* $Id: com_wrapper.c,v 1.15 2007/03/05 12:56:26 wharmby Exp $ */
/* This module exports a PHP object as a COM object by wrapping it
* using IDispatchEx */
@@ -92,13 +92,17 @@
# define TSRMLS_FIXED()
#endif
-#define FETCH_DISP(methname) \
- TSRMLS_FIXED() \
- php_dispatchex *disp = (php_dispatchex*)This; \
- trace(" PHP:%s %s\n", Z_OBJCE_P(disp->object)->name, methname); \
- if (GetCurrentThreadId() != disp->engine_thread) \
- return RPC_E_WRONG_THREAD;
-
+#define FETCH_DISP(methname)
\
+ TSRMLS_FIXED()
\
+ php_dispatchex *disp = (php_dispatchex*)This;
\
+ if (COMG(rshutdown_started)) {
\
+ trace(" PHP Object:%p (name:unknown) %s\n", disp->object,
methname); \
+ } else {
\
+ trace(" PHP Object:%p (name:%s) %s\n", disp->object,
Z_OBJCE_P(disp->object)->name, methname); \
+ }
\
+ if (GetCurrentThreadId() != disp->engine_thread) {
\
+ return RPC_E_WRONG_THREAD;
\
+ }
static HRESULT STDMETHODCALLTYPE disp_queryinterface(
IDispatchEx *This,
@@ -534,7 +538,7 @@
{
php_dispatchex *disp =
(php_dispatchex*)CoTaskMemAlloc(sizeof(php_dispatchex));
- trace("constructing a COM proxy\n");
+ trace("constructing a COM wrapper for PHP object %p (%s)\n", object,
Z_OBJCE_P(object)->name);
if (disp == NULL)
return NULL;
@@ -559,8 +563,13 @@
{
TSRMLS_FETCH();
- trace("destroying COM wrapper for PHP object %s\n",
Z_OBJCE_P(disp->object)->name);
-
+ /* Object store not available during request shutdown */
+ if (COMG(rshutdown_started)) {
+ trace("destroying COM wrapper for PHP object %p
(name:unknown)\n", disp->object);
+ } else {
+ trace("destroying COM wrapper for PHP object %p (name:%s)\n",
disp->object, Z_OBJCE_P(disp->object)->name);
+ }
+
disp->id = 0;
if (disp->refcount > 0)
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.24&r2=1.25&diff_format=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.24
php-src/ext/com_dotnet/com_extension.c:1.25
--- php-src/ext/com_dotnet/com_extension.c:1.24 Mon Jan 1 09:29:21 2007
+++ php-src/ext/com_dotnet/com_extension.c Mon Mar 5 12:56:26 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_extension.c,v 1.24 2007/01/01 09:29:21 sebastian Exp $ */
+/* $Id: com_extension.c,v 1.25 2007/03/05 12:56:26 wharmby Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -315,6 +315,7 @@
*/
PHP_RINIT_FUNCTION(com_dotnet)
{
+ COMG(rshutdown_started) = 0;
return SUCCESS;
}
/* }}} */
@@ -328,6 +329,7 @@
php_com_dotnet_rshutdown(TSRMLS_C);
[PHP-CVS] cvs: php-src / NEWS
wharmby Fri Feb 2 15:49:06 2007 UTC Modified files: /php-srcNEWS Log: Remove bug fix entries #34564 and #37927 as now in 5.2.1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2138&r2=1.2139&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2138 php-src/NEWS:1.2139 --- php-src/NEWS:1.2138 Fri Feb 2 12:00:48 2007 +++ php-src/NEWSFri Feb 2 15:49:06 2007 @@ -57,8 +57,5 @@ - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) -- Fixed bug #34564 (COM extension not returning modified "out" argument) (Andy) -- Fixed bug #37927 (Prevent trap when COM extension processes argument of type -VT_DISPATCH|VT_REF) (Andy) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
wharmby Fri Feb 2 12:00:48 2007 UTC Modified files: /php-srcNEWS Log: Update NEWS for ealier bug fixes http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2137&r2=1.2138&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2137 php-src/NEWS:1.2138 --- php-src/NEWS:1.2137 Wed Jan 24 21:43:47 2007 +++ php-src/NEWSFri Feb 2 12:00:48 2007 @@ -57,4 +57,8 @@ - Added shm_has_var() function. (Mike) - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) +- Fixed bug #34564 (COM extension not returning modified "out" argument) (Andy) +- Fixed bug #37927 (Prevent trap when COM extension processes argument of type +VT_DISPATCH|VT_REF) (Andy) + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/soap php_http.c php_xml.c /ext/standard php_fopen_wrapper.c /main main.c php_globals.h php_streams.h /main/streams streams.c userspace.c
pollita Wed Jan 24 21:43:47 2007 UTC
Modified files:
/php-src/ext/soap php_http.c php_xml.c
/php-src/ext/standard php_fopen_wrapper.c
/php-src/main main.c php_globals.h php_streams.h
/php-src/main/streams streams.c userspace.c
/php-srcNEWS
Log:
Expand allow_url_fopen/allow_url_include functionality
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.100 php-src/ext/soap/php_http.c:1.101
--- php-src/ext/soap/php_http.c:1.100 Wed Jan 17 00:22:48 2007
+++ php-src/ext/soap/php_http.c Wed Jan 24 21:43:47 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_http.c,v 1.100 2007/01/17 00:22:48 pollita Exp $ */
+/* $Id: php_http.c,v 1.101 2007/01/24 21:43:47 pollita Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -232,7 +232,7 @@
int content_type_xml = 0;
char *content_encoding;
char *http_msg = NULL;
- zend_bool old_allow_url_fopen;
+ char *old_allow_url_fopen_list;
soap_client_object *client;
if (this_ptr == NULL || Z_TYPE_P(this_ptr) != IS_OBJECT) {
@@ -317,13 +317,16 @@
return FALSE;
}
- old_allow_url_fopen = PG(allow_url_fopen);
- zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "1",
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ old_allow_url_fopen_list = PG(allow_url_fopen_list);
+ if (!old_allow_url_fopen_list) {
+ old_allow_url_fopen_list = "";
+ }
+ zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "*",
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
if (use_ssl && php_stream_locate_url_wrapper("https://";, NULL,
STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC) == NULL) {
php_url_free(phpurl);
if (request != buf) {efree(request);}
add_soap_fault(this_ptr, "HTTP", "SSL support is not available
in this build", NULL, NULL TSRMLS_CC);
- zend_alter_ini_entry("allow_url_fopen",
sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry("allow_url_fopen",
sizeof("allow_url_fopen"), old_allow_url_fopen_list,
strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
return FALSE;
}
@@ -376,11 +379,11 @@
php_url_free(phpurl);
if (request != buf) {efree(request);}
add_soap_fault(this_ptr, "HTTP", "Could not connect to
host", NULL, NULL TSRMLS_CC);
- zend_alter_ini_entry("allow_url_fopen",
sizeof("allow_url_fopen"), old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry("allow_url_fopen",
sizeof("allow_url_fopen"), old_allow_url_fopen_list,
strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
return FALSE;
}
}
- zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"),
old_allow_url_fopen ? "1" : "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"),
old_allow_url_fopen_list, strlen(old_allow_url_fopen_list), PHP_INI_SYSTEM,
PHP_INI_STAGE_RUNTIME);
if (stream) {
if (client->url) {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_xml.c?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/soap/php_xml.c
diff -u php-src/ext/soap/php_xml.c:1.31 php-src/ext/soap/php_xml.c:1.32
--- php-src/ext/soap/php_xml.c:1.31 Wed Jan 17 00:22:48 2007
+++ php-src/ext/soap/php_xml.c Wed Jan 24 21:43:47 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_xml.c,v 1.31 2007/01/17 00:22:48 pollita Exp $ */
+/* $Id: php_xml.c,v 1.32 2007/01/24 21:43:47 pollita Exp $ */
#include "php_soap.h"
#include "libxml/parser.h"
@@ -80,16 +80,19 @@
{
xmlParserCtxtPtr ctxt = NULL;
xmlDocPtr ret;
- zend_bool old_allow_url_fopen;
+ char *old_allow_url_fopen_list;
/*
xmlInitParser();
*/
- old_allow_url_fopen = PG(allow_url_fopen);
- zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "1",
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ old_allow_url_fopen_list = PG(allow_url_fopen_list);
+ if (!old_allow_url_fopen_list) {
+ old_allow_url_fopen_list = "";
+ }
+ zend_alter_ini_entry("allow_url_fopen", sizeof("allow_url_fopen"), "*",
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
[PHP-CVS] cvs: php-src / NEWS
bjori Sat Jan 6 16:43:54 2007 UTC Modified files: /php-srcNEWS Log: Remove bugfix entry (will be in 5.2.1) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2135&r2=1.2136&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2135 php-src/NEWS:1.2136 --- php-src/NEWS:1.2135 Fri Jan 5 03:57:56 2007 +++ php-src/NEWSSat Jan 6 16:43:54 2007 @@ -56,5 +56,3 @@ - Added str_getcsv() function. (Sara) - Added ext/hash support to ext/session's ID generator. (Sara) -- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, - not enity). (Hannes Magnusson) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/session CREDITS php_session.h session.c
pollita Fri Jan 5 03:57:57 2007 UTC
Modified files:
/php-srcNEWS
/php-src/ext/sessionphp_session.h session.c CREDITS
Log:
Allow ext/session to use ext/hash's algorithms for generating IDs
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2134&r2=1.2135&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2134 php-src/NEWS:1.2135
--- php-src/NEWS:1.2134 Sat Dec 16 19:15:25 2006
+++ php-src/NEWSFri Jan 5 03:57:56 2007
@@ -54,6 +54,7 @@
. stream_resolve_include_path(). (Sara)
- Added shm_has_var() function. (Mike)
- Added str_getcsv() function. (Sara)
+- Added ext/hash support to ext/session's ID generator. (Sara)
- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag,
not enity). (Hannes Magnusson)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.112&r2=1.113&diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.112
php-src/ext/session/php_session.h:1.113
--- php-src/ext/session/php_session.h:1.112 Fri Jan 5 02:07:59 2007
+++ php-src/ext/session/php_session.h Fri Jan 5 03:57:57 2007
@@ -16,13 +16,17 @@
+--+
*/
-/* $Id: php_session.h,v 1.112 2007/01/05 02:07:59 pollita Exp $ */
+/* $Id: php_session.h,v 1.113 2007/01/05 03:57:57 pollita Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
#include "ext/standard/php_var.h"
+#ifdef HAVE_HASH_EXT
+# include "ext/hash/php_hash.h"
+#endif
+
#define PHP_SESSION_API 20020330
#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char
*session_name TSRMLS_DC
@@ -121,6 +125,9 @@
zend_bool apply_trans_sid; /* whether or not to enable trans-sid
for the current request */
long hash_func;
+#ifdef HAVE_HASH_EXT
+ php_hash_ops *hash_ops;
+#endif
long hash_bits_per_character;
int send_cookie;
int define_sid;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.463&r2=1.464&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.463 php-src/ext/session/session.c:1.464
--- php-src/ext/session/session.c:1.463 Fri Jan 5 02:07:59 2007
+++ php-src/ext/session/session.c Fri Jan 5 03:57:57 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.463 2007/01/05 02:07:59 pollita Exp $ */
+/* $Id: session.c,v 1.464 2007/01/05 03:57:57 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -218,7 +218,8 @@
enum {
PS_HASH_FUNC_MD5,
- PS_HASH_FUNC_SHA1
+ PS_HASH_FUNC_SHA1,
+ PS_HASH_FUNC_OTHER
};
/* returns a pointer to the byte after the last valid character in out */
@@ -259,11 +260,15 @@
return out;
}
+#define PS_ID_INITIAL_SIZE 100
PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS)
{
PHP_MD5_CTX md5_context;
PHP_SHA1_CTX sha1_context;
- unsigned char digest[21];
+#ifdef HAVE_HASH_EXT
+ void *hash_context;
+#endif
+ unsigned char *digest;
int digest_len;
int j;
char *buf;
@@ -282,7 +287,7 @@
remote_addr = Z_STRVAL_PP(token);
}
- buf = emalloc(100);
+ buf = emalloc(PS_ID_INITIAL_SIZE);
/* maximum 15+19+19+10 bytes */
sprintf(buf, "%.15s%ld%ld%0.8F", remote_addr ? remote_addr : "",
@@ -299,6 +304,20 @@
PHP_SHA1Update(&sha1_context, (unsigned char *) buf,
strlen(buf));
digest_len = 20;
break;
+#ifdef HAVE_HASH_EXT
+ case PS_HASH_FUNC_OTHER:
+ if (!PS(hash_ops)) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR,
"Invalid session hash function");
+ efree(buf);
+ return NULL;
+ }
+
+ hash_context = emalloc(PS(hash_ops)->context_size);
+ PS(hash_ops)->hash_init(hash_context);
+ PS(hash_ops)->hash_update(hash_context, (unsigned char
*) buf, strlen(buf));
+ digest_len = PS(hash_ops)->digest_size;
+ break;
+#endif /* HAVE_HASH_EXT */
default:
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid
session hash function");
efree(buf);
@@ -325,6 +344,11 @@
case PS_HASH_FUNC_SHA1:
PHP_SHA1Update(&sha1_context,
rbuf, n);
break;
+#ifdef HAVE_HASH_EXT
+ case PS_HASH_FUNC_OTHER:
+
PS(hash_ops)->hash_update(hash_context, rbuf, n);
+ break;
+#e
[PHP-CVS] cvs: php-src / NEWS
bjori Sat Dec 16 19:15:25 2006 UTC Modified files: /php-srcNEWS Log: Remove items that are already in 5.2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2133&r2=1.2134&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2133 php-src/NEWS:1.2134 --- php-src/NEWS:1.2133 Tue Dec 5 04:52:44 2006 +++ php-src/NEWSSat Dec 16 19:15:25 2006 @@ -5,7 +5,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) -- Changed return "new" by reference to throw an E_STRICT error. (Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) - Changed opendir/dir/scandir to use default context @@ -26,15 +25,12 @@ - Removed support for "continue" and "break" operators with non-constant operands. (Dmitry) - Removed Freetype 1.x and GD 1.x from GD extension. (Pierre) -- Removed global reflection constants. (Johannes) - Moved extensions to PECL: . ext/ncurses (Hartmut) - Improved and cleaned CGI code. FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) -- Improved cURL: (Ilia) - . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. - Improved ext/zlib; re-implemented non-file related functionality. (Mike) - Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) - Improved ext/mhash: (Mike) @@ -44,23 +40,16 @@ mhash_keygen. -- Added automatic module globals management. (Dmitry) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added --rclass and --rextension CLI parameters to reflect internal classes - and loaded extensions. (Johannes) - Added an optional parameter to strstr() and stristr() for retrieval of either the part of haystack before or after first occurence of needle. (Johannes) - Added possibility to check in which extension an internal function was defined using reflection API. (Johannes) - Added streams features: . Context parameter for copy() function. (Sara) - . "allow_url_include" ini option to be able to turn off remote url -code execution separately from the "allow_url_fopen" setting. (Rasmus) . Second optional parameter to stream_context_create() to set params during context creation. (Sara) - . sys_get_temp_dir() function that returns the default directory -for temporary files (as requested in bug #35380). (Hartmut) . "context" and "binary_pipes" params in "other_options" arg. (Sara) . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) @@ -68,5 +57,3 @@ - Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity). (Hannes Magnusson) -- Fixed bug #36630 (umask not reset at the end of the request). (Ilia) -- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c php_string.h string.c
That's some scary code there, Sara. What about endianness and
portability?
-Andrei
On Dec 4, 2006, at 8:52 PM, Sara Golemon wrote:
+ if (str_type == IS_UNICODE) {
+ UChar udelim = ',', uenc = '"', uesc = '\\';
+
+ /* Non-passed params would need to be upconverted, but we can cheat
with some local declarations */
+ if (delim_type == IS_STRING) {
+ delim = (char*)&udelim;
+ delim_len = 1;
+ }
+ if (enc_type == IS_STRING) {
+ enc = (char*)&uenc;
+ enc_len = 1;
+ }
+ if (esc_type == IS_STRING) {
+ esc = (char*)&uesc;
+ esc_len = 1;
+ }
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c php_string.h string.c
pollita Tue Dec 5 04:52:44 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c file.c php_string.h
string.c
Log:
Add str_getcsv() and fix a couple cases in recent fgetcsv() reimplementation
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2132&r2=1.2133&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2132 php-src/NEWS:1.2133
--- php-src/NEWS:1.2132 Wed Nov 15 17:16:25 2006
+++ php-src/NEWSTue Dec 5 04:52:44 2006
@@ -64,6 +64,7 @@
. "context" and "binary_pipes" params in "other_options" arg. (Sara)
. stream_resolve_include_path(). (Sara)
- Added shm_has_var() function. (Mike)
+- Added str_getcsv() function. (Sara)
- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag,
not enity). (Hannes Magnusson)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.828&r2=1.829&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.828
php-src/ext/standard/basic_functions.c:1.829
--- php-src/ext/standard/basic_functions.c:1.828Tue Dec 5 02:54:07 2006
+++ php-src/ext/standard/basic_functions.c Tue Dec 5 04:52:44 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.828 2006/12/05 02:54:07 stas Exp $ */
+/* $Id: basic_functions.c,v 1.829 2006/12/05 04:52:44 pollita Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2752,6 +2752,14 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_str_getcsv, 0, 0, 1)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, delimiter)
+ ZEND_ARG_INFO(0, enclosure)
+ ZEND_ARG_INFO(0, escape)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO(arginfo_str_repeat, 0)
ZEND_ARG_INFO(0, input)
ZEND_ARG_INFO(0, mult)
@@ -3230,6 +3238,7 @@
PHP_FE(chr,
arginfo_chr)
PHP_FE(ord,
arginfo_ord)
PHP_FE(parse_str,
arginfo_parse_str)
+ PHP_FE(str_getcsv,
arginfo_str_getcsv)
PHP_FE(str_pad,
arginfo_str_pad)
PHP_FALIAS(chop,rtrim,
arginfo_rtrim)
PHP_FALIAS(strchr, strstr,
arginfo_strstr)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.470&r2=1.471&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.470 php-src/ext/standard/file.c:1.471
--- php-src/ext/standard/file.c:1.470 Tue Dec 5 04:13:46 2006
+++ php-src/ext/standard/file.c Tue Dec 5 04:52:44 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.470 2006/12/05 04:13:46 pollita Exp $ */
+/* $Id: file.c,v 1.471 2006/12/05 04:52:44 pollita Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2423,11 +2423,21 @@
/* Simple character */
p++;
+
+ if (p == e) {
+ add_next_index_stringl(return_value,
field_start, p - field_start, 1);
+ /* Reset scanner even though we're
dying */
+ state = PHP_FGETCSV_READY;
+ field_start = field_end = NULL;
+ p += delimiter_len;
+ }
break;
}
}
- efree(buffer);
+ if (stream) {
+ efree(buffer);
+ }
}
/* }}} */
@@ -2617,11 +2627,21 @@
/* Simple character */
p++;
+
+ if (p == e) {
+ add_next_index_unicodel(return_value,
field_start, p - field_start, 1);
+ /* Reset scanner even though we're
dying */
+ state = PHP_FGETCSV_READY;
+ field_start = field_end = NULL;
+ p += delimiter_len;
+
[PHP-CVS] cvs: php-src / NEWS
mikeWed Nov 15 17:16:25 2006 UTC Modified files: /php-srcNEWS Log: - mhash news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2131&r2=1.2132&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2131 php-src/NEWS:1.2132 --- php-src/NEWS:1.2131 Mon Nov 13 20:48:18 2006 +++ php-src/NEWSWed Nov 15 17:16:25 2006 @@ -36,7 +36,13 @@ - Improved cURL: (Ilia) . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. - Improved ext/zlib; re-implemented non-file related functionality. (Mike) -- Improved output layer; see README.NEW-OUTPUT_API for internals. (Mike) +- Improved output layer; see README.NEW-OUTPUT-API for internals. (Mike) +- Improved ext/mhash: (Mike) + . Added keygen constants. + . Added new functions: mhash_keygen_count, mhash_get_keygen_name, +mhash_keygen_uses_hash, mhash_keygen_uses_salt, mhash_get_keygen_salt_size, +mhash_keygen. + - Added automatic module globals management. (Dmitry) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
rrichards Mon Nov 13 20:48:18 2006 UTC Modified files: /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2130&r2=1.2131&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2130 php-src/NEWS:1.2131 --- php-src/NEWS:1.2130 Fri Oct 27 21:18:56 2006 +++ php-src/NEWSMon Nov 13 20:48:18 2006 @@ -59,5 +59,7 @@ . stream_resolve_include_path(). (Sara) - Added shm_has_var() function. (Mike) +- Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, + not enity). (Hannes Magnusson) - Fixed bug #36630 (umask not reset at the end of the request). (Ilia) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/sysvshm php_sysvshm.h sysvshm.c /ext/sysvshm/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt
mikeFri Oct 27 21:18:57 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/sysvshmphp_sysvshm.h sysvshm.c
/php-src/ext/sysvshm/tests 002.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt
Log:
- upgrade ext/sysvshm to current parameter parsing API
- mark functions unicode safe
- add shm_has_var()
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2129&r2=1.2130&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2129 php-src/NEWS:1.2130
--- php-src/NEWS:1.2129 Tue Oct 17 21:54:17 2006
+++ php-src/NEWSFri Oct 27 21:18:56 2006
@@ -57,6 +57,7 @@
for temporary files (as requested in bug #35380). (Hartmut)
. "context" and "binary_pipes" params in "other_options" arg. (Sara)
. stream_resolve_include_path(). (Sara)
+- Added shm_has_var() function. (Mike)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/php_sysvshm.h?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/sysvshm/php_sysvshm.h
diff -u php-src/ext/sysvshm/php_sysvshm.h:1.18
php-src/ext/sysvshm/php_sysvshm.h:1.19
--- php-src/ext/sysvshm/php_sysvshm.h:1.18 Sun Jan 1 13:09:56 2006
+++ php-src/ext/sysvshm/php_sysvshm.h Fri Oct 27 21:18:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sysvshm.h,v 1.18 2006/01/01 13:09:56 sniper Exp $ */
+/* $Id: php_sysvshm.h,v 1.19 2006/10/27 21:18:56 mike Exp $ */
#ifndef PHP_SYSVSHM_H
#define PHP_SYSVSHM_H
@@ -30,6 +30,8 @@
#include
#include
+#define PHP_SHM_RSRC_NAME "sysvshm"
+
typedef struct {
int le_shm;
long init_mem;
@@ -51,9 +53,9 @@
} sysvshm_chunk_head;
typedef struct {
- key_t key; /* Key set by user */
- long id; /* Returned by shmget. */
- sysvshm_chunk_head *ptr; /* memoryaddress of shared memory */
+ key_t key; /* key set by user */
+ long id; /* returned by shmget */
+ sysvshm_chunk_head *ptr; /* memory address of shared memory */
} sysvshm_shm;
PHP_MINIT_FUNCTION(sysvshm);
@@ -62,6 +64,7 @@
PHP_FUNCTION(shm_remove);
PHP_FUNCTION(shm_put_var);
PHP_FUNCTION(shm_get_var);
+PHP_FUNCTION(shm_has_var);
PHP_FUNCTION(shm_remove_var);
extern sysvshm_module php_sysvshm;
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.73 php-src/ext/sysvshm/sysvshm.c:1.74
--- php-src/ext/sysvshm/sysvshm.c:1.73 Thu Jun 29 09:03:00 2006
+++ php-src/ext/sysvshm/sysvshm.c Fri Oct 27 21:18:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvshm.c,v 1.73 2006/06/29 09:03:00 tony2001 Exp $ */
+/* $Id: sysvshm.c,v 1.74 2006/10/27 21:18:56 mike Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -45,6 +45,7 @@
PHP_FE(shm_remove, NULL)
PHP_FE(shm_detach, NULL)
PHP_FE(shm_put_var, NULL)
+ PHP_FE(shm_has_var, NULL)
PHP_FE(shm_get_var, NULL)
PHP_FE(shm_remove_var, NULL)
{NULL, NULL, NULL}
@@ -56,7 +57,7 @@
zend_module_entry sysvshm_module_entry = {
STANDARD_MODULE_HEADER,
"sysvshm",
- sysvshm_functions,
+ sysvshm_functions,
PHP_MINIT(sysvshm),
NULL,
NULL,
@@ -73,9 +74,11 @@
#undef shm_ptr /* undefine AIX-specific macro
*/
+#define SHM_FETCH_RESOURCE(shm_ptr, z_ptr) ZEND_FETCH_RESOURCE(shm_ptr,
sysvshm_shm *, &z_ptr, -1, PHP_SHM_RSRC_NAME, php_sysvshm.le_shm)
+
THREAD_LS sysvshm_module php_sysvshm;
-static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, char *data,
long len);
+static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, const char
*data, long len);
static long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
@@ -93,7 +96,7 @@
*/
PHP_MINIT_FUNCTION(sysvshm)
{
- php_sysvshm.le_shm =
zend_register_list_destructors_ex(php_release_sysvshm, NULL, "sysvshm",
module_number);
+ php_sysvshm.le_shm =
zend_register_list_destructors_ex(php_release_sysvshm, NULL, PHP_SHM_RSRC_NAME,
module_number);
if (cfg_get_long("sysvshm.init_mem", &php_sysvshm.init_mem) == FAILURE)
{
php_sysvshm.init_mem=1;
@@ -102,36 +105,17 @@
}
/* }}} */
-/* {{{ proto int shm_attach(int key [, int memsize [, int perm]])
+/* {{{ proto resource shm_attach(int key [, int memsize [, int perm]]) U
Creates or open a shared memory segment */
PHP_FUNCTION(shm_attach)
{
- zval **arg_key, **arg_size, **arg_flag;
- long shm_size, shm_flag;
sysvshm_shm *shm_list_ptr;
[PHP-CVS] cvs: php-src / NEWS /main fopen_wrappers.c fopen_wrappers.h main.c
pollita Tue Oct 17 21:54:17 2006 UTC
Modified files:
/php-src/main main.c fopen_wrappers.c fopen_wrappers.h
/php-srcNEWS
Log:
Extend open_basedir functionality to allow runtime tightening
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.704&r2=1.705&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.704 php-src/main/main.c:1.705
--- php-src/main/main.c:1.704 Tue Oct 3 16:28:02 2006
+++ php-src/main/main.c Tue Oct 17 21:54:16 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.704 2006/10/03 16:28:02 pollita Exp $ */
+/* $Id: main.c,v 1.705 2006/10/17 21:54:16 pollita Exp $ */
/* {{{ includes
*/
@@ -339,6 +339,7 @@
#else
# define DEFAULT_SENDMAIL_PATH NULL
#endif
+
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
@@ -392,7 +393,7 @@
STD_PHP_INI_ENTRY("extension_dir",
PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty,
extension_dir, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("include_path",
PHP_INCLUDE_PATH, PHP_INI_ALL,OnUpdateStringUnempty,
include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30",
PHP_INI_ALL,OnUpdateTimeout)
- STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_SYSTEM, OnUpdateString, open_basedir,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY("open_basedir", NULL,
PHP_INI_ALL,OnUpdateBaseDir,open_basedir,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1",
PHP_INI_SYSTEM, OnUpdateBool, file_uploads,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY("upload_max_filesize","2M",
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong,
upload_max_filesize,php_core_globals, core_globals)
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.183&r2=1.184&diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.183 php-src/main/fopen_wrappers.c:1.184
--- php-src/main/fopen_wrappers.c:1.183 Sat Jul 1 11:50:52 2006
+++ php-src/main/fopen_wrappers.c Tue Oct 17 21:54:16 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.183 2006/07/01 11:50:52 nlopess Exp $ */
+/* $Id: fopen_wrappers.c,v 1.184 2006/10/17 21:54:16 pollita Exp $ */
/* {{{ includes
*/
@@ -82,6 +82,64 @@
#endif
/* }}} */
+/* {{{ OnUpdateBaseDir
+Allows any change to open_basedir setting in during Startup and Shutdown
events,
+or a tightening during activation/runtime/deactivation */
+PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
+{
+ char **p, *pathbuf, *ptr, *end;
+#ifndef ZTS
+ char *base = (char *) mh_arg2;
+#else
+ char *base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+ p = (char **) (base+(size_t) mh_arg1);
+
+ if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
+ /* We're in a PHP_INI_SYSTEM context, no restrictions */
+ *p = new_value;
+ return SUCCESS;
+ }
+
+
+ /* Elsewise, we're in runtime */
+ if (!*p || !**p) {
+ /* open_basedir not set yet, go ahead and give it a value */
+ *p = new_value;
+ return SUCCESS;
+ }
+
+ /* Shortcut: When we have a open_basedir and someone tries to unset, we
know it'll fail */
+ if (!new_value || !*new_value) {
+ return FAILURE;
+ }
+
+ /* Is the proposed open_basedir at least as restrictive as the current
setting? */
+ ptr = pathbuf = estrdup(new_value);
+ while (ptr && *ptr) {
+ end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
+ if (end != NULL) {
+ *end = '\0';
+ end++;
+ }
+ if (php_check_open_basedir_ex(ptr, 0 TSRMLS_CC) != 0) {
+ /* At least one portion of this open_basedir is less
restrictive than the prior one, FAIL */
+ efree(pathbuf);
+ return FAILURE;
+ }
+ ptr = end;
+ }
+ efree(pathbuf);
+
+ /* Everything checks out, set it */
+ *p = new_value;
+
+ return SUCCESS;
+}
+/* }}} */
+
+
/* {{{ php_check_specific_open_basedir
When open_basedir is not NULL, check if the given filename is located in
open_basedir. Returns -1 if error or
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h
pollita Mon Oct 9 02:48:06 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
/php-srcNEWS
Log:
Add stream_resolve_include_path()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.810&r2=1.811&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.810
php-src/ext/standard/basic_functions.c:1.811
--- php-src/ext/standard/basic_functions.c:1.810Sun Oct 8 13:34:23 2006
+++ php-src/ext/standard/basic_functions.c Mon Oct 9 02:48:06 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.810 2006/10/08 13:34:23 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.811 2006/10/09 02:48:06 pollita Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2443,6 +2443,12 @@
ZEND_ARG_INFO(0, stream)
ZEND_ARG_INFO(0, encoding)
ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_resolve_include_path, 0, 0, 1)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
/* }}} */
/* {{{ string.c */
static
@@ -3553,6 +3559,7 @@
#endif
PHP_FE(stream_copy_to_stream,
arginfo_stream_copy_to_stream)
PHP_FE(stream_get_contents,
arginfo_stream_get_contents)
+ PHP_FE(stream_resolve_include_path,
arginfo_stream_resolve_include_path)
PHP_FE(fgetcsv,
arginfo_fgetcsv)
PHP_FE(fputcsv,
arginfo_fputcsv)
PHP_FE(flock,
arginfo_flock)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.94&r2=1.95&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.94
php-src/ext/standard/streamsfuncs.c:1.95
--- php-src/ext/standard/streamsfuncs.c:1.94Sun Oct 8 13:34:23 2006
+++ php-src/ext/standard/streamsfuncs.c Mon Oct 9 02:48:06 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.94 2006/10/08 13:34:23 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.95 2006/10/09 02:48:06 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1579,6 +1579,72 @@
}
/* }}} */
+/* {{{ proto string stream_resolve_include_path(string filename[, resource
context]) U
+Determine what file will be opened by calls to fopen() with a relative path */
+PHP_FUNCTION(stream_resolve_include_path)
+{
+ zval **ppfilename, *zcontext = NULL;
+ char *filename, *ptr = PG(include_path), *end = ptr + (ptr ?
strlen(ptr) : 0), buffer[MAXPATHLEN];
+ int filename_len;
+ php_stream_context *context = NULL;
+ struct stat sb;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|r",
&ppfilename, &zcontext) == FAILURE ||
+ php_stream_path_param_encode(ppfilename, &filename,
&filename_len, REPORT_ERRORS, context = php_stream_context_from_zval(zcontext,
0)) == FAILURE) {
+ return;
+ }
+
+ while (ptr < end) {
+ char *s = strchr(ptr, DEFAULT_DIR_SEPARATOR);
+
+ if (!s) {
+ s = end;
+ }
+
+ if (s == ptr) {
+ ptr++;
+ continue;
+ }
+
+ if ((s - ptr) + 1 + filename_len >= MAXPATHLEN) {
+ /* Too long to try */
+ ptr = s + 1;
+ continue;
+ }
+
+ memcpy(buffer, ptr, s - ptr);
+ buffer[s - ptr] = '/';
+ memcpy(buffer + (s - ptr) + 1, filename, filename_len + 1);
+
+ if (php_check_open_basedir_ex(buffer, 0 TSRMLS_CC)) {
+ ptr = s + 1;
+ continue;
+ }
+
+ if (VCWD_STAT(buffer, &sb)) {
+ ptr = s + 1;
+ continue;
+ }
+
+ if (UG(unicode)) {
+ UChar *upath;
+ int upath_len;
+
+ if (SUCCESS == php_stream_path_decode(NULL, &upath,
&upath_len, buffer, (s - ptr) + 1 + filename_len, REPORT_ERRORS, context)) {
+ RETURN_UNICODEL(upath, upath_len, 0);
+
[PHP-CVS] cvs: php-src / NEWS
mikeWed Oct 4 12:58:02 2006 UTC Modified files: /php-srcNEWS Log: - output layer and ext/zlib news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2126&r2=1.2127&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2126 php-src/NEWS:1.2127 --- php-src/NEWS:1.2126 Tue Oct 3 19:37:01 2006 +++ php-src/NEWSWed Oct 4 12:58:02 2006 @@ -34,6 +34,8 @@ disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Improved cURL: (Ilia) . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. +- Improved ext/zlib; re-implemented non-file related functionality. (Mike) +- Improved output layer; see README.NEW-OUTPUT_API for internals. (Mike) - Added automatic module globals management. (Dmitry) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard proc_open.c
pollita Tue Oct 3 19:37:01 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard proc_open.c
Log:
Update proc_open() for PHP6
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2125&r2=1.2126&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2125 php-src/NEWS:1.2126
--- php-src/NEWS:1.2125 Mon Oct 2 17:47:02 2006
+++ php-src/NEWSTue Oct 3 19:37:01 2006
@@ -52,6 +52,7 @@
set params during context creation. (Sara)
. sys_get_temp_dir() function that returns the default directory
for temporary files (as requested in bug #35380). (Hartmut)
+ . "context" and "binary_pipes" params in "other_options" arg. (Sara)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.44
php-src/ext/standard/proc_open.c:1.45
--- php-src/ext/standard/proc_open.c:1.44 Mon Oct 2 21:02:08 2006
+++ php-src/ext/standard/proc_open.cTue Oct 3 19:37:01 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.44 2006/10/02 21:02:08 pollita Exp $ */
+/* $Id: proc_open.c,v 1.45 2006/10/03 19:37:01 pollita Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -417,10 +417,11 @@
};
/* }}} */
-/* {{{ proto resource proc_open(string command, array descriptorspec, array
&pipes [, string cwd [, array env [, array other_options]]])
+/* {{{ proto resource proc_open(string command, array descriptorspec, array
&pipes [, string cwd [, array env [, array other_options]]]) U
Run a process with more control over it's file descriptors */
PHP_FUNCTION(proc_open)
{
+ zval **ppcommand, **ppcwd = NULL;
char *command, *cwd=NULL;
int command_len, cwd_len;
zval *descriptorspec;
@@ -458,23 +459,39 @@
php_file_descriptor_t dev_ptmx = -1;/* master */
php_file_descriptor_t slave_pty = -1;
#endif
+ php_stream_context *context = FG(default_context);
+ zend_uchar binary_pipes = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "saz|s!a!a!",
&command,
- &command_len, &descriptorspec, &pipes, &cwd,
&cwd_len, &environment,
- &other_options) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zaz|Z!a!a!",
&ppcommand, &descriptorspec, &pipes, &ppcwd, &environment, &other_options) ==
FAILURE ||
+ php_stream_path_param_encode(ppcommand, &command, &command_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (ppcwd && php_stream_path_param_encode(ppcwd, &cwd, &cwd_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
RETURN_FALSE;
}
-#ifdef PHP_WIN32
if (other_options) {
zval **item;
+#ifdef PHP_WIN32
if (SUCCESS == zend_ascii_hash_find(Z_ARRVAL_P(other_options),
"suppress_errors", sizeof("suppress_errors"), (void**)&item)) {
if (Z_TYPE_PP(item) == IS_BOOL && Z_BVAL_PP(item)) {
suppress_errors = 1;
}
}
- }
#endif
+ /* Suppresses automatic application of unicode filters when
unicode.semantics=on */
+ if (SUCCESS == zend_ascii_hash_find(Z_ARRVAL_P(other_options),
"binary_pipes", sizeof("binary_pipes"), (void**)&item)) {
+ if (Z_TYPE_PP(item) == IS_BOOL && Z_BVAL_PP(item)) {
+ binary_pipes = 1;
+ }
+ }
+
+ /* Override FG(default_context) */
+ if (SUCCESS == zend_ascii_hash_find(Z_ARRVAL_P(other_options),
"context", sizeof("context"), (void**)&item)) {
+ context = php_stream_context_from_zval(*item, 0);
+ }
+ }
if (environment) {
env = _php_array_to_envp(environment, is_persistent TSRMLS_CC);
@@ -579,36 +596,52 @@
#endif
descriptors[ndesc].mode_flags =
descriptors[ndesc].mode & DESC_PARENT_MODE_WRITE ? O_WRONLY : O_RDONLY;
#ifdef PHP_WIN32
- if (Z_STRLEN_PP(zmode) >= 2 &&
Z_STRVAL_PP(zmode)[1] == 'b')
+ if (Z_STRLEN_PP(zmode) >= 2 &&
Z_STRVAL_PP(zmode)[1] == 'b') {
descriptors[ndesc].mode_flags |=
O_BINARY;
+ }
#endif
[PHP-CVS] cvs: php-src / NEWS
pollita Mon Oct 2 17:47:02 2006 UTC Modified files: /php-srcNEWS Log: Note context param changes in opendir(), dir(), and scandir() http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2124&r2=1.2125&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2124 php-src/NEWS:1.2125 --- php-src/NEWS:1.2124 Mon Oct 2 03:17:48 2006 +++ php-src/NEWSMon Oct 2 17:47:02 2006 @@ -8,6 +8,8 @@ - Changed return "new" by reference to throw an E_STRICT error. (Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) +- Changed opendir/dir/scandir to use default context + when no context argument is passed. (Sara) - Removed old legacy: . "register_globals" support. (Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
pollita Mon Oct 2 03:17:48 2006 UTC Modified files: /php-srcNEWS Log: Note context parameter in copy() function and group streams related additions http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2123&r2=1.2124&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2123 php-src/NEWS:1.2124 --- php-src/NEWS:1.2123 Sat Sep 9 21:24:27 2006 +++ php-src/NEWSMon Oct 2 03:17:48 2006 @@ -36,18 +36,20 @@ - Added automatic module globals management. (Dmitry) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added "allow_url_include" ini option to be able to turn off remote url - code execution separately from the "allow_url_fopen" setting. (Rasmus) - Added --rclass and --rextension CLI parameters to reflect internal classes and loaded extensions. (Johannes) - Added an optional parameter to strstr() and stristr() for retrieval of either the part of haystack before or after first occurence of needle. (Johannes) - Added possibility to check in which extension an internal function was defined using reflection API. (Johannes) -- Added second optional parameter to stream_context_create() to set params - during context creation. (Sara) -- Added sys_get_temp_dir() function that returns the default directory for - temporary files (as requested in bug #35380). (Hartmut) +- Added streams features: + . Context parameter for copy() function. (Sara) + . "allow_url_include" ini option to be able to turn off remote url +code execution separately from the "allow_url_fopen" setting. (Rasmus) + . Second optional parameter to stream_context_create() to +set params during context creation. (Sara) + . sys_get_temp_dir() function that returns the default directory +for temporary files (as requested in bug #35380). (Hartmut) - Fixed bug #36630 (umask not reset at the end of the request). (Ilia) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Sat Sep 9 21:24:27 2006 UTC Modified files: /php-srcNEWS Log: Add "moved to pecl" section (only ncurses at this time) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2122&r2=1.2123&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2122 php-src/NEWS:1.2123 --- php-src/NEWS:1.2122 Tue Jul 18 14:59:35 2006 +++ php-src/NEWSSat Sep 9 21:24:27 2006 @@ -25,6 +25,9 @@ - Removed Freetype 1.x and GD 1.x from GD extension. (Pierre) - Removed global reflection constants. (Johannes) +- Moved extensions to PECL: + . ext/ncurses (Hartmut) + - Improved and cleaned CGI code. FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Improved cURL: (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
tony2001Tue Jul 18 14:59:35 2006 UTC Modified files: /php-srcNEWS Log: patch merged into 5_2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2121&r2=1.2122&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2121 php-src/NEWS:1.2122 --- php-src/NEWS:1.2121 Sun Jul 9 17:58:39 2006 +++ php-src/NEWSTue Jul 18 14:59:35 2006 @@ -33,7 +33,6 @@ - Added automatic module globals management. (Dmitry) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) -- Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) - Added "allow_url_include" ini option to be able to turn off remote url code execution separately from the "allow_url_fopen" setting. (Rasmus) - Added --rclass and --rextension CLI parameters to reflect internal classes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Sun Jul 9 17:58:39 2006 UTC Modified files: /php-srcNEWS Log: - Entry doesn't belong here, fixed in 5.2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2120&r2=1.2121&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2120 php-src/NEWS:1.2121 --- php-src/NEWS:1.2120 Sun Jun 25 23:21:24 2006 +++ php-src/NEWSSun Jul 9 17:58:39 2006 @@ -6,8 +6,6 @@ - Changed dl() to be disabled by default. Enabled only when explicitly registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) - Changed return "new" by reference to throw an E_STRICT error. (Dmitry) -- Changed __toString() behavior to call it in all necessary places - (Marcus, Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bjori Sun Jun 25 23:21:24 2006 UTC Modified files: /php-srcNEWS Log: curl_setopt_array() was added in 5.1.3 http_build_query() & parse_url in 5.2 # patch by helgi http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2119&r2=1.2120&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2119 php-src/NEWS:1.2120 --- php-src/NEWS:1.2119 Tue Jun 13 13:11:42 2006 +++ php-src/NEWSSun Jun 25 23:21:24 2006 @@ -30,7 +30,6 @@ - Improved and cleaned CGI code. FastCGI is now always enabled and can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Improved cURL: (Ilia) - . Added curl_setopt_array() which allows setting of multiple cURL options. . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. - Added automatic module globals management. (Dmitry) @@ -41,10 +40,6 @@ code execution separately from the "allow_url_fopen" setting. (Rasmus) - Added --rclass and --rextension CLI parameters to reflect internal classes and loaded extensions. (Johannes) -- Added optional parameter to http_build_query() to allow specification of - string separator. (Ilia) -- Added an optional parameter to parse_url() to allow retrieval of distinct URL - components. (Ilia) - Added an optional parameter to strstr() and stristr() for retrieval of either the part of haystack before or after first occurence of needle. (Johannes) - Added possibility to check in which extension an internal function was -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
tony2001Tue Jun 6 20:08:58 2006 UTC Modified files: /php-srcNEWS Log: this function also exists in 5.2, no need for this news entry in HEAD http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2117&r2=1.2118&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2117 php-src/NEWS:1.2118 --- php-src/NEWS:1.2117 Tue May 23 22:24:10 2006 +++ php-src/NEWSTue Jun 6 20:08:58 2006 @@ -33,7 +33,6 @@ . Added curl_setopt_array() which allows setting of multiple cURL options. . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. -- Add implementation of curl_multi_info_read (Brian) - Added "jump label" operator (limited "goto"). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) - Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Tue May 23 22:24:10 2006 UTC Modified files: /php-srcNEWS Log: - Done in 5.2 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2116&r2=1.2117&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2116 php-src/NEWS:1.2117 --- php-src/NEWS:1.2116 Fri May 19 10:44:34 2006 +++ php-src/NEWSTue May 23 22:24:10 2006 @@ -15,7 +15,6 @@ . "register_globals" support. (Pierre) . "register_long_arrays" ini option. (Dmitry) . "safe_mode" support. (Ilia, Andi) - . "zend.ze1_compatibility_mode" ini option. (Dmitry) . "allow_call_time_pass_reference", added E_STRICT error message. (Dmitry) . session_register(), session_unregister() and session_is_registered() (needed only with "register_globals=On"). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
hholzgraFri May 19 10:44:34 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c file.c file.h
Log:
Name change: php_get_tmpdir() renamed to sys_get_temp_dir()
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2115&r2=1.2116&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2115 php-src/NEWS:1.2116
--- php-src/NEWS:1.2115 Sat May 6 09:59:02 2006
+++ php-src/NEWSFri May 19 10:44:34 2006
@@ -52,7 +52,7 @@
defined using reflection API. (Johannes)
- Added second optional parameter to stream_context_create() to set params
during context creation. (Sara)
-- Added php_get_tmpdir() function that returns the default directory for
+- Added sys_get_temp_dir() function that returns the default directory for
temporary files (as requested in bug #35380). (Hartmut)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.772&r2=1.773&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.772
php-src/ext/standard/basic_functions.c:1.773
--- php-src/ext/standard/basic_functions.c:1.772Fri May 19 06:11:02 2006
+++ php-src/ext/standard/basic_functions.c Fri May 19 10:44:34 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.772 2006/05/19 06:11:02 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.773 2006/05/19 10:44:34 hholzgra Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -846,7 +846,7 @@
PHP_FE(output_add_rewrite_var,
NULL)
PHP_FE(output_reset_rewrite_vars,
NULL)
- PHP_FE(php_get_tmpdir, NULL)
+ PHP_FE(sys_get_temp_dir,
NULL)
{NULL, NULL, NULL}
};
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.441&r2=1.442&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.441 php-src/ext/standard/file.c:1.442
--- php-src/ext/standard/file.c:1.441 Sat May 6 09:59:02 2006
+++ php-src/ext/standard/file.c Fri May 19 10:44:34 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.441 2006/05/06 09:59:02 hholzgra Exp $ */
+/* $Id: file.c,v 1.442 2006/05/19 10:44:34 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2555,9 +2555,9 @@
/* }}} */
#endif
-/* {{{ proto string php_get_tmpdir()
+/* {{{ proto string sys_get_temp_dir()
Returns directory path used for temporary files */
-PHP_FUNCTION(php_get_tmpdir)
+PHP_FUNCTION(sys_get_temp_dir)
{
RETURN_STRING((char *)php_get_temporary_directory(), 1);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.h?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.98 php-src/ext/standard/file.h:1.99
--- php-src/ext/standard/file.h:1.98Sat May 6 09:59:02 2006
+++ php-src/ext/standard/file.h Fri May 19 10:44:34 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: file.h,v 1.98 2006/05/06 09:59:02 hholzgra Exp $ */
+/* $Id: file.h,v 1.99 2006/05/19 10:44:34 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -66,7 +66,7 @@
#endif
PHP_NAMED_FUNCTION(php_if_ftruncate);
PHP_NAMED_FUNCTION(php_if_fstat);
-PHP_FUNCTION(php_get_tmpdir);
+PHP_FUNCTION(sys_get_temp_dir);
PHP_MINIT_FUNCTION(user_streams);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
Either of these works for me. At 11:02 AM 5/7/2006, Pierre wrote: On 5/7/06, Antony Dovgal <[EMAIL PROTECTED]> wrote: On 07.05.2006 21:26, Wez Furlong wrote: > sys_tmpdir()? > I vote for sys_ as the prefix, as we've started down that path with > sys_getloadavg(). Yeah, sys_tmpdir() sounds good. For the record, php_get_temporary_directory is the internal name. I would choose sys_get_temporary_directory. Or at least respect the CS a bit more and use sys_get_temp_dir(), as decided a while ago :-) --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
On 5/7/06, Antony Dovgal <[EMAIL PROTECTED]> wrote: On 07.05.2006 21:26, Wez Furlong wrote: > sys_tmpdir()? > I vote for sys_ as the prefix, as we've started down that path with > sys_getloadavg(). Yeah, sys_tmpdir() sounds good. For the record, php_get_temporary_directory is the internal name. I would choose sys_get_temporary_directory. Or at least respect the CS a bit more and use sys_get_temp_dir(), as decided a while ago :-) --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
On 07.05.2006 21:26, Wez Furlong wrote: sys_tmpdir()? I vote for sys_ as the prefix, as we've started down that path with sys_getloadavg(). Yeah, sys_tmpdir() sounds good. On 5/7/06, Pierre <[EMAIL PROTECTED]> wrote: On 5/7/06, Andi Gutmans <[EMAIL PROTECTED]> wrote: > Hartmut, > > This is a very odd name to be using and doesn't follow our naming conventions. > Maybe something like sys_get_tmpdir()? I like to go with system_get_temp_dir(). I know it is a long dir but I hate to ask myself, is it sys or system? tmp or temp? :) But I can live with sys_get_temp_dir() --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
sys_tmpdir()? I vote for sys_ as the prefix, as we've started down that path with sys_getloadavg(). --Wez. On 5/7/06, Pierre <[EMAIL PROTECTED]> wrote: On 5/7/06, Andi Gutmans <[EMAIL PROTECTED]> wrote: > Hartmut, > > This is a very odd name to be using and doesn't follow our naming conventions. > Maybe something like sys_get_tmpdir()? I like to go with system_get_temp_dir(). I know it is a long dir but I hate to ask myself, is it sys or system? tmp or temp? :) But I can live with sys_get_temp_dir() --Pierre -- 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
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
On 5/7/06, Andi Gutmans <[EMAIL PROTECTED]> wrote: Hartmut, This is a very odd name to be using and doesn't follow our naming conventions. Maybe something like sys_get_tmpdir()? I like to go with system_get_temp_dir(). I know it is a long dir but I hate to ask myself, is it sys or system? tmp or temp? :) But I can live with sys_get_temp_dir() --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c file.c file.h
Hartmut,
This is a very odd name to be using and doesn't follow our naming conventions.
Maybe something like sys_get_tmpdir()?
Andi
At 02:59 AM 5/6/2006, Hartmut Holzgraefe wrote:
hholzgraSat May 6 09:59:02 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c file.c file.h
Log:
Added php_get_tmpdir() function that returns the default directory for
temporary files (as requested in bug #35380)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2114&r2=1.2115&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2114 php-src/NEWS:1.2115
--- php-src/NEWS:1.2114 Wed May 3 19:52:48 2006
+++ php-src/NEWSSat May 6 09:59:02 2006
@@ -52,6 +52,8 @@
defined using reflection API. (Johannes)
- Added second optional parameter to stream_context_create() to set params
during context creation. (Sara)
+- Added php_get_tmpdir() function that returns the default directory for
+ temporary files (as requested in bug #35380). (Hartmut)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.769&r2=1.770&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.769
php-src/ext/standard/basic_functions.c:1.770
--- php-src/ext/standard/basic_functions.c:1.769Mon Apr 3
13:46:35 2006
+++ php-src/ext/standard/basic_functions.c Sat May 6 09:59:02 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.769 2006/04/03 13:46:35 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.770 2006/05/06 09:59:02 hholzgra Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -846,6 +846,8 @@
PHP_FE(output_add_rewrite_var,
NULL)
PHP_FE(output_reset_rewrite_vars,
NULL)
+ PHP_FE(php_get_tmpdir, NULL)
+
{NULL, NULL, NULL}
};
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.440&r2=1.441&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.440 php-src/ext/standard/file.c:1.441
--- php-src/ext/standard/file.c:1.440 Tue May 2 18:23:32 2006
+++ php-src/ext/standard/file.c Sat May 6 09:59:02 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.440 2006/05/02 18:23:32 pollita Exp $ */
+/* $Id: file.c,v 1.441 2006/05/06 09:59:02 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2555,6 +2555,14 @@
/* }}} */
#endif
+/* {{{ proto string php_get_tmpdir()
+ Returns directory path used for temporary files */
+PHP_FUNCTION(php_get_tmpdir)
+{
+ RETURN_STRING((char *)php_get_temporary_directory(), 1);
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.h?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.97 php-src/ext/standard/file.h:1.98
--- php-src/ext/standard/file.h:1.97Fri Jan 13 04:10:32 2006
+++ php-src/ext/standard/file.h Sat May 6 09:59:02 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: file.h,v 1.97 2006/01/13 04:10:32 pajoye Exp $ */
+/* $Id: file.h,v 1.98 2006/05/06 09:59:02 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -66,6 +66,7 @@
#endif
PHP_NAMED_FUNCTION(php_if_ftruncate);
PHP_NAMED_FUNCTION(php_if_fstat);
+PHP_FUNCTION(php_get_tmpdir);
PHP_MINIT_FUNCTION(user_streams);
--
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 / NEWS /ext/standard basic_functions.c file.c file.h
hholzgraSat May 6 09:59:02 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c file.c file.h
Log:
Added php_get_tmpdir() function that returns the default directory for
temporary files (as requested in bug #35380)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2114&r2=1.2115&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2114 php-src/NEWS:1.2115
--- php-src/NEWS:1.2114 Wed May 3 19:52:48 2006
+++ php-src/NEWSSat May 6 09:59:02 2006
@@ -52,6 +52,8 @@
defined using reflection API. (Johannes)
- Added second optional parameter to stream_context_create() to set params
during context creation. (Sara)
+- Added php_get_tmpdir() function that returns the default directory for
+ temporary files (as requested in bug #35380). (Hartmut)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.769&r2=1.770&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.769
php-src/ext/standard/basic_functions.c:1.770
--- php-src/ext/standard/basic_functions.c:1.769Mon Apr 3 13:46:35 2006
+++ php-src/ext/standard/basic_functions.c Sat May 6 09:59:02 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.769 2006/04/03 13:46:35 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.770 2006/05/06 09:59:02 hholzgra Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -846,6 +846,8 @@
PHP_FE(output_add_rewrite_var,
NULL)
PHP_FE(output_reset_rewrite_vars,
NULL)
+ PHP_FE(php_get_tmpdir, NULL)
+
{NULL, NULL, NULL}
};
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.440&r2=1.441&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.440 php-src/ext/standard/file.c:1.441
--- php-src/ext/standard/file.c:1.440 Tue May 2 18:23:32 2006
+++ php-src/ext/standard/file.c Sat May 6 09:59:02 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.440 2006/05/02 18:23:32 pollita Exp $ */
+/* $Id: file.c,v 1.441 2006/05/06 09:59:02 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2555,6 +2555,14 @@
/* }}} */
#endif
+/* {{{ proto string php_get_tmpdir()
+ Returns directory path used for temporary files */
+PHP_FUNCTION(php_get_tmpdir)
+{
+ RETURN_STRING((char *)php_get_temporary_directory(), 1);
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.h?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/standard/file.h
diff -u php-src/ext/standard/file.h:1.97 php-src/ext/standard/file.h:1.98
--- php-src/ext/standard/file.h:1.97Fri Jan 13 04:10:32 2006
+++ php-src/ext/standard/file.h Sat May 6 09:59:02 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: file.h,v 1.97 2006/01/13 04:10:32 pajoye Exp $ */
+/* $Id: file.h,v 1.98 2006/05/06 09:59:02 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -66,6 +66,7 @@
#endif
PHP_NAMED_FUNCTION(php_if_ftruncate);
PHP_NAMED_FUNCTION(php_if_fstat);
+PHP_FUNCTION(php_get_tmpdir);
PHP_MINIT_FUNCTION(user_streams);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/curl multi.c
bfrance Wed May 3 19:52:48 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/curl multi.c
Log:
- Add implementation of curl_multi_info_read (Brian)
Not adding to PHP 5_1, but should go into 5_2.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2113&r2=1.2114&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2113 php-src/NEWS:1.2114
--- php-src/NEWS:1.2113 Mon Apr 10 10:16:42 2006
+++ php-src/NEWSWed May 3 19:52:48 2006
@@ -34,6 +34,7 @@
. Added curl_setopt_array() which allows setting of multiple cURL options.
. Added CURLINFO_HEADER_OUT constant to facilitate request retrieval.
+- Add implementation of curl_multi_info_read (Brian)
- Added "jump label" operator (limited "goto"). (Dmitry, Sara)
- Added E_STRICT to E_ALL. (Dmitry)
- Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot
com)
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/multi.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.22 php-src/ext/curl/multi.c:1.23
--- php-src/ext/curl/multi.c:1.22 Thu Apr 13 11:26:43 2006
+++ php-src/ext/curl/multi.cWed May 3 19:52:48 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: multi.c,v 1.22 2006/04/13 11:26:43 tony2001 Exp $ */
+/* $Id: multi.c,v 1.23 2006/05/03 19:52:48 bfrance Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -84,17 +84,29 @@
ZEND_FETCH_RESOURCE(mh, php_curlm *, &z_mh, -1,
le_curl_multi_handle_name, le_curl_multi_handle);
ZEND_FETCH_RESOURCE(ch, php_curl *, &z_ch, -1, le_curl_name, le_curl);
- zval_add_ref(&z_ch);
-
_php_curl_cleanup_handle(ch);
ch->uses++;
+ /* we want to create a copy of this zval that we store in the
multihandle
+ structure element "easyh" - so we separate it from the original
+ input zval to this function using SEPARATE_ZVAL */
+ SEPARATE_ZVAL( &z_ch );
zend_llist_add_element(&mh->easyh, &z_ch);
RETURN_LONG((long) curl_multi_add_handle(mh->multi, ch->cp));
}
/* }}} */
+
+/* Used internally as comparison routine passed to zend_list_del_element */
+static int curl_compare_resources( zval **z1, zval **z2 )
+{
+ return (Z_TYPE_PP( z1 ) == Z_TYPE_PP( z2 ) &&
+Z_TYPE_PP( z1 ) == IS_RESOURCE &&
+Z_LVAL_PP( z1 ) == Z_LVAL_PP( z2 ) );
+}
+
+
/* {{{ proto int curl_multi_remove_handle(resource mh, resource ch)
Remove a multi handle from a set of cURL handles */
PHP_FUNCTION(curl_multi_remove_handle)
@@ -112,6 +124,9 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, &z_ch, -1, le_curl_name, le_curl);
--ch->uses;
+
+ zend_llist_del_element( &mh->easyh, &z_ch,
+ (int (*)(void *, void
*)) curl_compare_resources );
RETURN_LONG((long) curl_multi_remove_handle(mh->multi, ch->cp));
}
@@ -206,13 +221,11 @@
{
zval *z_mh;
php_curlm *mh;
- CURLMsg *tmp_msg;
+ CURLMsg *tmp_msg;
intqueued_msgs;
+ zval *zmsgs_in_queue = NULL;
- /* XXX: Not Implemented */
- return;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_mh) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|z", &z_mh,
&zmsgs_in_queue) == FAILURE) {
return;
}
@@ -222,12 +235,46 @@
if (tmp_msg == NULL) {
RETURN_FALSE;
}
+ if (zmsgs_in_queue) {
+ zval_dtor(zmsgs_in_queue);
+ ZVAL_LONG(zmsgs_in_queue, queued_msgs);
+ }
array_init(return_value);
add_assoc_long(return_value, "msg", tmp_msg->msg);
add_assoc_long(return_value, "result", tmp_msg->data.result);
- /* add_assoc_resource(return_value, "handle",
zend_list_id_by_pointer(tmp_msg->easy_handle, le_curl TSRMLS_CC)); */
- add_assoc_string(return_value, "whatever", (char *)
tmp_msg->data.whatever, 1);
+
+ /* find the original easy curl handle */
+ {
+ zend_llist_position pos;
+ php_curl *ch;
+ zval**pz_ch;
+
+ /* search the list of easy handles hanging off the multi-handle
*/
+ for(pz_ch = (zval **)zend_llist_get_first_ex(&mh->easyh, &pos);
pz_ch;
+ pz_ch = (zval **)zend_llist_get_next_ex(&mh->easyh,
&pos)) {
+ ZEND_FETCH_RESOURCE(ch, php_curl *, pz_ch, -1,
le_curl_name, le_curl);
+ if (ch->cp == tmp_msg->easy_handle) {
+
+ /* we are adding a reference to the underlying
php_curl
+ resource, so we need to add one to the
resource's refcount
+ in order to ensure it doesn't get destroyed
when the
+
[PHP-CVS] cvs: php-src / NEWS
sniper Mon Apr 10 10:16:42 2006 UTC Modified files: /php-srcNEWS Log: - Fix NEWS. The empty lines were left on purpose.. http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2112&r2=1.2113&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2112 php-src/NEWS:1.2113 --- php-src/NEWS:1.2112 Mon Apr 3 17:46:12 2006 +++ php-src/NEWSMon Apr 10 10:16:42 2006 @@ -1,39 +1,44 @@ PHPNEWS ||| -?? ??? , PHP 6.0 +?? ??? 20??, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) -- Disabled dl(). Now it is enabled only when a SAPI layer registers it - explicitly. Only CLI, CGI and EMBED do this. (Dmitry). -- Return "new" by reference now throws an E_STRICT error. (Dmitry) -- Added E_STRICT to E_ALL. (Dmitry) -- Dropped safe_mode support (Ilia, Andi) -- Dropped zend.ze1_compatibility_mode (Dmitry) -- Dropped allow_call_time_pass_reference, added E_STRICT error message. (Dmitry) -- Dropped register_long_arrays (Dmitry) -- Dropped register_globals support (Pierre) - - session_register, session_unregister and session_is_registered removed they -depend on register_globals -- Dropped magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini - settings (Pierre) - - get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return - false, set_magic_quotes_runtime raises an E_CORE_ERROR -- Freetype 1.x and GD 1.x support removed (Pierre) -- Cleaned CGI code. Now FastCGI can not be disabled. See sapi/cgi/CHANGES - for more details. (Dmitry) -- Removed support for "continue" and "break" operators with non-constant - operands. (Dmitry) -- Implemented "jump label" operator (limited "goto"). (Dmitry, Sara) + +- Changed dl() to be disabled by default. Enabled only when explicitly + registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry) +- Changed return "new" by reference to throw an E_STRICT error. (Dmitry) - Changed __toString() behavior to call it in all necessary places (Marcus, Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) + +- Removed old legacy: + . "register_globals" support. (Pierre) + . "register_long_arrays" ini option. (Dmitry) + . "safe_mode" support. (Ilia, Andi) + . "zend.ze1_compatibility_mode" ini option. (Dmitry) + . "allow_call_time_pass_reference", added E_STRICT error message. (Dmitry) + . session_register(), session_unregister() and session_is_registered() +(needed only with "register_globals=On"). + . "magic_quotes_gpc", "magic_quotes_runtime" and "magic_quotes_sybase" ini +options. (Pierre) + . Changed get_magic_quotes_gpc(), get_magic_quotes_runtime to always return +false and set_magic_quotes_runtime() to raise an E_CORE_ERROR. +- Removed support for "continue" and "break" operators with non-constant + operands. (Dmitry) +- Removed Freetype 1.x and GD 1.x from GD extension. (Pierre) - Removed global reflection constants. (Johannes) + +- Improved and cleaned CGI code. FastCGI is now always enabled and can not be + disabled. See sapi/cgi/CHANGES for more details. (Dmitry) +- Improved cURL: (Ilia) + . Added curl_setopt_array() which allows setting of multiple cURL options. + . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. + +- Added "jump label" operator (limited "goto"). (Dmitry, Sara) +- Added E_STRICT to E_ALL. (Dmitry) - Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) -- Added "allow_url_include" ini directive to be able to turn off remote url +- Added "allow_url_include" ini option to be able to turn off remote url code execution separately from the "allow_url_fopen" setting. (Rasmus) -- Added to cURL extension: (Ilia) - . curl_setopt_array() which allows setting of multiple cURL options. - . CURLINFO_HEADER_OUT constant to facilitate request retrieval. - Added --rclass and --rextension CLI parameters to reflect internal classes and loaded extensions. (Johannes) - Added optional parameter to http_build_query() to allow specification of @@ -46,5 +51,6 @@ defined using reflection API. (Johannes) - Added second optional parameter to stream_context_create() to set params during context creation. (Sara) + - Fixed bug #36630 (umask not reset at the end of the request). (Ilia) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/gmp gmp.c php_gmp.h
tony2001Mon Apr 3 17:46:12 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/gmpgmp.c php_gmp.h
Log:
add gmp_nextprime() function
patch by ants dot aasma at gmail dot com
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2111&r2=1.2112&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2111 php-src/NEWS:1.2112
--- php-src/NEWS:1.2111 Mon Mar 27 07:35:05 2006
+++ php-src/NEWSMon Apr 3 17:46:12 2006
@@ -28,6 +28,7 @@
- Changed "instanceof" and "catch" operators, is_a() and is_subclass_of()
functions to not call __autoload(). (Dmitry)
- Removed global reflection constants. (Johannes)
+- Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot
com)
- Added "allow_url_include" ini directive to be able to turn off remote url
code execution separately from the "allow_url_fopen" setting. (Rasmus)
- Added to cURL extension: (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/gmp/gmp.c?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.51 php-src/ext/gmp/gmp.c:1.52
--- php-src/ext/gmp/gmp.c:1.51 Sun Jan 1 13:09:50 2006
+++ php-src/ext/gmp/gmp.c Mon Apr 3 17:46:12 2006
@@ -79,6 +79,7 @@
ZEND_FE(gmp_scan1, NULL)
ZEND_FE(gmp_popcount, NULL)
ZEND_FE(gmp_hamdist, NULL)
+ ZEND_FE(gmp_nextprime, NULL)
{NULL, NULL, NULL} /* Must be the last line in gmp_functions[] */
};
/* }}} */
@@ -1199,6 +1200,14 @@
}
/* }}} */
+/* {{{ proto resource gmp_nextprime(resource a)
+ Finds next prime of a */
+ZEND_FUNCTION(gmp_nextprime)
+{
+ gmp_unary_op(mpz_nextprime);
+}
+/* }}} */
+
/* {{{ proto resource gmp_xor(resource a, resource b)
Calculates logical exclusive OR of a and b */
ZEND_FUNCTION(gmp_xor)
http://cvs.php.net/viewcvs.cgi/php-src/ext/gmp/php_gmp.h?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/gmp/php_gmp.h
diff -u php-src/ext/gmp/php_gmp.h:1.13 php-src/ext/gmp/php_gmp.h:1.14
--- php-src/ext/gmp/php_gmp.h:1.13 Sun Jan 1 13:09:50 2006
+++ php-src/ext/gmp/php_gmp.h Mon Apr 3 17:46:12 2006
@@ -75,6 +75,7 @@
ZEND_FUNCTION(gmp_scan1);
ZEND_FUNCTION(gmp_popcount);
ZEND_FUNCTION(gmp_hamdist);
+ZEND_FUNCTION(gmp_nextprime);
ZEND_BEGIN_MODULE_GLOBALS(gmp)
zend_bool rand_initialized;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard streamsfuncs.c
Aren't you going to merge this to the 5.1 branch? This change seems pretty
useful to me.
I have nothing against merging to 5.1, but that's up to the RM as it's new
functionality.
-Sara
- Original Message -
pollita Sun Mar 26 04:40:11 2006 UTC
Modified files:
/php-src NEWS
/php-src/ext/standard streamsfuncs.c
Log:
Expand stream_context_create() to allow specifying params
as well as options. Ignore the internal name change of the first arg.
The first arg is still for options, the second arg is for actual params.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2109&r2=1.2110&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2109 php-src/NEWS:1.2110
--- php-src/NEWS:1.2109 Fri Mar 24 10:11:49 2006
+++ php-src/NEWS Sun Mar 26 04:40:11 2006
@@ -43,6 +43,8 @@
the part of haystack before or after first occurence of needle.
(Johannes)
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
+- Added second optional parameter to stream_context_create() to set
params
+ during context creation. (Sara)
- Fixed bug #36840 (Memory leak if cast operator throws an exception that
is
caught). (Dmitry)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.71
php-src/ext/standard/streamsfuncs.c:1.72
--- php-src/ext/standard/streamsfuncs.c:1.71 Fri Mar 24 22:27:13 2006
+++ php-src/ext/standard/streamsfuncs.c Sun Mar 26 04:40:11 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.71 2006/03/24 22:27:13 pollita Exp $ */
+/* $Id: streamsfuncs.c,v 1.72 2006/03/26 04:40:11 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1103,21 +1103,25 @@
}
/* }}} */
-/* {{{ proto resource stream_context_create([array options])
+/* {{{ proto resource stream_context_create([array options[, array
params]])
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
{
- zval *params = NULL;
+ zval *options = NULL, *params = NULL;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a", ¶ms) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!a!", &options,
¶ms) == FAILURE) {
RETURN_FALSE;
}
context = php_stream_context_alloc();
+ if (options) {
+ parse_context_options(context, options TSRMLS_CC);
+ }
+
if (params) {
- parse_context_options(context, params TSRMLS_CC);
+ parse_context_params(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
--
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
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard streamsfuncs.c
Aren't you going to merge this to the 5.1 branch? This change seems pretty
useful to me.
Nuno
- Original Message -
pollita Sun Mar 26 04:40:11 2006 UTC
Modified files:
/php-src NEWS
/php-src/ext/standard streamsfuncs.c
Log:
Expand stream_context_create() to allow specifying params
as well as options. Ignore the internal name change of the first arg.
The first arg is still for options, the second arg is for actual params.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2109&r2=1.2110&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2109 php-src/NEWS:1.2110
--- php-src/NEWS:1.2109 Fri Mar 24 10:11:49 2006
+++ php-src/NEWS Sun Mar 26 04:40:11 2006
@@ -43,6 +43,8 @@
the part of haystack before or after first occurence of needle.
(Johannes)
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
+- Added second optional parameter to stream_context_create() to set
params
+ during context creation. (Sara)
- Fixed bug #36840 (Memory leak if cast operator throws an exception that
is
caught). (Dmitry)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.71
php-src/ext/standard/streamsfuncs.c:1.72
--- php-src/ext/standard/streamsfuncs.c:1.71 Fri Mar 24 22:27:13 2006
+++ php-src/ext/standard/streamsfuncs.c Sun Mar 26 04:40:11 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.71 2006/03/24 22:27:13 pollita Exp $ */
+/* $Id: streamsfuncs.c,v 1.72 2006/03/26 04:40:11 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1103,21 +1103,25 @@
}
/* }}} */
-/* {{{ proto resource stream_context_create([array options])
+/* {{{ proto resource stream_context_create([array options[, array
params]])
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
{
- zval *params = NULL;
+ zval *options = NULL, *params = NULL;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a", ¶ms) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!a!", &options,
¶ms) == FAILURE) {
RETURN_FALSE;
}
context = php_stream_context_alloc();
+ if (options) {
+ parse_context_options(context, options TSRMLS_CC);
+ }
+
if (params) {
- parse_context_options(context, params TSRMLS_CC);
+ parse_context_params(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
--
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 / NEWS /ext/standard streamsfuncs.c
pollita Sun Mar 26 04:40:11 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard streamsfuncs.c
Log:
Expand stream_context_create() to allow specifying params
as well as options. Ignore the internal name change of the first arg.
The first arg is still for options, the second arg is for actual params.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2109&r2=1.2110&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2109 php-src/NEWS:1.2110
--- php-src/NEWS:1.2109 Fri Mar 24 10:11:49 2006
+++ php-src/NEWSSun Mar 26 04:40:11 2006
@@ -43,6 +43,8 @@
the part of haystack before or after first occurence of needle. (Johannes)
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
+- Added second optional parameter to stream_context_create() to set params
+ during context creation. (Sara)
- Fixed bug #36840 (Memory leak if cast operator throws an exception that is
caught). (Dmitry)
- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.71
php-src/ext/standard/streamsfuncs.c:1.72
--- php-src/ext/standard/streamsfuncs.c:1.71Fri Mar 24 22:27:13 2006
+++ php-src/ext/standard/streamsfuncs.c Sun Mar 26 04:40:11 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.71 2006/03/24 22:27:13 pollita Exp $ */
+/* $Id: streamsfuncs.c,v 1.72 2006/03/26 04:40:11 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1103,21 +1103,25 @@
}
/* }}} */
-/* {{{ proto resource stream_context_create([array options])
+/* {{{ proto resource stream_context_create([array options[, array params]])
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
{
- zval *params = NULL;
+ zval *options = NULL, *params = NULL;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a", ¶ms) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!a!", &options,
¶ms) == FAILURE) {
RETURN_FALSE;
}
context = php_stream_context_alloc();
+ if (options) {
+ parse_context_options(context, options TSRMLS_CC);
+ }
+
if (params) {
- parse_context_options(context, params TSRMLS_CC);
+ parse_context_params(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
pajoye Sun Mar 19 11:26:25 2006 UTC Modified files: /php-srcNEWS Log: - typos http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2107&r2=1.2108&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2107 php-src/NEWS:1.2108 --- php-src/NEWS:1.2107 Thu Mar 16 16:53:09 2006 +++ php-src/NEWSSun Mar 19 11:26:25 2006 @@ -10,10 +10,10 @@ - Dropped zend.ze1_compatibility_mode (Dmitry) - Dropped allow_call_time_pass_reference, added E_STRICT error message. (Dmitry) - Dropped register_long_arrays (Dmitry) -- Droped register_globals support (Pierre) +- Dropped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they depend on register_globals -- Droped magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini +- Dropped magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini settings (Pierre) - get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return false, set_magic_quotes_runtime raises an E_CORE_ERROR -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c dl.c dl.h /main main.c php_globals.h php_main.h /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/embed php_embed.c
dmitry Thu Mar 16 16:53:10 2006 UTC
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c dl.c dl.h
/php-src/main main.c php_globals.h php_main.h
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
/php-src/sapi/embed php_embed.c
Log:
Disabled dl(). Now it is enabled only when a SAPI layer registers it
explicitly. Only CLI, CGI and EMBED do this.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2106&r2=1.2107&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2106 php-src/NEWS:1.2107
--- php-src/NEWS:1.2106 Thu Mar 16 15:35:26 2006
+++ php-src/NEWSThu Mar 16 16:53:09 2006
@@ -2,6 +2,8 @@
|||
?? ??? , PHP 6.0
- Unicode support. (Andrei, Dmitry, et al)
+- Disabled dl(). Now it is enabled only when a SAPI layer registers it
+ explicitly. Only CLI, CGI and EMBED do this. (Dmitry).
- Return "new" by reference now throws an E_STRICT error. (Dmitry)
- Added E_STRICT to E_ALL. (Dmitry)
- Dropped safe_mode support (Ilia, Andi)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.761&r2=1.762&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.761
php-src/ext/standard/basic_functions.c:1.762
--- php-src/ext/standard/basic_functions.c:1.761Wed Mar 8 14:41:45 2006
+++ php-src/ext/standard/basic_functions.c Thu Mar 16 16:53:09 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.761 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.762 2006/03/16 16:53:09 dmitry Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -548,9 +548,6 @@
PHP_FALIAS(join,implode,
NULL)
PHP_FE(sql_regcase,
NULL)
- /* functions from dl.c */
- PHP_FE(dl,
NULL)
-
/* functions from file.c */
PHP_FE(pclose,
NULL)
PHP_FE(popen,
NULL)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/dl.c?r1=1.108&r2=1.109&diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.108 php-src/ext/standard/dl.c:1.109
--- php-src/ext/standard/dl.c:1.108 Sun Feb 19 18:19:33 2006
+++ php-src/ext/standard/dl.c Thu Mar 16 16:53:09 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.108 2006/02/19 18:19:33 iliaa Exp $ */
+/* $Id: dl.c,v 1.109 2006/03/16 16:53:09 dmitry Exp $ */
#include "php.h"
#include "dl.h"
@@ -65,22 +65,6 @@
convert_to_string_ex(file);
- if (!PG(enable_dl)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded
extensions aren't enabled");
- RETURN_FALSE;
- }
-
- if ((strncmp(sapi_module.name, "cgi", 3)!=0) &&
- (strcmp(sapi_module.name, "cli")!=0) &&
- (strncmp(sapi_module.name, "embed", 5)!=0)) {
-#ifdef ZTS
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in
multithreaded Web servers - use extension=%s in your php.ini",
Z_STRVAL_PP(file));
- RETURN_FALSE;
-#else
- php_error_docref(NULL TSRMLS_CC, E_STRICT, "dl() is deprecated
- use extension=%s in your php.ini", Z_STRVAL_PP(file));
-#endif
- }
-
php_dl(*file, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC);
EG(full_tables_cleanup) = 1;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/dl.h?r1=1.24&r2=1.25&diff_format=u
Index: php-src/ext/standard/dl.h
diff -u php-src/ext/standard/dl.h:1.24 php-src/ext/standard/dl.h:1.25
--- php-src/ext/standard/dl.h:1.24 Sun Jan 1 13:09:55 2006
+++ php-src/ext/standard/dl.h Thu Mar 16 16:53:09 2006
@@ -18,15 +18,15 @@
+--+
*/
-/* $Id: dl.h,v 1.24 2006/01/01 13:09:55 sniper Exp $ */
+/* $Id: dl.h,v 1.25 2006/03/16 16:53:09 dmitry Exp $ */
#ifndef DL_H
#define DL_H
-PHPAPI void php_dl(zval *file,int type, zval *return_value, int start_now
TSRMLS_DC);
+void php_dl(zval *file,int type, zval *return_value, int start_now TSRMLS_DC);
/* dynamic loading functions */
-PHP_FUNCTION(dl);
+PHPAPI PHP_FUNCTION(dl);
PHP_MINFO_FUNCTION(dl);
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.677&r
[PHP-CVS] cvs: php-src / NEWS
tony2001Thu Mar 16 11:35:30 2006 UTC Modified files: /php-srcNEWS Log: rephrase http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2103&r2=1.2104&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2103 php-src/NEWS:1.2104 --- php-src/NEWS:1.2103 Thu Mar 16 11:32:00 2006 +++ php-src/NEWSThu Mar 16 11:35:30 2006 @@ -4,7 +4,7 @@ - Unicode support. (Andrei, Dmitry, et al) - Dropped safe_mode support (Ilia, Andi) - Dropped zend.ze1_compatibility_mode (Dmitry) -- Dropped allow_call_time_pass_reference, the error is maden E_STRICT. (Dmitry) +- Dropped allow_call_time_pass_reference, added E_STRICT error message. (Dmitry) - Dropped register_long_arrays (Dmitry) - Droped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard/tests/array bug33940.phpt /main main.c php_globals.h ZendEngine2 zend.c zend_compile.c zend_globals.h
dmitry Thu Mar 16 11:32:00 2006 UTC
Modified files:
/php-srcNEWS
/ZendEngine2zend.c zend_compile.c zend_globals.h
/php-src/ext/standard/tests/array bug33940.phpt
/php-src/main main.c php_globals.h
Log:
Dropped allow_call_time_pass_reference, the error is maden E_STRICT.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2102&r2=1.2103&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2102 php-src/NEWS:1.2103
--- php-src/NEWS:1.2102 Thu Mar 16 10:33:22 2006
+++ php-src/NEWSThu Mar 16 11:32:00 2006
@@ -4,6 +4,7 @@
- Unicode support. (Andrei, Dmitry, et al)
- Dropped safe_mode support (Ilia, Andi)
- Dropped zend.ze1_compatibility_mode (Dmitry)
+- Dropped allow_call_time_pass_reference, the error is maden E_STRICT. (Dmitry)
- Dropped register_long_arrays (Dmitry)
- Droped register_globals support (Pierre)
- session_register, session_unregister and session_is_registered removed they
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.342&r2=1.343&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.342 ZendEngine2/zend.c:1.343
--- ZendEngine2/zend.c:1.342Thu Mar 16 10:33:23 2006
+++ ZendEngine2/zend.c Thu Mar 16 11:32:00 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.342 2006/03/16 10:33:23 dmitry Exp $ */
+/* $Id: zend.c,v 1.343 2006/03/16 11:32:00 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -673,7 +673,6 @@
/* default compile-time values */
CG(asp_tags) = 0;
CG(short_tags) = 1;
- CG(allow_call_time_pass_reference) = 1;
CG(extended_info) = 0;
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.695&r2=1.696&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.695 ZendEngine2/zend_compile.c:1.696
--- ZendEngine2/zend_compile.c:1.695Wed Mar 15 09:04:48 2006
+++ ZendEngine2/zend_compile.c Thu Mar 16 11:32:00 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.c,v 1.695 2006/03/15 09:04:48 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.696 2006/03/16 11:32:00 dmitry Exp $ */
#include
#include "zend.h"
@@ -1642,19 +1642,22 @@
zend_stack_top(&CG(function_call_stack), (void **) &function_ptr_ptr);
function_ptr = *function_ptr_ptr;
- if (original_op==ZEND_SEND_REF
- && !CG(allow_call_time_pass_reference)) {
- zend_error(E_COMPILE_WARNING,
- "Call-time pass-by-reference has been
deprecated - argument passed by value; "
- "If you would like to pass it by
reference, modify the declaration of %R(). "
- "If you would like to enable call-time
pass-by-reference, you can set "
- "allow_call_time_pass_reference to true
in your INI file. "
- "However, future versions may not
support this any longer. ",
- (function_ptr &&
UG(unicode))?IS_UNICODE:IS_STRING,
-
(function_ptr?function_ptr->common.function_name.s:"[runtime function name]"));
- }
-
- if (function_ptr) {
+ if (original_op==ZEND_SEND_REF) {
+ if (function_ptr &&
+ function_ptr->common.function_name.v &&
+ function_ptr->common.type == ZEND_USER_FUNCTION &&
+ !ARG_SHOULD_BE_SENT_BY_REF(function_ptr, (zend_uint)
offset)) {
+ zend_error(E_STRICT,
+ "Call-time pass-by-reference has been
deprecated; "
+ "if you would like to pass argument by
reference, modify the declaration of %R().",
+ UG(unicode)?IS_UNICODE:IS_STRING,
+ function_ptr->common.function_name.v);
+ } else{
+ zend_error(E_STRICT,
+ "Call-time pass-by-reference has been
deprecated");
+ }
+ send_by_reference = 1;
+ } else if (function_ptr) {
if (ARG_MAY_BE_SENT_BY_REF(function_ptr, (zend_uint) offset)) {
op = (param->op_type &
(IS_VAR|IS_CV))?ZEND_SEND_REF:ZEND_SEND_VAL;
send_by_reference = 0;
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_globals.h?r1=1.150&r2=1.151&diff_format=u
Index: ZendEngine2/zend_globals.h
diff -u ZendEngine2/zend_globals.h:1.150 ZendEngine2/zend_globals.h:1.151
--- ZendEngine2/zend_globals.h:1.150Thu Mar 16 10:33:23 2006
+++ ZendEngine2/zend_globals.h Thu Mar 16 11:32:00 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: z
[PHP-CVS] cvs: php-src / NEWS /ext/dom php_dom.c /ext/simplexml simplexml.c /main main.c /tests/lang bug22367.phpt ZendEngine2 zend.c zend_API.c zend_execute.c zend_execute.h zend_execute_API.c z
dmitry Thu Mar 16 10:33:23 2006 UTC
Removed files:
/ZendEngine2/tests bug30332.phpt bug31828.phpt bug32080.phpt
bug32852.phpt bug33243.phpt bug34712.phpt
bug34767.phpt
/php-src/tests/lang bug22367.phpt
Modified files:
/php-srcNEWS
/ZendEngine2zend.c zend_API.c zend_execute.c zend_execute.h
zend_execute_API.c zend_globals.h zend_objects.c
zend_operators.c zend_vm_def.h zend_vm_execute.h
/php-src/ext/domphp_dom.c
/php-src/ext/simplexml simplexml.c
/php-src/main main.c
Log:
Dropped zend.ze1_compatibility_mode
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2101&r2=1.2102&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2101 php-src/NEWS:1.2102
--- php-src/NEWS:1.2101 Thu Mar 16 09:44:41 2006
+++ php-src/NEWSThu Mar 16 10:33:22 2006
@@ -3,6 +3,7 @@
?? ??? , PHP 6.0
- Unicode support. (Andrei, Dmitry, et al)
- Dropped safe_mode support (Ilia, Andi)
+- Dropped zend.ze1_compatibility_mode (Dmitry)
- Dropped register_long_arrays (Dmitry)
- Droped register_globals support (Pierre)
- session_register, session_unregister and session_is_registered removed they
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.341&r2=1.342&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.341 ZendEngine2/zend.c:1.342
--- ZendEngine2/zend.c:1.341Thu Mar 2 00:40:19 2006
+++ ZendEngine2/zend.c Thu Mar 16 10:33:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.341 2006/03/02 00:40:19 helly Exp $ */
+/* $Id: zend.c,v 1.342 2006/03/16 10:33:23 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -210,7 +210,6 @@
ZEND_INI_BEGIN()
ZEND_INI_ENTRY("error_reporting", NULL,
ZEND_INI_ALL, OnUpdateErrorReporting)
- STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0",
ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode,
zend_executor_globals, executor_globals)
/* Unicode .ini entries */
STD_ZEND_INI_BOOLEAN("unicode_semantics", "0", ZEND_INI_SYSTEM,
OnUpdateBool, unicode, zend_unicode_globals, unicode_globals)
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_API.c?r1=1.353&r2=1.354&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.353 ZendEngine2/zend_API.c:1.354
--- ZendEngine2/zend_API.c:1.353Sun Mar 5 16:09:45 2006
+++ ZendEngine2/zend_API.c Thu Mar 16 10:33:23 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.353 2006/03/05 16:09:45 helly Exp $ */
+/* $Id: zend_API.c,v 1.354 2006/03/16 10:33:23 dmitry Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -154,25 +154,6 @@
while (param_count-->0) {
zval **value = (zval**)(p-arg_count);
- if (EG(ze1_compatibility_mode) && Z_TYPE_PP(value) ==
IS_OBJECT) {
- zval *value_ptr;
- zstr class_name;
- zend_uint class_name_len;
- int dup;
-
- dup = zend_get_object_classname(*value, &class_name,
&class_name_len TSRMLS_CC);
-
- ALLOC_ZVAL(value_ptr);
- *value_ptr = **value;
- INIT_PZVAL(value_ptr);
- zend_error(E_STRICT, "Implicit cloning object of class
'%v' because of 'zend.ze1_compatibility_mode'", class_name.v);
- if(!dup) {
- efree(class_name.v);
- }
- Z_OBJVAL_P(value_ptr) = Z_OBJ_HANDLER_PP(value,
clone_obj)(*value TSRMLS_CC);
- zval_ptr_dtor(value);
- *value = value_ptr;
- }
*(argument_array++) = value;
arg_count--;
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute.c?r1=1.738&r2=1.739&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.738 ZendEngine2/zend_execute.c:1.739
--- ZendEngine2/zend_execute.c:1.738Sun Feb 26 11:57:14 2006
+++ ZendEngine2/zend_execute.c Thu Mar 16 10:33:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute.c,v 1.738 2006/02/26 11:57:14 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.739 2006/03/16 10:33:23 dmitry Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -598,26 +598,7 @@
/* here we are sure we are dealing with an object */
/* separate our value if necessary */
- if (EG(ze1_compatibility_mode) && Z_TYPE_P(value) == IS_OBJECT) {
- zval *orig_value = value;
- zstr class_name;
-
[PHP-CVS] cvs: php-src / NEWS /ext/pcre/tests bug33200.phpt /ext/session session.c /ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt 009.phpt 016.phpt /main main.c php_globals.h php_variables
dmitry Thu Mar 16 09:44:42 2006 UTC
Modified files:
/php-srcNEWS
/ZendEngine2/tests unset_cv05.phpt
/php-src/ext/pcre/tests bug33200.phpt
/php-src/ext/sessionsession.c
/php-src/ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt
009.phpt 016.phpt
/php-src/main main.c php_globals.h php_variables.c
Log:
Dropped register_long_arrays, added E_CORE for all dropped setting
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2100&r2=1.2101&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2100 php-src/NEWS:1.2101
--- php-src/NEWS:1.2100 Fri Mar 10 08:29:22 2006
+++ php-src/NEWSThu Mar 16 09:44:41 2006
@@ -3,6 +3,7 @@
?? ??? , PHP 6.0
- Unicode support. (Andrei, Dmitry, et al)
- Dropped safe_mode support (Ilia, Andi)
+- Dropped register_long_arrays (Dmitry)
- Droped register_globals support (Pierre)
- session_register, session_unregister and session_is_registered removed they
depend on register_globals
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/unset_cv05.phpt?r1=1.4&r2=1.5&diff_format=u
Index: ZendEngine2/tests/unset_cv05.phpt
diff -u ZendEngine2/tests/unset_cv05.phpt:1.4
ZendEngine2/tests/unset_cv05.phpt:1.5
--- ZendEngine2/tests/unset_cv05.phpt:1.4 Fri Jul 8 07:57:47 2005
+++ ZendEngine2/tests/unset_cv05.phpt Thu Mar 16 09:44:41 2006
@@ -1,21 +1,16 @@
--TEST--
unset() CV 5 (indirect unset() of global variable in session_start())
--INI--
-register_long_arrays=1
session.auto_start=0
session.save_handler=files
--SKIPIF--
-
+
--FILE--
--EXPECTF--
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/tests/bug33200.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/bug33200.phpt
diff -u php-src/ext/pcre/tests/bug33200.phpt:1.2
php-src/ext/pcre/tests/bug33200.phpt:1.3
--- php-src/ext/pcre/tests/bug33200.phpt:1.2Wed Mar 8 00:43:28 2006
+++ php-src/ext/pcre/tests/bug33200.phptThu Mar 16 09:44:41 2006
@@ -2,8 +2,6 @@
Bug #33200 (magic_quotes_sybase = On makes 'e' modifier misbehave)
--SKIPIF--
die('skip magic_quotes removed');
---INI--
-magic_quotes_sybase=1
--FILE--
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.431&r2=1.432&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.431 php-src/ext/session/session.c:1.432
--- php-src/ext/session/session.c:1.431 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/session.c Thu Mar 16 09:44:41 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.431 2006/03/07 00:20:53 pajoye Exp $ */
+/* $Id: session.c,v 1.432 2006/03/16 09:44:41 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -466,13 +466,7 @@
array_init(session_vars);
PS(http_session_vars) = session_vars;
- if (PG(register_long_arrays)) {
- ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_SESSION_VARS",
sizeof("HTTP_SESSION_VARS"), PS(http_session_vars), 2, 1);
- ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"),
PS(http_session_vars), 2, 1);
- }
- else {
- ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"),
PS(http_session_vars), 1, 0);
- }
+ ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"),
PS(http_session_vars), 1, 0);
}
static char *php_session_encode(int *newlen TSRMLS_DC)
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/007.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/session/tests/007.phpt
diff -u php-src/ext/session/tests/007.phpt:1.10
php-src/ext/session/tests/007.phpt:1.11
--- php-src/ext/session/tests/007.phpt:1.10 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/tests/007.phpt Thu Mar 16 09:44:41 2006
@@ -3,7 +3,6 @@
--SKIPIF--
--INI--
-register_long_arrays=1
session.use_cookies=0
session.cache_limiter=
session.bug_compat_42=1
@@ -19,26 +18,26 @@
session_start();
session_destroy();
-### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value
+### Phase 2 $_SESSION["c"] does not contain any value
session_id("abtest");
$_SESSION['c'] = $c;
unset($c);
$c = 3.14;
session_write_close();
-unset($HTTP_SESSION_VARS);
+unset($_SESSION);
unset($c);
-### Phase 3 $HTTP_SESSION_VARS["c"] is set
+### Phase 3 $_SESSION["c"] is set
session_start();
$c = $_SESSION['c'];
var_dump($c);
-var_dump($HTTP_SESSION_VARS);
+var_dump($_SESSION);
unset($c);
$c = 2.78;
session_write_close();
-unset($HTTP_SESSION_VARS);
+unset($_SESSION);
unset($c);
### Phase 4 final
@@ -46,7 +45,7 @@
session_start();
$c = $_SESSION['c'];
var_dump($c);
-var_dump($HTTP_SESSION_VARS);
+var_dump($_SESSION);
session_destroy();
?>
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/008-php4.2.3.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/session/tests/008-php4.2.3.phpt
diff -u php-src/ext/session/tests/008
[PHP-CVS] cvs: php-src / NEWS
iliaa Wed Mar 8 14:42:10 2006 UTC Modified files: /php-srcNEWS Log: safe_mode news http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2098&r2=1.2099&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2098 php-src/NEWS:1.2099 --- php-src/NEWS:1.2098 Wed Mar 8 00:43:27 2006 +++ php-src/NEWSWed Mar 8 14:42:10 2006 @@ -2,6 +2,7 @@ ||| ?? ??? , PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) +- Dropped safe_mode support (Ilia, Andi) - Droped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they depend on register_globals -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
pajoye Tue Mar 7 00:55:23 2006 UTC Modified files: /php-srcNEWS Log: - gd1 and ft1 entry http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2095&r2=1.2096&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2095 php-src/NEWS:1.2096 --- php-src/NEWS:1.2095 Tue Mar 7 00:20:53 2006 +++ php-src/NEWSTue Mar 7 00:55:23 2006 @@ -5,6 +5,7 @@ - Droped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they depend on register_globals +- Freetype 1.x and GD 1.x support removed (Pierre) - Cleaned CGI code. Now FastCGI can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Removed support for "continue" and "break" operators with non-constant -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS php.ini-dist php.ini-recommended /ext/mbstring mb_gpc.c mb_gpc.h mbstring.c /ext/mbstring/tests mb_parse_str.phpt mb_parse_str02.phpt /ext/session php_session.h sessio
pajoye Tue Mar 7 00:20:54 2006 UTC Modified files: /php-srcNEWS php.ini-dist php.ini-recommended /php-src/ext/mbstring mb_gpc.c mb_gpc.h mbstring.c /php-src/ext/mbstring/tests mb_parse_str.phpt mb_parse_str02.phpt /php-src/ext/sessionphp_session.h session.c /php-src/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008-php4.2.3.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 019.phpt bug24592.phpt bug26862.phpt /php-src/main main.c php_globals.h php_variables.c rfc1867.c /php-src/sapi/apachemod_php5.c /php-src/sapi/apache_hooks mod_php5.c sapi_apache.c Log: - remove register_globals support (aka "Kill the f***ing thing" :) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2094&r2=1.2095&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2094 php-src/NEWS:1.2095 --- php-src/NEWS:1.2094 Mon Mar 6 14:27:45 2006 +++ php-src/NEWSTue Mar 7 00:20:53 2006 @@ -2,6 +2,9 @@ ||| ?? ??? , PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) +- Droped register_globals support (Pierre) + - session_register, session_unregister and session_is_registered removed they +depend on register_globals - Cleaned CGI code. Now FastCGI can not be disabled. See sapi/cgi/CHANGES for more details. (Dmitry) - Removed support for "continue" and "break" operators with non-constant http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.245&r2=1.246&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.245 php-src/php.ini-dist:1.246 --- php-src/php.ini-dist:1.245 Wed Feb 8 23:47:01 2006 +++ php-src/php.ini-distTue Mar 7 00:20:53 2006 @@ -388,17 +388,6 @@ ; values override older values. variables_order = "EGPCS" -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - ; Whether or not to register the old-style input arrays, HTTP_GET_VARS ; and friends. If you're not using them, it's recommended to turn them off, ; for performance reasons. @@ -412,8 +401,8 @@ ; When enabled, the SERVER and ENV variables are created when they're first ; used (Just In Time) instead of when the script starts. If these variables ; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. +; performance gain. The PHP directives register_long_arrays and +; register_argc_argv must be disabled for this directive to have any affect. auto_globals_jit = On ; Maximum size of POST data that PHP will accept. http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.194&r2=1.195&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.194 php-src/php.ini-recommended:1.195 --- php-src/php.ini-recommended:1.194 Wed Feb 8 23:47:01 2006 +++ php-src/php.ini-recommended Tue Mar 7 00:20:53 2006 @@ -67,18 +67,6 @@ ; PHP. Please make sure you read what's different, and modify your scripts ; accordingly, if you decide to use this file instead. ; -; - register_globals = Off [Security, Performance] -; Global variables are no longer registered for input data (POST, GET, cookies, -; environment and other server variables). Instead of using $foo, you must use -; you can use $_REQUEST["foo"] (includes any variable that arrives through the -; request, namely, POST, GET and cookie variables), or use one of the specific -; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending -; on where the input originates. Also, you can look at the -; import_request_variables() function. -; Note that register_globals is going to be depracated (i.e., turned off by -; default) in the next version of PHP, because it often leads to security bugs. -; Read http://php.net/manual/en/security.registerglobals.php for further -; information. ; - register_long_arrays = Off [Performance] ; Disables registration of the older (and deprecated) long predefined array ; variables ($HTTP_*_VARS). Instead, use the superglobals that were @@ -446,17 +434,6 @@ ;
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h file.c
iliaa Mon Mar 6 14:27:46 2006 UTC
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h file.c
/php-srcNEWS
Log:
Fixed bug #36630 (umask not reset at the end of the request).
# This needs to be MFHed, but since it requires an API break it has to wait
# until the next minor release.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.758&r2=1.759&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.758
php-src/ext/standard/basic_functions.c:1.759
--- php-src/ext/standard/basic_functions.c:1.758Thu Feb 23 03:48:30 2006
+++ php-src/ext/standard/basic_functions.c Mon Mar 6 14:27:45 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.758 2006/02/23 03:48:30 bfrance Exp $ */
+/* $Id: basic_functions.c,v 1.759 2006/03/06 14:27:45 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -909,6 +909,7 @@
{
BG(rand_is_seeded) = 0;
BG(mt_rand_is_seeded) = 0;
+ BG(umask) = -1;
BG(next) = NULL;
BG(left) = -1;
@@ -1177,6 +1178,10 @@
zend_hash_destroy(&BG(putenv_ht));
#endif
+ if (BG(umask) != -1) {
+ umask(BG(umask));
+ }
+
/* Check if locale was changed and change it back
to the value in startup environment */
if (BG(locale_string) != NULL) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.h?r1=1.143&r2=1.144&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.143
php-src/ext/standard/basic_functions.h:1.144
--- php-src/ext/standard/basic_functions.h:1.143Sat Jan 28 06:16:32 2006
+++ php-src/ext/standard/basic_functions.h Mon Mar 6 14:27:45 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.143 2006/01/28 06:16:32 fmk Exp $ */
+/* $Id: basic_functions.h,v 1.144 2006/03/06 14:27:45 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -212,6 +212,8 @@
#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
mbstate_t mblen_state;
#endif
+
+ int umask;
} php_basic_globals;
#ifdef ZTS
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.421&r2=1.422&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.421 php-src/ext/standard/file.c:1.422
--- php-src/ext/standard/file.c:1.421 Thu Mar 2 13:12:45 2006
+++ php-src/ext/standard/file.c Mon Mar 6 14:27:45 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.421 2006/03/02 13:12:45 dmitry Exp $ */
+/* $Id: file.c,v 1.422 2006/03/06 14:27:45 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1473,6 +1473,10 @@
oldumask = umask(077);
+ if (BG(umask) != -1) {
+ BG(umask) = oldumask;
+ }
+
if (arg_count == 0) {
umask(oldumask);
} else {
@@ -1483,8 +1487,6 @@
umask(Z_LVAL_PP(arg1));
}
- /* XXX we should maybe reset the umask after each request! */
-
RETURN_LONG(oldumask);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2093&r2=1.2094&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2093 php-src/NEWS:1.2094
--- php-src/NEWS:1.2093 Sun Mar 5 19:20:12 2006
+++ php-src/NEWSMon Mar 6 14:27:45 2006
@@ -29,4 +29,5 @@
the part of haystack before or after first occurence of needle. (Johannes)
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
+- Fixed bug #36630 (umask not reset at the end of the request). (Ilia)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
