[PHP-CVS] svn: /php/php-src/trunk/ext/sqlite3/libsqlite/ sqlite3.c
joey Tue, 09 Aug 2011 06:36:47 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314585 Log: Fix an unchecked return - change was back-migrated from version 3.7.6.3 of sqlite.c from upstream. Changed paths: U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c Modified: php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c === --- php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-08-09 05:11:19 UTC (rev 314584) +++ php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-08-09 06:36:47 UTC (rev 314585) @@ -17818,7 +17818,7 @@ sqlite3_int64 priorLimit; sqlite3_int64 excess; #ifndef SQLITE_OMIT_AUTOINIT - sqlite3_initialize(); + if( sqlite3_initialize() ) return 0; #endif sqlite3_mutex_enter(mem0.mutex); priorLimit = mem0.alarmThreshold; -- 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/ext/sqlite3/libsqlite/sqlite3.c branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c br
scottmac Tue, 09 Aug 2011 07:31:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314586 Log: Update SQLite3 to the latest version Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.h U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h diffs exceeded maximum size -- 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/ereg/regex/regerror.c branches/PHP_5_4/ext/ereg/regex/regerror.c trunk/ext/ereg/regex/regerror.c trunk/ext/ereg/regex.patch
laruence Tue, 09 Aug 2011 09:35:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314598 Log: Avoiding strcpy usage, Make static analyzer happy Changed paths: U php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c U php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c U php/php-src/trunk/ext/ereg/regex/regerror.c A php/php-src/trunk/ext/ereg/regex.patch Modified: php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c === --- php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-09 09:34:32 UTC (rev 314597) +++ php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-09 09:35:42 UTC (rev 314598) @@ -82,7 +82,7 @@ if (errcodeREG_ITOA) { if (r-code = 0) - (void) strcpy(convbuf, r-name); + (void) strncpy(convbuf, r-name, 50); else sprintf(convbuf, REG_0x%x, target); assert(strlen(convbuf) sizeof(convbuf)); Modified: php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c === --- php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c 2011-08-09 09:34:32 UTC (rev 314597) +++ php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c 2011-08-09 09:35:42 UTC (rev 314598) @@ -82,7 +82,7 @@ if (errcodeREG_ITOA) { if (r-code = 0) - (void) strcpy(convbuf, r-name); + (void) strncpy(convbuf, r-name, 50); else sprintf(convbuf, REG_0x%x, target); assert(strlen(convbuf) sizeof(convbuf)); Modified: php/php-src/trunk/ext/ereg/regex/regerror.c === --- php/php-src/trunk/ext/ereg/regex/regerror.c 2011-08-09 09:34:32 UTC (rev 314597) +++ php/php-src/trunk/ext/ereg/regex/regerror.c 2011-08-09 09:35:42 UTC (rev 314598) @@ -82,7 +82,7 @@ if (errcodeREG_ITOA) { if (r-code = 0) - (void) strcpy(convbuf, r-name); + (void) strncpy(convbuf, r-name, 50); else sprintf(convbuf, REG_0x%x, target); assert(strlen(convbuf) sizeof(convbuf)); Added: php/php-src/trunk/ext/ereg/regex.patch === --- php/php-src/trunk/ext/ereg/regex.patch (rev 0) +++ php/php-src/trunk/ext/ereg/regex.patch 2011-08-09 09:35:42 UTC (rev 314598) @@ -0,0 +1,12 @@ +diff -u regex.orig/regerror.c regex/regerror.c +--- regex.orig/regerror.c 2011-08-09 17:31:11.0 +0800 regex/regerror.c 2011-08-09 17:29:53.0 +0800 +@@ -82,7 +82,7 @@ + + if (errcodeREG_ITOA) { + if (r-code = 0) +- (void) strcpy(convbuf, r-name); ++ (void) strncpy(convbuf, r-name, 50); + else + sprintf(convbuf, REG_0x%x, target); + assert(strlen(convbuf) sizeof(convbuf)); -- 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/ereg/regex/regerror.c branches/PHP_5_3/ext/ereg/regex/regerror.ih branches/PHP_5_3/ext/standard/crypt.c branches/PHP_5_3/ext/standard/http_fopen_wrapp
laruence Tue, 09 Aug 2011 12:16:58 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314641 Log: Avoiding strcpy, strcat, sprintf usage to make static analyzer happy Changed paths: U php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c U php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.ih U php/php-src/branches/PHP_5_3/ext/standard/crypt.c U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c U php/php-src/branches/PHP_5_3/ext/standard/user_filters.c U php/php-src/branches/PHP_5_3/ext/xml/xml.c U php/php-src/branches/PHP_5_3/main/fopen_wrappers.c U php/php-src/branches/PHP_5_3/main/streams/filter.c U php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c U php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.ih U php/php-src/branches/PHP_5_4/ext/standard/crypt.c U php/php-src/branches/PHP_5_4/ext/standard/http_fopen_wrapper.c U php/php-src/branches/PHP_5_4/ext/standard/proc_open.c U php/php-src/branches/PHP_5_4/ext/standard/user_filters.c U php/php-src/branches/PHP_5_4/ext/xml/xml.c U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c U php/php-src/branches/PHP_5_4/main/streams/filter.c U php/php-src/trunk/ext/ereg/regex/regerror.c U php/php-src/trunk/ext/ereg/regex/regerror.ih U php/php-src/trunk/ext/ereg/regex.patch U php/php-src/trunk/ext/standard/crypt.c U php/php-src/trunk/ext/standard/http_fopen_wrapper.c U php/php-src/trunk/ext/standard/proc_open.c U php/php-src/trunk/ext/standard/user_filters.c U php/php-src/trunk/ext/xml/xml.c U php/php-src/trunk/main/fopen_wrappers.c U php/php-src/trunk/main/streams/filter.c Modified: php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c === --- php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-09 12:16:32 UTC (rev 314640) +++ php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-09 12:16:58 UTC (rev 314641) @@ -74,7 +74,7 @@ char convbuf[50]; if (errcode == REG_ATOI) - s = regatoi(preg, convbuf); + s = regatoi(preg, convbuf, sizeof(convbuf)); else { for (r = rerrs; r-code = 0; r++) if (r-code == target) @@ -84,7 +84,7 @@ if (r-code = 0) (void) strncpy(convbuf, r-name, 50); else -sprintf(convbuf, REG_0x%x, target); +snprintf(convbuf, sizeof(convbuf), REG_0x%x, target); assert(strlen(convbuf) sizeof(convbuf)); s = convbuf; } else @@ -106,12 +106,13 @@ /* - regatoi - internal routine to implement REG_ATOI - == static char *regatoi(const regex_t *preg, char *localbuf); + == static char *regatoi(const regex_t *preg, char *localbuf, int bufsize); */ static char * -regatoi(preg, localbuf) +regatoi(preg, localbuf, bufsize) const regex_t *preg; char *localbuf; +int bufsize; { register const struct rerr *r; @@ -121,6 +122,6 @@ if (r-code 0) return(0); - sprintf(localbuf, %d, r-code); + snprintf(localbuf, bufsize, %d, r-code); return(localbuf); } Modified: php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.ih === --- php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.ih 2011-08-09 12:16:32 UTC (rev 314640) +++ php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.ih 2011-08-09 12:16:58 UTC (rev 314641) @@ -4,7 +4,7 @@ #endif /* === regerror.c === */ -static char *regatoi(const regex_t *preg, char *localbuf); +static char *regatoi(const regex_t *preg, char *localbuf, int bufsize); #ifdef __cplusplus } Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt.c === --- php/php-src/branches/PHP_5_3/ext/standard/crypt.c 2011-08-09 12:16:32 UTC (rev 314640) +++ php/php-src/branches/PHP_5_3/ext/standard/crypt.c 2011-08-09 12:16:58 UTC (rev 314641) @@ -170,10 +170,10 @@ /* The automatic salt generation covers standard DES, md5-crypt and Blowfish (simple) */ if (!*salt) { #if PHP_MD5_CRYPT - strcpy(salt, $1$); + strncpy(salt, $1$, PHP_MAX_SALT_LEN); php_to64(salt[3], PHP_CRYPT_RAND, 4); php_to64(salt[7], PHP_CRYPT_RAND, 4); - strcpy(salt[11], $); + strncpy(salt[11], $, PHP_MAX_SALT_LEN - 11); #elif PHP_STD_DES_CRYPT php_to64(salt[0], PHP_CRYPT_RAND, 2); salt[2] = '\0'; Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c === --- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-08-09 12:16:32 UTC (rev 314640) +++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2011-08-09 12:16:58 UTC (rev 314641) @@ -330,7 +330,7 @@ scratch_len = strlen(path) + 29 + Z_STRLEN_PP(tmpzval); scratch = emalloc(scratch_len); strlcpy(scratch, Z_STRVAL_PP(tmpzval),
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/main/ fopen_wrappers.c
laruence Tue, 09 Aug 2011 13:04:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314645 Log: Fixed built (missing 2nd arg for strncpy) Changed paths: U php/php-src/branches/PHP_5_3/main/fopen_wrappers.c Modified: php/php-src/branches/PHP_5_3/main/fopen_wrappers.c === --- php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2011-08-09 12:34:15 UTC (rev 314644) +++ php/php-src/branches/PHP_5_3/main/fopen_wrappers.c 2011-08-09 13:04:35 UTC (rev 314645) @@ -473,7 +473,7 @@ if (IS_SLASH(path_info[0])) { length--; } - strncpy(filename + length, path_len + 1); + strncpy(filename + length, path_info, path_len + 1); } } else { filename = SG(request_info).path_translated; -- 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/standard/dns.c branches/PHP_5_4/ext/standard/dns.c trunk/ext/standard/dns.c
iliaaTue, 09 Aug 2011 13:10:57 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314648 Log: Minimize stack usage and added missing dtors Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/dns.c U php/php-src/branches/PHP_5_4/ext/standard/dns.c U php/php-src/trunk/ext/standard/dns.c Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c === --- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2011-08-09 13:09:42 UTC (rev 314647) +++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2011-08-09 13:10:57 UTC (rev 314648) @@ -118,7 +118,7 @@ Get the host name of the current machine */ PHP_FUNCTION(gethostname) { - char buf[4096]; + char buf[MAXHOSTNAMELEN]; if (zend_parse_parameters_none() == FAILURE) { return; @@ -794,12 +794,14 @@ #if defined(HAVE_DNS_SEARCH) handle = dns_open(NULL); if (handle == NULL) { + zval_dtor(return_value); RETURN_FALSE; } #elif defined(HAVE_RES_NSEARCH) memset(state, 0, sizeof(state)); if (res_ninit(handle)) { - RETURN_FALSE; + zval_dtor(return_value); + RETURN_FALSE; } #else res_init(); Modified: php/php-src/branches/PHP_5_4/ext/standard/dns.c === --- php/php-src/branches/PHP_5_4/ext/standard/dns.c 2011-08-09 13:09:42 UTC (rev 314647) +++ php/php-src/branches/PHP_5_4/ext/standard/dns.c 2011-08-09 13:10:57 UTC (rev 314648) @@ -118,7 +118,7 @@ Get the host name of the current machine */ PHP_FUNCTION(gethostname) { - char buf[4096]; + char buf[MAXHOSTNAMELEN]; if (zend_parse_parameters_none() == FAILURE) { return; @@ -830,12 +830,14 @@ #if defined(HAVE_DNS_SEARCH) handle = dns_open(NULL); if (handle == NULL) { + zval_dtor(return_value); RETURN_FALSE; } #elif defined(HAVE_RES_NSEARCH) memset(state, 0, sizeof(state)); if (res_ninit(handle)) { - RETURN_FALSE; + zval_dtor(return_value); + RETURN_FALSE; } #else res_init(); Modified: php/php-src/trunk/ext/standard/dns.c === --- php/php-src/trunk/ext/standard/dns.c2011-08-09 13:09:42 UTC (rev 314647) +++ php/php-src/trunk/ext/standard/dns.c2011-08-09 13:10:57 UTC (rev 314648) @@ -118,7 +118,7 @@ Get the host name of the current machine */ PHP_FUNCTION(gethostname) { - char buf[4096]; + char buf[MAXHOSTNAMELEN]; if (zend_parse_parameters_none() == FAILURE) { return; @@ -830,12 +830,14 @@ #if defined(HAVE_DNS_SEARCH) handle = dns_open(NULL); if (handle == NULL) { + zval_dtor(return_value); RETURN_FALSE; } #elif defined(HAVE_RES_NSEARCH) memset(state, 0, sizeof(state)); if (res_ninit(handle)) { - RETURN_FALSE; + zval_dtor(return_value); + RETURN_FALSE; } #else res_init(); -- 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/phar_object.c branches/PHP_5_4/ext/phar/phar_object.c trunk/ext/phar/phar_object.c
iliaaTue, 09 Aug 2011 14:11:56 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314653 Log: Make static analyzers happy Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c U php/php-src/branches/PHP_5_4/ext/phar/phar_object.c U php/php-src/trunk/ext/phar/phar_object.c Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c === --- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-08-09 13:19:21 UTC (rev 314652) +++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2011-08-09 14:11:56 UTC (rev 314653) @@ -1664,11 +1664,14 @@ } test = expand_filepath(fname, NULL TSRMLS_CC); + efree(fname); if (test) { - efree(fname); fname = test; fname_len = strlen(fname); + } else { + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, Could not resolve file path); + return ZEND_HASH_APPLY_STOP; } save = fname; @@ -1694,6 +1697,11 @@ #else fname = expand_filepath(intern-file_name, NULL TSRMLS_CC); #endif + if (!fname) { + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, Could not resolve file path); + return ZEND_HASH_APPLY_STOP; + } + fname_len = strlen(fname); save = fname; goto phar_spl_fileinfo; @@ -1711,6 +1719,14 @@ phar_spl_fileinfo: if (base_len) { temp = expand_filepath(base, NULL TSRMLS_CC); + if (!temp) { + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, Could not resolve file path); + if (save) { + efree(save); + } + return ZEND_HASH_APPLY_STOP; + } + base = temp; base_len = strlen(base); @@ -4083,7 +4099,10 @@ if (phar_obj-arc.archive-fp !phar_obj-arc.archive-is_brandnew !(stub-flags PHAR_ENT_COMPRESSION_MASK)) { fp = phar_obj-arc.archive-fp; } else { - fp = php_stream_open_wrapper(phar_obj-arc.archive-fname, rb, 0, NULL); + if (!(fp = php_stream_open_wrapper(phar_obj-arc.archive-fname, rb, 0, NULL))) { + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, phar error: unable to open phar \%s\, phar_obj-arc.archive-fname); + return; + } if (stub-flags PHAR_ENT_COMPRESSION_MASK) { char *filter_name; Modified: php/php-src/branches/PHP_5_4/ext/phar/phar_object.c === --- php/php-src/branches/PHP_5_4/ext/phar/phar_object.c 2011-08-09 13:19:21 UTC (rev 314652) +++ php/php-src/branches/PHP_5_4/ext/phar/phar_object.c 2011-08-09 14:11:56 UTC (rev 314653) @@ -1666,11 +1666,14 @@ } test = expand_filepath(fname, NULL TSRMLS_CC); + efree(fname); if (test) { - efree(fname); fname = test; fname_len = strlen(fname); + } else { + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, Could not resolve file path); + return ZEND_HASH_APPLY_STOP; } save = fname; @@ -1696,6 +1699,11 @@
[PHP-CVS] svn: /php/php-src/trunk/ NEWS
hirokawa Tue, 09 Aug 2011 15:11:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314671 Log: update the news. Changed paths: U php/php-src/trunk/NEWS Modified: php/php-src/trunk/NEWS === --- php/php-src/trunk/NEWS 2011-08-09 15:08:03 UTC (rev 314670) +++ php/php-src/trunk/NEWS 2011-08-09 15:11:33 UTC (rev 314671) @@ -169,6 +169,10 @@ . Added paged results support. FR #42060. (a...@openldap.org, iaren...@eteo.mondragon.edu, jean...@au-fil-du.net, remy.sai...@gmail.com) +- Improved mbstring extension: + . Added Shift_JIS Emoji (pictograms) support. (rui) + . Ill-formed UTF-8 check for security enhancements. (rui) + - Improved MySQL extensions: . MySQL: Deprecated mysql_list_dbs(). FR #50667. (Andrey) . mysqlnd: Added named pipes support. FR #48082. (Andrey) -- 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_4/ NEWS
hirokawa Tue, 09 Aug 2011 15:11:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314672 Log: MFH: update the news. Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-08-09 15:11:33 UTC (rev 314671) +++ php/php-src/branches/PHP_5_4/NEWS 2011-08-09 15:11:51 UTC (rev 314672) @@ -8,6 +8,10 @@ - Fixed bug #55378: Binary number literal returns float number though its value is small enough. (Derick) +- Improved mbstring extension: + . Added Shift_JIS Emoji (pictograms) support. (rui) + . Ill-formed UTF-8 check for security enhancements. (rui) + 04 Aug 2011, PHP 5.4.0 Alpha 3 - Added features: . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail -- 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_4/UPGRADING trunk/UPGRADING
scottmac Tue, 09 Aug 2011 15:27:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314676 Log: Fix typos in UPGRADING Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING U php/php-src/trunk/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2011-08-09 15:27:12 UTC (rev 314675) +++ php/php-src/branches/PHP_5_4/UPGRADING 2011-08-09 15:27:25 UTC (rev 314676) @@ -100,7 +100,7 @@ To create a generic object you can use StdClass: $test = new StdClass; - $text-baz = 1; + $test-baz = 1; - It's now possible to enforce the class' __construct arguments in an abstract constructor in the base class. @@ -344,7 +344,7 @@ multibyte support, but may enable or disable it by zend.multibyte. It doesn't make a lot of sense to enable this option without ext/mbstring, because the most functionality is implemented by mbstrings callbacks. -- Added enable_post_data_reading, which is enable by default. When it's +- Added enable_post_data_reading, which is enabled by default. When it's disabled, the POST data is not read (and processed); the behavior is similar to that of other request methods with body, like PUT. This allows reading the raw POST data in multipart requests and read/process the POST data in a Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2011-08-09 15:27:12 UTC (rev 314675) +++ php/php-src/trunk/UPGRADING 2011-08-09 15:27:25 UTC (rev 314676) @@ -100,7 +100,7 @@ To create a generic object you can use StdClass: $test = new StdClass; - $text-baz = 1; + $test-baz = 1; = 4. Changes made to existing functions @@ -328,7 +328,7 @@ multibyte support, but may enable or disable it by zend.multibyte. It doesn't make a lot of sense to enable this option without ext/mbstring, because the most functionality is implemented by mbstrings callbacks. -- Added enable_post_data_reading, which is enable by default. When it's +- Added enable_post_data_reading, which is enabled by default. When it's disabled, the POST data is not read (and processed); the behavior is similar to that of other request methods with body, like PUT. This allows reading the raw POST data in multipart requests and read/process the POST data in a -- 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/build/genif.sh branches/PHP_5_4/build/genif.sh trunk/build/genif.sh
scottmac Tue, 09 Aug 2011 18:12:06 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314686 Log: Fix building of pure C++ extensions as static Changed paths: U php/php-src/branches/PHP_5_3/build/genif.sh U php/php-src/branches/PHP_5_4/build/genif.sh U php/php-src/trunk/build/genif.sh Modified: php/php-src/branches/PHP_5_3/build/genif.sh === --- php/php-src/branches/PHP_5_3/build/genif.sh 2011-08-09 16:05:19 UTC (rev 314685) +++ php/php-src/branches/PHP_5_3/build/genif.sh 2011-08-09 18:12:06 UTC (rev 314686) @@ -24,7 +24,7 @@ module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk` for ext in ${1+$@} ; do - header_list=$header_list ext/$ext/*.h + header_list=$header_list ext/$ext/*.h* done includes=`$awk -f ./build/print_include.awk $header_list` Modified: php/php-src/branches/PHP_5_4/build/genif.sh === --- php/php-src/branches/PHP_5_4/build/genif.sh 2011-08-09 16:05:19 UTC (rev 314685) +++ php/php-src/branches/PHP_5_4/build/genif.sh 2011-08-09 18:12:06 UTC (rev 314686) @@ -24,7 +24,7 @@ module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk` for ext in ${1+$@} ; do - header_list=$header_list ext/$ext/*.h + header_list=$header_list ext/$ext/*.h* done includes=`$awk -f ./build/print_include.awk $header_list` Modified: php/php-src/trunk/build/genif.sh === --- php/php-src/trunk/build/genif.sh2011-08-09 16:05:19 UTC (rev 314685) +++ php/php-src/trunk/build/genif.sh2011-08-09 18:12:06 UTC (rev 314686) @@ -24,7 +24,7 @@ module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk` for ext in ${1+$@} ; do - header_list=$header_list ext/$ext/*.h + header_list=$header_list ext/$ext/*.h* done includes=`$awk -f ./build/print_include.awk $header_list` -- 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/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php
nlopess Tue, 09 Aug 2011 21:53:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314690 Log: terminate timeouting processes with SIGKILL (9) Changed paths: U php/php-src/branches/PHP_5_3/run-tests.php U php/php-src/branches/PHP_5_4/run-tests.php U php/php-src/trunk/run-tests.php Modified: php/php-src/branches/PHP_5_3/run-tests.php === --- php/php-src/branches/PHP_5_3/run-tests.php 2011-08-09 21:35:31 UTC (rev 314689) +++ php/php-src/branches/PHP_5_3/run-tests.php 2011-08-09 21:53:44 UTC (rev 314690) @@ -1080,7 +1080,7 @@ } else if ($n === 0) { /* timed out */ $data .= b\n ** ERROR: process timed out **\n; - proc_terminate($proc); + proc_terminate($proc, 9); return $data; } else if ($n 0) { $line = (binary) fread($pipes[1], 8192); Modified: php/php-src/branches/PHP_5_4/run-tests.php === --- php/php-src/branches/PHP_5_4/run-tests.php 2011-08-09 21:35:31 UTC (rev 314689) +++ php/php-src/branches/PHP_5_4/run-tests.php 2011-08-09 21:53:44 UTC (rev 314690) @@ -1080,7 +1080,7 @@ } else if ($n === 0) { /* timed out */ $data .= b\n ** ERROR: process timed out **\n; - proc_terminate($proc); + proc_terminate($proc, 9); return $data; } else if ($n 0) { $line = (binary) fread($pipes[1], 8192); Modified: php/php-src/trunk/run-tests.php === --- php/php-src/trunk/run-tests.php 2011-08-09 21:35:31 UTC (rev 314689) +++ php/php-src/trunk/run-tests.php 2011-08-09 21:53:44 UTC (rev 314690) @@ -1082,7 +1082,7 @@ } else if ($n === 0) { /* timed out */ $data .= b\n ** ERROR: process timed out **\n; - proc_terminate($proc); + proc_terminate($proc, 9); return $data; } else if ($n 0) { $line = (binary) fread($pipes[1], 8192); -- 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_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c
pierrick Wed, 10 Aug 2011 01:12:52 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314694 Log: Remove unused variable Changed paths: U php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c Modified: php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c === --- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c 2011-08-10 00:31:45 UTC (rev 314693) +++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c 2011-08-10 01:12:52 UTC (rev 314694) @@ -423,7 +423,7 @@ int mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) { - int i, j; + int i; int c1, c2, s1, s2, mode; s1 = 0; Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c === --- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c 2011-08-10 00:31:45 UTC (rev 314693) +++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c 2011-08-10 01:12:52 UTC (rev 314694) @@ -423,7 +423,7 @@ int mbfl_filt_conv_wchar_sjis_mac(int c, mbfl_convert_filter *filter) { - int i, j; + int i; int c1, c2, s1, s2, mode; s1 = 0; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php