[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli_nonapi.c
rasmus Thu, 12 Nov 2009 08:20:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290573
Log:
Fix for bug #49098
Bug: http://bugs.php.net/49098 (Closed) Using custom session handler causes
segfault in session_save_state
Changed paths:
U php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
Modified: php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c2009-11-12 07:02:58 UTC
(rev 290572)
+++ php/php-src/branches/PHP_5_2/ext/mysqli/mysqli.c2009-11-12 08:20:57 UTC
(rev 290573)
@@ -1003,7 +1003,11 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
- MyG(error_msg) = estrdup(mysql_err);
+ if(mysql_err *mysql_err) {
+ MyG(error_msg) = estrdup(mysql_err);
+ } else {
+ MyG(error_msg) = NULL;
+ }
}
/* }}} */
Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c2009-11-12 07:02:58 UTC
(rev 290572)
+++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c2009-11-12 08:20:57 UTC
(rev 290573)
@@ -41,7 +41,11 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
- MyG(error_msg) = estrdup(mysql_err);
+ if(mysql_err *mysql_err) {
+ MyG(error_msg) = estrdup(mysql_err);
+ } else {
+ MyG(error_msg) = NULL;
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS
rasmus Thu, 12 Nov 2009 08:26:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290574 Log: NEWS entries for mysqli crash fix bug Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-11-12 08:20:57 UTC (rev 290573) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-12 08:26:43 UTC (rev 290574) @@ -63,6 +63,7 @@ (Moriyoshi) - Fixed bug #49332 (Build error with Snow Leopard). (Scott) - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd) +- Fixed bug #49098 (mysqli segfault on error) (Rasmus) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) - Fixed bug #48764 (PDO_pgsql::query() always uses implicit prepared statements if v3 proto available). (Matteo, Mark Kirkwood) Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-11-12 08:20:57 UTC (rev 290573) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-12 08:26:43 UTC (rev 290574) @@ -49,6 +49,7 @@ - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd) - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems). (Scott) +- Fixed bug #49098 (mysqli segfault on error) (Rasmus) ?? ??? 2009, PHP 5.3.1 # Will be merged in from branches/PHP_5_3_1 once released -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS
jani Thu, 12 Nov 2009 09:07:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290575 Log: bfn Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-11-12 08:26:43 UTC (rev 290574) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-12 09:07:51 UTC (rev 290575) @@ -27,8 +27,8 @@ makes segmentation fault). (Felipe) - Fixed bug #49990 (SNMP3 warning message about security level printed twice). (Jani) -- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted - transaction). (ben dot pineau at gmail dot com, Ilia, Matteo) +- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted transaction). + (ben dot pineau at gmail dot com, Ilia, Matteo) - Fixed bug #49921 (Curl post upload functions changed). (Ilia) - Fixed bug #49972 (AppendIterator undefined function crash). (Johannes) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, @@ -63,7 +63,7 @@ (Moriyoshi) - Fixed bug #49332 (Build error with Snow Leopard). (Scott) - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd) -- Fixed bug #49098 (mysqli segfault on error) (Rasmus) +- Fixed bug #49098 (mysqli segfault on error). (Rasmus) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) - Fixed bug #48764 (PDO_pgsql::query() always uses implicit prepared statements if v3 proto available). (Matteo, Mark Kirkwood) Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-11-12 08:26:43 UTC (rev 290574) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-12 09:07:51 UTC (rev 290575) @@ -49,8 +49,9 @@ - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd) - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems). (Scott) -- Fixed bug #49098 (mysqli segfault on error) (Rasmus) +- Fixed bug #49098 (mysqli segfault on error). (Rasmus) + ?? ??? 2009, PHP 5.3.1 # Will be merged in from branches/PHP_5_3_1 once released # Pleas add stuff under 5.3.2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/main/streams/plain_wrapper.c PHP_5_3_1/NEWS PHP_5_3_1/main/streams/plain_wrapper.c
johannes Thu, 12 Nov 2009 15:05:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290578
Log:
Fix #50063 (safe_mode_include_dir fails)
Bug: http://bugs.php.net/50063 (Open) safe_mode_include_dir fails
Changed paths:
U php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
U php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/main/streams/plain_wrapper.c
Modified: php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
===
--- php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2009-11-12
14:28:14 UTC (rev 290577)
+++ php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2009-11-12
15:05:03 UTC (rev 290578)
@@ -988,6 +988,10 @@
return NULL;
}
+ if ((php_check_safe_mode_include_dir(path TSRMLS_CC)) == 0) {
+ return php_stream_fopen_rel(path, mode, opened_path, options);
+ }
+
if ((options ENFORCE_SAFE_MODE) PG(safe_mode)
(!php_checkuid(path, mode, CHECKUID_CHECK_MODE_PARAM)))
return NULL;
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 14:28:14 UTC (rev 290577)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 15:05:03 UTC (rev 290578)
@@ -1,8 +1,9 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.1 RC4
+- Fixed bug #50063 (safe_mode_include_dir fails). (Johannes, christian at
+ elmerot dot se)
-
03 Nov 2009, PHP 5.3.1 RC3
- Added max_file_uploads INI directive, which can be set to limit the
number of file uploads per-request to 100 by default, to prevent possible
@@ -10,7 +11,7 @@
- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
-- Fuxed bug #50052 (Different Hashes on Windows and Linux on wrong Salt size).
+- Fixed bug #50052 (Different Hashes on Windows and Linux on wrong Salt size).
(Pierre)
- Fixed bug #49908 (throwing exception in __autoload crashes when interface
is not defined). (Felipe)
Modified: php/php-src/branches/PHP_5_3_1/main/streams/plain_wrapper.c
===
--- php/php-src/branches/PHP_5_3_1/main/streams/plain_wrapper.c 2009-11-12
14:28:14 UTC (rev 290577)
+++ php/php-src/branches/PHP_5_3_1/main/streams/plain_wrapper.c 2009-11-12
15:05:03 UTC (rev 290578)
@@ -988,6 +988,10 @@
return NULL;
}
+ if ((php_check_safe_mode_include_dir(path TSRMLS_CC)) == 0) {
+ return php_stream_fopen_rel(path, mode, opened_path, options);
+ }
+
if ((options ENFORCE_SAFE_MODE) PG(safe_mode)
(!php_checkuid(path, mode, CHECKUID_CHECK_MODE_PARAM)))
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS configure.in main/php_version.h
johannes Thu, 12 Nov 2009 15:09:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290579 Log: 5.3.1RC4 Changed paths: U php/php-src/branches/PHP_5_3_1/NEWS U php/php-src/branches/PHP_5_3_1/configure.in U php/php-src/branches/PHP_5_3_1/main/php_version.h Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 15:05:03 UTC (rev 290578) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 15:09:20 UTC (rev 290579) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.1 RC4 +12 Nov 2009, PHP 5.3.1 RC4 - Fixed bug #50063 (safe_mode_include_dir fails). (Johannes, christian at elmerot dot se) Modified: php/php-src/branches/PHP_5_3_1/configure.in === --- php/php-src/branches/PHP_5_3_1/configure.in 2009-11-12 15:05:03 UTC (rev 290578) +++ php/php-src/branches/PHP_5_3_1/configure.in 2009-11-12 15:09:20 UTC (rev 290579) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=1 -PHP_EXTRA_VERSION=RC4-dev +PHP_EXTRA_VERSION=RC4 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_3_1/main/php_version.h === --- php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-12 15:05:03 UTC (rev 290578) +++ php/php-src/branches/PHP_5_3_1/main/php_version.h 2009-11-12 15:09:20 UTC (rev 290579) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION RC4-dev -#define PHP_VERSION 5.3.1RC4-dev +#define PHP_EXTRA_VERSION RC4 +#define PHP_VERSION 5.3.1RC4 #define PHP_VERSION_ID 50301 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Thu, 12 Nov 2009 15:12:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290580 Log: 5.3.1RC4 Changed paths: A + php/php-src/tags/php_5_3_1RC4/ (from php/php-src/branches/PHP_5_3_1/:r290579) Property changes on: php/php-src/tags/php_5_3_1RC4 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Thu, 12 Nov 2009 15:14:12 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290581 Log: too early ... need the timezone update, too Changed paths: D php/php-src/tags/php_5_3_1RC4/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Thu, 12 Nov 2009 15:19:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290582
Log:
Fix bug #50087: NSAPI performance improvements
Bug: http://bugs.php.net/50087 (Open) [PATCH] - NSAPI performance improvements
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-12 15:14:12 UTC (rev 290581)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-12 15:19:35 UTC (rev 290582)
@@ -20,6 +20,7 @@
- Fixed memory leak in extension loading when an error occurs on Windows.
(Pierre)
+- Fixed bug #50087 (NSAPI performance improvements). (Uwe Schindler)
- Fixed bug #50152 (ReflectionClass::hasProperty behaves like isset() not
property_exists). (Felipe)
- Fixed bug #50146 (property_exists: Closure object cannot have properties).
Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 15:14:12 UTC (rev 290581)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 15:19:35 UTC (rev 290582)
@@ -131,14 +131,6 @@
/* this parameters to Service/Error are NSAPI ones which should not be php.ini keys and are excluded */
static char *nsapi_exclude_from_ini_entries[] = { fn, type, method, directive, code, reason, script, bucket, NULL };
-static char *nsapi_strdup(char *str)
-{
- if (str != NULL) {
- return STRDUP(str);
- }
- return NULL;
-}
-
static void nsapi_free(void *addr)
{
if (addr != NULL) {
@@ -500,7 +492,7 @@
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
/* copy the header, because NSAPI needs reformatting and we do not want to change the parameter */
- header_name = nsapi_strdup(sapi_header-header);
+ header_name = pool_strdup(rc-sn-pool, sapi_header-header);
/* extract name, this works, if only the header without ':' is given, too */
if (p = strchr(header_name, ':')) {
@@ -514,7 +506,7 @@
/* remove the header */
param_free(pblock_remove(header_name, rc-rq-srvhdrs));
- nsapi_free(header_name);
+ pool_free(rc-sn-pool, header_name);
return ZEND_HASH_APPLY_KEEP;
}
@@ -538,7 +530,7 @@
case SAPI_HEADER_ADD:
case SAPI_HEADER_REPLACE:
/* copy the header, because NSAPI needs reformatting and we do not want to change the parameter */
- header_name = nsapi_strdup(sapi_header-header);
+ header_name = pool_strdup(rc-sn-pool, sapi_header-header);
/* split header and align pointer for content */
header_content = strchr(header_name, ':');
@@ -561,7 +553,7 @@
pblock_nvinsert(header_name, header_content, rc-rq-srvhdrs);
}
- nsapi_free(header_name);
+ pool_free(rc-sn-pool, header_name);
return SAPI_HEADER_ADD;
default:
@@ -750,6 +742,8 @@
/* Create full Request-URI Script-Name */
if (SG(request_info).request_uri) {
+ pos = strlen(SG(request_info).request_uri);
+
if (SG(request_info).query_string) {
spprintf(value, 0, %s?%s, SG(request_info).request_uri, SG(request_info).query_string);
if (value) {
@@ -757,21 +751,16 @@
efree(value);
}
} else {
- php_register_variable(REQUEST_URI, SG(request_info).request_uri, track_vars_array TSRMLS_CC);
+ php_register_variable_safe(REQUEST_URI, SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
}
- if (value = nsapi_strdup(SG(request_info).request_uri)) {
- if (rc-path_info) {
-pos = strlen(SG(request_info).request_uri) - strlen(rc-path_info);
-if (pos=0) {
- value[pos] = '\0';
-} else {
- value[0]='\0';
-}
+ if (rc-path_info) {
+ pos -= strlen(rc-path_info);
+ if (pos0) {
+pos = 0;
}
- php_register_variable(SCRIPT_NAME, value, track_vars_array TSRMLS_CC);
- nsapi_free(value);
}
+ php_register_variable_safe(SCRIPT_NAME, SG(request_info).request_uri, pos, track_vars_array TSRMLS_CC);
}
php_register_variable(SCRIPT_FILENAME, SG(request_info).path_translated, track_vars_array TSRMLS_CC);
@@ -1014,21 +1003,25 @@
}
}
- request_context = (nsapi_request_context *)MALLOC(sizeof(nsapi_request_context));
+ request_context = (nsapi_request_context *)pool_malloc(sn-pool, sizeof(nsapi_request_context));
+ if (!request_context) {
+ log_error(LOG_CATASTROPHE, pblock_findval(fn, pb), sn, rq, Insufficient memory to process PHP request!);
+ return REQ_ABORTED;
+ }
request_context-pb = pb;
request_context-sn = sn;
request_context-rq = rq;
request_context-read_post_bytes = 0;
request_context-fixed_script = fixed_script;
request_context-http_error = (error_directive) ? rq-status_num : 0;
- request_context-path_info = nsapi_strdup(path_info);
+ request_context-path_info = path_info;
SG(server_context) = request_context;
-
[PHP-CVS] svn: /php/php-src/tags/
johannes Thu, 12 Nov 2009 15:20:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290584 Log: PHP 5.3.1RC4 Changed paths: A + php/php-src/tags/php_5_3_1RC4/ (from php/php-src/branches/PHP_5_3_1/:r290583) Property changes on: php/php-src/tags/php_5_3_1RC4 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 12 Nov 2009 15:42:52 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290587 Log: 5.2.12RC1 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-11-12 15:32:57 UTC (rev 290586) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-12 15:42:52 UTC (rev 290587) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Dec 2009, PHP 5.2.12 +12 Nov 2009, PHP 5.2.12RC1 - Updated timezone database to version 2009.18 (2009r). (Derick) - Added max_file_uploads INI directive, which can be set to limit the Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-11-12 15:32:57 UTC (rev 290586) +++ php/php-src/branches/PHP_5_2/configure.in 2009-11-12 15:42:52 UTC (rev 290587) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=12 -PHP_EXTRA_VERSION=-dev +PHP_EXTRA_VERSION=RC1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-11-12 15:32:57 UTC (rev 290586) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-11-12 15:42:52 UTC (rev 290587) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 12 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.2.12-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.2.12RC1 #define PHP_VERSION_ID 50212 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
iliaaThu, 12 Nov 2009 15:51:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290588 Log: 5.2.12RC1 Changed paths: A + php/php-src/tags/php_5_2_12RC1/ (from php/php-src/branches/PHP_5_2/:r290587) Property changes on: php/php-src/tags/php_5_2_12RC1 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:284120,288260,288273 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS configure.in main/php_version.h
iliaaThu, 12 Nov 2009 15:52:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290589 Log: Back to dev Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-11-12 15:51:39 UTC (rev 290588) +++ php/php-src/branches/PHP_5_2/NEWS 2009-11-12 15:52:23 UTC (rev 290589) @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Nov 2009, PHP 5.2.12RC2 + 12 Nov 2009, PHP 5.2.12RC1 - Updated timezone database to version 2009.18 (2009r). (Derick) Modified: php/php-src/branches/PHP_5_2/configure.in === --- php/php-src/branches/PHP_5_2/configure.in 2009-11-12 15:51:39 UTC (rev 290588) +++ php/php-src/branches/PHP_5_2/configure.in 2009-11-12 15:52:23 UTC (rev 290589) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=12 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION=RC2-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` Modified: php/php-src/branches/PHP_5_2/main/php_version.h === --- php/php-src/branches/PHP_5_2/main/php_version.h 2009-11-12 15:51:39 UTC (rev 290588) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2009-11-12 15:52:23 UTC (rev 290589) @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 12 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.2.12RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 5.2.12RC2-dev #define PHP_VERSION_ID 50212 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/nsapi/nsapi.c trunk/sapi/nsapi/nsapi.c
thetaphi Thu, 12 Nov 2009 17:13:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290591
Log:
As I am working on it, further improvement for bug #50087
Bug: http://bugs.php.net/50087 (Closed) [PATCH] - NSAPI performance improvements
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
U php/php-src/trunk/sapi/nsapi/nsapi.c
Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 16:39:09 UTC
(rev 290590)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c 2009-11-12 17:13:05 UTC
(rev 290591)
@@ -726,8 +726,8 @@
/* DOCUMENT_ROOT */
if (value = request_translate_uri(/, rc-sn)) {
- value[strlen(value) - 1] = '\0';
- php_register_variable(DOCUMENT_ROOT, value, track_vars_array
TSRMLS_CC);
+ pos = strlen(value);
+ php_register_variable_safe(DOCUMENT_ROOT, value, pos-1,
track_vars_array TSRMLS_CC);
nsapi_free(value);
}
Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===
--- php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-12 16:39:09 UTC (rev
290590)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c2009-11-12 17:13:05 UTC (rev
290591)
@@ -722,8 +722,8 @@
/* DOCUMENT_ROOT */
if (value = request_translate_uri(/, rc-sn)) {
- value[strlen(value) - 1] = '\0';
- php_register_variable(DOCUMENT_ROOT, value, track_vars_array
TSRMLS_CC);
+ pos = strlen(value);
+ php_register_variable_safe(DOCUMENT_ROOT, value, pos-1,
track_vars_array TSRMLS_CC);
nsapi_free(value);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS php.ini-development php.ini-production
johannes Thu, 12 Nov 2009 17:20:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290592 Log: merge 290306 (Make sure that max_file_uploads is set to 20 by-default in all places), Ilia Changed paths: UU php/php-src/branches/PHP_5_3_1/NEWS U php/php-src/branches/PHP_5_3_1/php.ini-development U php/php-src/branches/PHP_5_3_1/php.ini-production Modified: php/php-src/branches/PHP_5_3_1/NEWS === --- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:13:05 UTC (rev 290591) +++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:20:01 UTC (rev 290592) @@ -8,7 +8,7 @@ 03 Nov 2009, PHP 5.3.1 RC3 - Added max_file_uploads INI directive, which can be set to limit the - number of file uploads per-request to 100 by default, to prevent possible + number of file uploads per-request to 20 by default, to prevent possible DOS via temporary file exhaustion. (Ilia) - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre) Property changes on: php/php-src/branches/PHP_5_3_1/NEWS ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147 /php/php-src/trunk/NEWS:284726 + /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306 /php/php-src/trunk/NEWS:284726 Modified: php/php-src/branches/PHP_5_3_1/php.ini-development === --- php/php-src/branches/PHP_5_3_1/php.ini-development 2009-11-12 17:13:05 UTC (rev 290591) +++ php/php-src/branches/PHP_5_3_1/php.ini-development 2009-11-12 17:20:01 UTC (rev 290592) @@ -879,7 +879,7 @@ upload_max_filesize = 2M ; Maximum number of files that can be uploaded via a single request -max_file_uploads = 100 +max_file_uploads = 20 ;; ; Fopen wrappers ; Modified: php/php-src/branches/PHP_5_3_1/php.ini-production === --- php/php-src/branches/PHP_5_3_1/php.ini-production 2009-11-12 17:13:05 UTC (rev 290591) +++ php/php-src/branches/PHP_5_3_1/php.ini-production 2009-11-12 17:20:01 UTC (rev 290592) @@ -879,7 +879,7 @@ upload_max_filesize = 2M ; Maximum number of files that can be uploaded via a single request -max_file_uploads = 100 +max_file_uploads = 20 ;; ; Fopen wrappers ; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/README.SUBMITTING_PATCH trunk/README.SUBMITTING_PATCH
sixd Thu, 12 Nov 2009 17:36:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290593 Log: Add auroraeos's article URL. Add IRC channels Changed paths: U php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH U php/php-src/trunk/README.SUBMITTING_PATCH Modified: php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH === --- php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH2009-11-12 17:20:01 UTC (rev 290592) +++ php/php-src/branches/PHP_5_3/README.SUBMITTING_PATCH2009-11-12 17:36:37 UTC (rev 290593) @@ -4,7 +4,10 @@ This document describes how to submit a patch for PHP. Creating a patch for PHP is easy! +An excellent article to read first is: +http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith + Prework --- If you are fixing broken functionality then create a bug or identify @@ -27,7 +30,11 @@ discussion and later for documentation. Wiki accounts can be requested on http://wiki.php.net/start?do=register +There are several IRC channels where PHP developers are often +available to discuss questions. They include #php.pecl on the EFNet +network and #php-dev-win on FreeNode. + How to create your patch PHP uses Subversion (SVN) for revision control. Read Modified: php/php-src/trunk/README.SUBMITTING_PATCH === --- php/php-src/trunk/README.SUBMITTING_PATCH 2009-11-12 17:20:01 UTC (rev 290592) +++ php/php-src/trunk/README.SUBMITTING_PATCH 2009-11-12 17:36:37 UTC (rev 290593) @@ -4,7 +4,10 @@ This document describes how to submit a patch for PHP. Creating a patch for PHP is easy! +An excellent article to read first is: +http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith + Prework --- If you are fixing broken functionality then create a bug or identify @@ -27,7 +30,11 @@ discussion and later for documentation. Wiki accounts can be requested on http://wiki.php.net/start?do=register +There are several IRC channels where PHP developers are often +available to discuss questions. They include #php.pecl on the EFNet +network and #php-dev-win on FreeNode. + How to create your patch PHP uses Subversion (SVN) for revision control. Read -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS ext/phar/php_phar.h ext/phar/tar.c ext/phar/tests/tar/bug49910.phpt ext/phar/tests/tar/files/Structures_Graph-1.0.3.tgz
johannes Thu, 12 Nov 2009 17:43:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290601
Log:
Merge 290527 (fix PHP Bug #49910: no support for ././@LongLink for long
filenames in phar tar support) (Greg)
Bug: http://bugs.php.net/49910 (Assigned) no support for ././@LongLink for long
filenames in phar tar support
Changed paths:
UU php/php-src/branches/PHP_5_3_1/NEWS
U php/php-src/branches/PHP_5_3_1/ext/phar/php_phar.h
U php/php-src/branches/PHP_5_3_1/ext/phar/tar.c
A php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/bug49910.phpt
A +
php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/files/Structures_Graph-1.0.3.tgz
(from
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/Structures_Graph-1.0.3.tgz:r290527)
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:43:04 UTC (rev 290600)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:43:23 UTC (rev 290601)
@@ -5,6 +5,8 @@
- Fixed bug #50063 (safe_mode_include_dir fails). (Johannes, christian at
elmerot dot se)
+- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar
+ tar support). (Greg)
03 Nov 2009, PHP 5.3.1 RC3
- Added max_file_uploads INI directive, which can be set to limit the
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306
/php/php-src/trunk/NEWS:284726
+ /php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306,290527
/php/php-src/trunk/NEWS:284726
Modified: php/php-src/branches/PHP_5_3_1/ext/phar/php_phar.h
===
--- php/php-src/branches/PHP_5_3_1/ext/phar/php_phar.h 2009-11-12 17:43:04 UTC (rev 290600)
+++ php/php-src/branches/PHP_5_3_1/ext/phar/php_phar.h 2009-11-12 17:43:23 UTC (rev 290601)
@@ -22,7 +22,7 @@
#ifndef PHP_PHAR_H
#define PHP_PHAR_H
-#define PHP_PHAR_VERSION 2.0.0
+#define PHP_PHAR_VERSION 2.0.1
#include ext/standard/basic_functions.h
extern zend_module_entry phar_module_entry;
Modified: php/php-src/branches/PHP_5_3_1/ext/phar/tar.c
===
--- php/php-src/branches/PHP_5_3_1/ext/phar/tar.c 2009-11-12 17:43:04 UTC (rev 290600)
+++ php/php-src/branches/PHP_5_3_1/ext/phar/tar.c 2009-11-12 17:43:23 UTC (rev 290601)
@@ -200,6 +200,7 @@
tar_header *hdr;
php_uint32 sum1, sum2, size, old;
phar_archive_data *myphar, **actual;
+ int last_was_longlink = 0;
if (error) {
*error = NULL;
@@ -332,7 +333,52 @@
goto bail;
}
- if (!old hdr-prefix[0] != 0) {
+ if (!last_was_longlink hdr-typeflag == 'L') {
+ last_was_longlink = 1;
+ /* support the ././@LongLink system for storing long filenames */
+ entry.filename_len = entry.uncompressed_filesize;
+ entry.filename = pemalloc(entry.filename_len+1, myphar-is_persistent);
+
+ read = php_stream_read(fp, entry.filename, entry.filename_len);
+ if (read != entry.filename_len) {
+efree(entry.filename);
+if (error) {
+ spprintf(error, 4096, phar error: \%s\ is a corrupted tar file (truncated), fname);
+}
+php_stream_close(fp);
+
[PHP-CVS] svn: /php/php-src/trunk/ext/phar/tests/tar/ bug49910.phpt
davidc Thu, 12 Nov 2009 17:45:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290603
Log:
- Added an extra skipif for zlib
Changed paths:
U php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
Modified: php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt 2009-11-12 17:44:57 UTC
(rev 290602)
+++ php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt 2009-11-12 17:45:08 UTC
(rev 290603)
@@ -2,6 +2,7 @@
Bug #49910: no support for ././@LongLink for long filenames in phar tar support
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
--FILE--
?php
$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
@@ -46,4 +47,4 @@
[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
[28] = phar://*/package.xml
)
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/phar/tests/tar/ bug49910.phpt
davidc Thu, 12 Nov 2009 17:47:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290606
Log:
- MFH: Added test for bug 49910 for phar
Bug: http://bugs.php.net/49910 (Assigned) no support for ././@LongLink for long
filenames in phar tar support
Changed paths:
A php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
Added: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/bug49910.phpt
2009-11-12 17:47:17 UTC (rev 290606)
@@ -0,0 +1,50 @@
+--TEST--
+Bug #49910: no support for ././@LongLink for long filenames in phar tar support
+--SKIPIF--
+?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
+--FILE--
+?php
+$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
+$tar = new PharData($fname);
+$files = array();
+foreach (new RecursiveIteratorIterator($tar) as $file) {
+ $files[] = str_replace($fname, '*', $file-getPathName());
+}
+print_r($files);
+?
+===DONE===
+--EXPECT--
+Array
+(
+[0] = phar://*/Structures_Graph-1.0.3/LICENSE
+[1] =
phar://*/Structures_Graph-1.0.3/Structures/Graph/Manipulator/AcyclicTest.php
+[2] =
phar://*/Structures_Graph-1.0.3/Structures/Graph/Manipulator/TopologicalSorter.php
+[3] = phar://*/Structures_Graph-1.0.3/Structures/Graph/Node.php
+[4] = phar://*/Structures_Graph-1.0.3/Structures/Graph.php
+[5] = phar://*/Structures_Graph-1.0.3/docs/generate.sh
+[6] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph.html
+[7] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
+[8] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
+[9] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/Structures_Graph_Node.html
+[10] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
+[11] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
+[12] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
+[13] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/_Structures_Graph_php.html
+[14] =
phar://*/Structures_Graph-1.0.3/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
+[15] =
phar://*/Structures_Graph-1.0.3/docs/html/classtrees_Structures_Graph.html
+[16] = phar://*/Structures_Graph-1.0.3/docs/html/elementindex.html
+[17] =
phar://*/Structures_Graph-1.0.3/docs/html/elementindex_Structures_Graph.html
+[18] = phar://*/Structures_Graph-1.0.3/docs/html/errors.html
+[19] = phar://*/Structures_Graph-1.0.3/docs/html/index.html
+[20] = phar://*/Structures_Graph-1.0.3/docs/html/li_Structures_Graph.html
+[21] = phar://*/Structures_Graph-1.0.3/docs/html/media/banner.css
+[22] = phar://*/Structures_Graph-1.0.3/docs/html/media/stylesheet.css
+[23] = phar://*/Structures_Graph-1.0.3/docs/html/packages.html
+[24] = phar://*/Structures_Graph-1.0.3/docs/html/todolist.html
+[25] =
phar://*/Structures_Graph-1.0.3/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+[26] = phar://*/Structures_Graph-1.0.3/tests/AllTests.php
+[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
+[28] = phar://*/package.xml
+)
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ NEWS ext/mysqli/mysqli_nonapi.c
johannes Thu, 12 Nov 2009 17:48:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290608
Log:
Merge 290570 (Fix bug #49098). (Rasmus)
Bug: http://bugs.php.net/49098 (Closed) Using custom session handler causes
segfault in session_save_state
Changed paths:
UU php/php-src/branches/PHP_5_3_1/NEWS
_U php/php-src/branches/PHP_5_3_1/ext/mysqli/
U php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c
Modified: php/php-src/branches/PHP_5_3_1/NEWS
===
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:48:03 UTC (rev 290607)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-11-12 17:48:36 UTC (rev 290608)
@@ -7,6 +7,7 @@
elmerot dot se)
- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar
tar support). (Greg)
+- Fixed bug #49098 (mysqli segfault on error) (Rasmus)
03 Nov 2009, PHP 5.3.1 RC3
- Added max_file_uploads INI directive, which can be set to limit the
Property changes on: php/php-src/branches/PHP_5_3_1/NEWS
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306,290527
/php/php-src/trunk/NEWS:284726
+
/php/php-src/branches/PHP_5_3/NEWS:288028,288034,288067,288081,288083,288085,288087-288088,288096,288111,288116-288117,288159,288202-288204,288208,288215,288246,288263,288265,288267,288329,288339,288351,288354,288378-288379,288393,288396,288411,288437,288439,288446-288448,288462,288510-288511,288514-288518,288522-288524,288531,288537,288541,288547-288548,288555,288562,288571,288575,288580,288583,288585,288598,288603,288638,288644,288653,288676,288679,288705,288741,288743,288745-288747,288749,288784,288793,288834,288892-288893,288896,288940,288943,288945,288953,288973,289004,289019,289027-289028,289030,289039,289046,289049,289076,289123,289214,289216,289247,289249,289285,289339,289341,289351,289366,289368,289372,289445-289446,289531,289546-289547,289557,289568,289581,289587,289612,289621-289624,289666-289667,289779,289987,289990,290029,290129,290147,290306,290527,290570
/php/php-src/trunk/NEWS:284726
Property changes on: php/php-src/branches/PHP_5_3_1/ext/mysqli
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147
/php/php-src/trunk/ext/mysqli:284726
+
/php/php-src/branches/PHP_5_3/ext/mysqli:288202-289561,289612,289621-289624,289666,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147,290306,290527,290570
/php/php-src/trunk/ext/mysqli:284726
Modified: php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c
===
--- php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c 2009-11-12
17:48:03 UTC (rev 290607)
+++ php/php-src/branches/PHP_5_3_1/ext/mysqli/mysqli_nonapi.c 2009-11-12
17:48:36 UTC (rev 290608)
@@ -46,7 +46,11 @@
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
- MyG(error_msg) = estrdup(mysql_err);
+ if(mysql_err *mysql_err) {
+ MyG(error_msg) = estrdup(mysql_err);
+ } else {
+ MyG(error_msg) = NULL;
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/ bug49910.phpt
johannes Thu, 12 Nov 2009 17:59:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290617
Log:
Merge 290606 (fixes the skipif) (David C)
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/bug49910.phpt
Modified: php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/bug49910.phpt
2009-11-12 17:58:30 UTC (rev 290616)
+++ php/php-src/branches/PHP_5_3_1/ext/phar/tests/tar/bug49910.phpt
2009-11-12 17:59:18 UTC (rev 290617)
@@ -2,6 +2,7 @@
Bug #49910: no support for ././@LongLink for long filenames in phar tar support
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
--FILE--
?php
$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
@@ -46,4 +47,4 @@
[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
[28] = phar://*/package.xml
)
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Thu, 12 Nov 2009 18:00:10 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290618 Log: one more take Changed paths: D php/php-src/tags/php_5_3_1RC4/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/tags/
johannes Thu, 12 Nov 2009 18:01:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290620 Log: 5.3.1RC4 # hope even with this fixes we can be fast with testing this ... Changed paths: A + php/php-src/tags/php_5_3_1RC4/ (from php/php-src/branches/PHP_5_3_1/:r290618) Property changes on: php/php-src/tags/php_5_3_1RC4 ___ Added: svn:ignore + Makefile.objects Makefile.fragments Makefile acconfig.h aclocal.m4 autom4te.cache bsd_converted buildmk.stamp buildconf.stamp config.h.in config.cache config.log config.status config_vars.mk configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c configure configure.bat conftest conftest.c generated_lists meta_cc meta_ccld mkinstalldirs missing install-sh internal_functions.c libtool shlibtool php php5.spec stamp-h test.php3 *.lo *.la libs modules php-*.tar.gz want_dependencies deps config.nice php_version.h *.plg *.opt *.ncb Release Release_inline Debug Release_TS Release_TSDbg Release_TS_inline Debug_TS results.txt libs _libs include autom4te.cache FBCIndex FBCLockFolder debug.log confdefs.h configure.js config.nice.bat configure.bat ZendEngine1 php_test_results_*.txt *.gcda *.gcno lcov_data lcov_html php_lcov.info tmp-php.ini diff Added: svn:mergeinfo + /php/php-src/branches/PHP_5_3:288351,289341,289612,289621-289624,289666-289667,289690,289706,289752,289763,289768,289779,289987,289990,290029,290129,290147 /php/php-src/trunk:284726 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_object_handlers.c
felipe Thu, 12 Nov 2009 23:18:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290642
Log:
- Fixed bug #49734 (toString must return string value)
Bug: http://bugs.php.net/49734 (Open) toString must return string value
Changed paths:
U php/php-src/trunk/Zend/zend_object_handlers.c
Modified: php/php-src/trunk/Zend/zend_object_handlers.c
===
--- php/php-src/trunk/Zend/zend_object_handlers.c 2009-11-12 22:57:39 UTC
(rev 290641)
+++ php/php-src/trunk/Zend/zend_object_handlers.c 2009-11-12 23:18:04 UTC
(rev 290642)
@@ -1253,7 +1253,7 @@
zend_error(E_ERROR, Method
%v::__toString() must not throw an exception, ce-name);
return FAILURE;
}
- if (Z_TYPE_P(retval) == IS_UNICODE) {
+ if (Z_TYPE_P(retval) == IS_UNICODE ||
Z_TYPE_P(retval) == IS_STRING) {
INIT_PZVAL(writeobj);
if (readobj == writeobj) {
zval_dtor(readobj);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: svn: /php/php-src/trunk/ext/phar/tests/tar/ bug49910.phpt
David Coallier wrote:
davidc Thu, 12 Nov 2009 17:45:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290603
Log:
- Added an extra skipif for zlib
Changed paths:
U php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
Modified: php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt
===
--- php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt2009-11-12
17:44:57 UTC (rev 290602)
+++ php/php-src/trunk/ext/phar/tests/tar/bug49910.phpt2009-11-12
17:45:08 UTC (rev 290603)
@@ -2,6 +2,7 @@
Bug #49910: no support for ././@LongLink for long filenames in phar tar
support
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
+?php if (!extension_loaded(zlib)) die(skip); ?
--FILE--
?php
$fname = str_replace('\\', '/', dirname(__FILE__) .
'/files/Structures_Graph-1.0.3.tgz');
@@ -46,4 +47,4 @@
[27] = phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php
[28] = phar://*/package.xml
)
-===DONE===
\ No newline at end of file
+===DONE===
Thanks David.
pecl/phar/trunk/tests/tar/bug49910.phpt is lonely, and wants this patch too.
:)
Greg
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_API.c
felipe Fri, 13 Nov 2009 00:24:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290645
Log:
- Drop brackets
Changed paths:
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c 2009-11-12 23:28:06 UTC (rev 290644)
+++ php/php-src/trunk/Zend/zend_API.c 2009-11-13 00:24:43 UTC (rev 290645)
@@ -204,9 +204,7 @@
case IS_DOUBLE:
return double;
case IS_STRING:
- {
return binary string;
- }
case IS_OBJECT:
return object;
case IS_RESOURCE:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
cellog Fri, 13 Nov 2009 00:41:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=290646 Log: fix completely random ordering of bugs in NEWS (what happened here?) Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-11-13 00:24:43 UTC (rev 290645) +++ php/php-src/branches/PHP_5_3/NEWS 2009-11-13 00:41:37 UTC (rev 290646) @@ -29,27 +29,27 @@ - Fixed bug #50023 (pdo_mysql doesn't use PHP_MYSQL_UNIX_SOCK_ADDR). (Ilia) - Fixed bug #50005 (Throwing through Reflection modified Exception object makes segmentation fault). (Felipe) -- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar - tar support). (Greg) -- Fixed bug #49908 (throwing exception in __autoload crashes when interface - is not defined). (Felipe) -- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private - property in base class). (Felipe) -- Fixed bug #49142 (crash when exception thrown from __tostring()). - (David Soria Parra) - Fixed bug #49990 (SNMP3 warning message about security level printed twice). (Jani) - Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted transaction). (ben dot pineau at gmail dot com, Ilia, Matteo) - Fixed bug #49921 (Curl post upload functions changed). (Ilia) +- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar + tar support). (Greg) +- Fixed bug #49908 (throwing exceptions in __autoload crashes when interface + is not defined). (Felipe) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning). (Ilia, wmeler at wp-sa dot pl) +- Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private + property in base class). (Felipe) - Fixed bug #49647 (DOMUserData does not exist). (Rob) - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd) - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems). (Scott) +- Fixed bug #49142 (crash when exception thrown from __tostring()). + (David Soria Parra) - Fixed bug #49098 (mysqli segfault on error). (Rasmus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / pecl/phar/trunk/package.php pecl/phar/trunk/phar_object.c pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt pecl/phar/trunk/te
cellog Fri, 13 Nov 2009 00:58:11 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=290647
Log:
fix PHP Bug #49938: Phar::isBuffering() returns inverted value
Bug: http://bugs.php.net/49938 (Analyzed) Phar::isBuffering() returns inverted
value
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt
U pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/tar/phar_begin_setstub_commitU.phpt
U pecl/phar/trunk/tests/zip/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/zip/phar_begin_setstub_commitU.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commitU.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
Modified: pecl/phar/trunk/package.php
===
--- pecl/phar/trunk/package.php 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/package.php 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2,6 +2,7 @@
$notes = '
Bugfix release
+ * Fix PHP Bug #49938: Phar::isBuffering() returns inverted value
* Fix PHP Bug #49910: no support for ././@LongLink for long filenames in
phar tar support
';
Modified: pecl/phar/trunk/phar_object.c
===
--- pecl/phar/trunk/phar_object.c 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/phar_object.c 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2945,7 +2945,7 @@
{
PHAR_ARCHIVE_OBJECT();
- RETURN_BOOL(!phar_obj-arc.archive-donotflush);
+ RETURN_BOOL(phar_obj-arc.archive-donotflush);
}
/* }}} */
Modified: pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt
===
--- pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?
--EXPECT--
+bool(false)
bool(true)
-bool(false)
string(5) Hello
string(84) ?php var_dump(First); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
@@ -45,7 +45,7 @@
string(85) ?php var_dump(Second); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
===COMMIT===
-bool(true)
+bool(false)
string(5) Hello
string(5) World
string(85) ?php var_dump(Second); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
Modified: pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt
===
--- pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?
--EXPECT--
+bool(false)
bool(true)
-bool(false)
unicode(5) Hello
string(84) ?php var_dump(First); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
@@ -45,7 +45,7 @@
string(85) ?php var_dump(Second); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
===COMMIT===
-bool(true)
+bool(false)
unicode(5) Hello
unicode(5) World
string(85) ?php var_dump(Second); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
Modified: pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt
===
--- pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) Hello
string(84) ?php var_dump(First); Phar::mapPhar(brandnewphar.phar); __HALT_COMPILER(); ?
@@ -46,7 +46,7 @@
string(85) ?php
