[PHP-CVS] com php-src: Fixed bug61115-1.phpt for debug build version.: ext/standard/tests/streams/bug61115-1.phpt
Commit:e1352b04165142c945d1fc98c0bcd0b85c3f659d Author:Shein Alexey Thu, 29 Mar 2012 16:51:45 +0500 Parents: 55b1e612421c52ea0bb8a3772095c5bbd62045db Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1352b04165142c945d1fc98c0bcd0b85c3f659d Log: Fixed bug61115-1.phpt for debug build version. Bugs: https://bugs.php.net/61115 Changed paths: M ext/standard/tests/streams/bug61115-1.phpt Diff: e1352b04165142c945d1fc98c0bcd0b85c3f659d diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 43c54b4..573496e 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ?> --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/pgsql/pgsql.c
Commit:48033ed48d235be7dcfa8894e7dee6966cd4d2d7
Author:Yasuo Ohgaki Thu, 29 Mar 2012 20:06:00
+0900
Parents: dde1bff4c6463a0ff8ed70449eea0e50451e99e8
aecf5485e3af6a1e405f29f653353ae1237dbb3e
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=48033ed48d235be7dcfa8894e7dee6966cd4d2d7
Log:
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Bugs:
https://bugs.php.net/60718
Changed paths:
MM ext/pgsql/pgsql.c
Diff:
48033ed48d235be7dcfa8894e7dee6966cd4d2d7
diff --combined ext/pgsql/pgsql.c
index 327ce07,d8127af..e54b824
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -422,17 -422,6 +422,17 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_unesc
ZEND_END_ARG_INFO()
#endif
+#if HAVE_PQESCAPE
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_literal, 0, 0, 0)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_identifier, 0, 0, 0)
+ ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO()
+#endif
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_error, 0, 0, 1)
ZEND_ARG_INFO(0, result)
ZEND_END_ARG_INFO()
@@@ -663,8 -652,6 +663,8 @@@ const zend_function_entry pgsql_functio
PHP_FE(pg_escape_string,arginfo_pg_escape_string)
PHP_FE(pg_escape_bytea, arginfo_pg_escape_bytea)
PHP_FE(pg_unescape_bytea, arginfo_pg_unescape_bytea)
+ PHP_FE(pg_escape_literal, arginfo_pg_escape_literal)
+ PHP_FE(pg_escape_identifier,arginfo_pg_escape_identifier)
#endif
#if HAVE_PQSETERRORVERBOSITY
PHP_FE(pg_set_error_verbosity, arginfo_pg_set_error_verbosity)
@@@ -828,7 -815,7 +828,7 @@@ static void _php_pgsql_notice_handler(v
TSRMLS_FETCH();
if (! PGG(ignore_notices)) {
notice = (php_pgsql_notice *)emalloc(sizeof(php_pgsql_notice));
- notice->message = _php_pgsql_trim_message(message,
¬ice->len);
+ notice->message = _php_pgsql_trim_message(message, (int
*)¬ice->len);
if (PGG(log_notices)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s",
notice->message);
}
@@@ -4213,130 -4200,6 +4213,130 @@@ PHP_FUNCTION(pg_unescape_bytea
/* }}} */
#endif
+#ifdef HAVE_PQESCAPE
+#if !HAVE_PQESCAPELITERAL
+/* emulate libpq's PQescapeInternal() 9.0 or later */
+static char* php_pgsql_PQescapeInternal(PGconn *conn, const char *str, size_t
len, int escape_literal) {
+ char *result, *rp;
+ const char *s;
+ size_t tmp_len;
+ int input_len = len;
+ char quote_char = escape_literal ? '\'' : '"';
+
+ if (!conn) {
+ return NULL;
+ }
+
+ /*
+ * NOTE: multibyte strings that could cointain slashes should be
considered.
+ * (e.g. SJIS, BIG5) However, it cannot be done without valid PGconn
and mbstring.
+ * Therefore, this function does not support such encodings currently.
+ * FIXME: add encoding check and skip multibyte char bytes if there is
vaild PGconn.
+ */
+
+ /* allocate enough memory */
+ rp = result = (char *)emalloc(len*2 + 5); /* leading " E" needs extra 2
bytes + quote_chars on both end for 2 bytes + NULL */
+
+ if (escape_literal) {
+ /* check backslashes */
+ tmp_len = strspn(str, "\\");
+ if (tmp_len != len) {
+ /* add " E" for escaping slashes */
+ *rp++ = ' ';
+ *rp++ = 'E';
+ }
+ }
+ /* open quote */
+ *rp++ = quote_char;
+ for (s = str; s - str < input_len; ++s) {
+ if (*s == quote_char || (escape_literal && *s == '\\')) {
+ *rp++ = *s;
+ *rp++ = *s;
+ } else {
+ *rp++ = *s;
+ }
+ }
+ *rp++ = quote_char;
+ *rp = '\0';
+
+ return result;
+}
+#endif
+
+static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int
escape_literal) {
+ char *from = NULL, *to = NULL, *tmp = NULL;
+ zval *pgsql_link = NULL;
+ PGconn *pgsql;
+ int to_len;
+ int from_len;
+ int id = -1;
+
+ switch (ZEND_NUM_ARGS()) {
+ case 1:
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"s", &from, &from_len) == FAILURE) {
+ return;
+ }
+ pgsql_link = NULL;
+ id = PGG(default_link);
+ break;
+
+ default:
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rs", &pgsql_link, &from, &from_len) == FAILURE) {
+ return;
+ }
+ break;
+
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pgsql/pgsql.c
Commit:aecf5485e3af6a1e405f29f653353ae1237dbb3e
Author:Yasuo Ohgaki Thu, 29 Mar 2012 19:55:06
+0900
Parents: 1d8664b90b4007b81206d39f3453eb4e7987776d
931831bf75d645bdb9f079793b0224bb4843a7a3
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=aecf5485e3af6a1e405f29f653353ae1237dbb3e
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Bugs:
https://bugs.php.net/60718
Changed paths:
MM ext/pgsql/pgsql.c
Diff:
aecf5485e3af6a1e405f29f653353ae1237dbb3e
diff --combined ext/pgsql/pgsql.c
index 5702fe2,4a92944..d8127af
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -2503,8 -2503,12 +2503,8 @@@ static void php_pgsql_fetch_hash(INTERN
int should_copy=0;
const uint element_len = strlen(element);
- if (PG(magic_quotes_runtime)) {
- data = php_addslashes(element,
element_len, &data_len, 0 TSRMLS_CC);
- } else {
- data = safe_estrndup(element,
element_len);
- data_len = element_len;
- }
+ data = safe_estrndup(element, element_len);
+ data_len = element_len;
if (result_type & PGSQL_NUM) {
add_index_stringl(return_value, i,
data, data_len, should_copy);
@@@ -2879,7 -2883,7 +2879,7 @@@ PHP_FUNCTION(pg_trace
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL
link", le_link, le_plink);
- stream = php_stream_open_wrapper(z_filename, mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(z_filename, mode, REPORT_ERRORS, NULL);
if (!stream) {
RETURN_FALSE;
@@@ -3169,7 -3173,7 +3169,7 @@@ PHP_FUNCTION(pg_lo_open
} else {
pgsql_lofp->conn = pgsql;
pgsql_lofp->lofd = pgsql_lofd;
- Z_LVAL_P(return_value) =
zend_list_insert(pgsql_lofp, le_lofp);
+ Z_LVAL_P(return_value) =
zend_list_insert(pgsql_lofp, le_lofp TSRMLS_CC);
Z_TYPE_P(return_value) = IS_LONG;
}
}
@@@ -3322,22 -3326,30 +3322,22 @@@ PHP_FUNCTION(pg_lo_import
Oid returned_oid;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
- "rs|z",
&pgsql_link, &file_in, &name_len, &oid) == SUCCESS) {
+ "rp|z",
&pgsql_link, &file_in, &name_len, &oid) == SUCCESS) {
;
}
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc
TSRMLS_CC,
-
"s|z", &file_in, &name_len, &oid) == SUCCESS) {
+
"p|z", &file_in, &name_len, &oid) == SUCCESS) {
id = PGG(default_link);
CHECK_DEFAULT_LINK(id);
}
/* old calling convention, deprecated since PHP 4.2 */
else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc
TSRMLS_CC,
-"sr",
&file_in, &name_len, &pgsql_link ) == SUCCESS) {
+"pr",
&file_in, &name_len, &pgsql_link ) == SUCCESS) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Old API is used");
}
else {
WRONG_PARAM_COUNT;
}
-
- if (strlen(file_in) != name_len) {
- RETURN_FALSE;
- }
-
- if (PG(safe_mode) &&(!php_checkuid(file_in, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- RETURN_FALSE;
- }
if (php_check_open_basedir(file_in TSRMLS_CC)) {
RETURN_FALSE;
@@@ -3412,7 -3424,7 +3412,7 @@@ PHP_FUNCTION(pg_lo_export
/* allow string to handle large OID value correctly */
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC,
- "rls",
&pgsql_link, &oid_long, &file_out, &name_len) == SUCCESS) {
+ "rlp",
&pgsql_link, &oid_long, &file_out, &name_len) == SUCCESS) {
if (oid_long <= InvalidOid) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Invalid OID
specified");
RETURN
[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c
Commit:931831bf75d645bdb9f079793b0224bb4843a7a3
Author:Yasuo Ohgaki Thu, 29 Mar 2012 19:48:58
+0900
Parents: 55b1e612421c52ea0bb8a3772095c5bbd62045db
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=931831bf75d645bdb9f079793b0224bb4843a7a3
Log:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Bugs:
https://bugs.php.net/60718
Changed paths:
M ext/pgsql/pgsql.c
Diff:
931831bf75d645bdb9f079793b0224bb4843a7a3
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ebc17a3..4a92944 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4807,7 +4807,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_index_string(return_value, 2, pgsql_notify->extra,
1);
+#endif
}
}
if (result_type & PGSQL_ASSOC) {
@@ -4818,7 +4820,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_assoc_string(return_value, "payload",
pgsql_notify->extra, 1);
+#endif
}
}
PQfreemem(pgsql_notify);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less): ext/pgsql/pgsql.c
Commit:8449e0ca89d77fb20ac3326a0cf574ae2d13676c
Author:Yasuo Ohgaki Thu, 29 Mar 2012 19:48:58
+0900
Parents: fb124764de04ccd1249dd192d874ee04aada7dc0
Branches: PHP-5.3
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=8449e0ca89d77fb20ac3326a0cf574ae2d13676c
Log:
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Bugs:
https://bugs.php.net/60718
Changed paths:
M ext/pgsql/pgsql.c
Diff:
8449e0ca89d77fb20ac3326a0cf574ae2d13676c
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index ebc17a3..4a92944 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4807,7 +4807,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_index_string(return_value, 2, pgsql_notify->extra,
1);
+#endif
}
}
if (result_type & PGSQL_ASSOC) {
@@ -4818,7 +4820,9 @@ PHP_FUNCTION(pg_get_notify)
#else
if (atof(PG_VERSION) >= 9.0) {
#endif
+#if HAVE_PQPARAMETERSTATUS
add_assoc_string(return_value, "payload",
pgsql_notify->extra, 1);
+#endif
}
}
PQfreemem(pgsql_notify);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] tag php-src: create tag php-5.3.11RC1
Tag php-5.3.11RC1 in php-src.git was created Tag: b9fe2c872dd5691b22ea28db8c62ca6063be6cd7 Tagger: Johannes Schlüter Thu Mar 29 11:39:06 2012 +0200 Log: PHP-5.3.11RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPdC3QAAoJEH3sTmn8nIPXBYsH/i2mJ2nLhGvB/UxZ1hYdqKGZ BWokX+R69IqY7edYhsaHmAADtl7Fxy3qUo0uocr3lbWBSBx+JwfYk1MYq2dNdznM QD9hCXLOPCHVxZkmGXLrvJ10S6Y/D9mcDGoGZVmnd8SAY8Aje/NqTKJxE1TKVGkE k+8C2HFDxD0NkArSSIuLNE8TLm91/fv7ledym9tDpI5MiRi8C6PoR4W+mHIFYYVq nlHI8o7M3AEeaePO/Ic1RLTEapH0JkxYSyw3EexiySJQmd+foy3BBaF8A+BUeed2 JlwQEEwxKkZutEfD5JGzEBvpBmkFAGMRGNq1dWLqHwhj92DsT3gqoMq6WiP7Znw= =1Rj3 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=b9fe2c872dd5691b22ea28db8c62ca6063be6cd7 Target: 9ad0b878d91064d78bcd093a4660ea2bf99b03fb Author: Johannes Schlüter Thu, 29 Mar 2012 11:17:41 +0200 Parents: 21fa9634c19210050b130bed9f3ac77c5332080b Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ad0b878d91064d78bcd093a4660ea2bf99b03fb Target log: PHP 5.3.11RC1 Changed paths: M NEWS M configure.in M main/php_version.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.11RC1: NEWS configure.in main/php_version.h
Commit:9ad0b878d91064d78bcd093a4660ea2bf99b03fb Author:Johannes Schlüter Thu, 29 Mar 2012 11:17:41 +0200 Parents: 21fa9634c19210050b130bed9f3ac77c5332080b Branches: PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ad0b878d91064d78bcd093a4660ea2bf99b03fb Log: PHP 5.3.11RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: 9ad0b878d91064d78bcd093a4660ea2bf99b03fb diff --git a/NEWS b/NEWS index 8d69073..f10b9cf 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2012, PHP 5.3.11 +29 Mar 2012, PHP 5.3.11RC1 - Core: . Fixed bug #61273 (call_user_func_array with more than 16333 arguments diff --git a/configure.in b/configure.in index d3f96b0..1fbcb21 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=11 -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` diff --git a/main/php_version.h b/main/php_version.h index c2f3e45..f79710a 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 11 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.11-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.11RC1" #define PHP_VERSION_ID 50311 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge remote branch 'security/PHP-5.3' into PHP-5.3: NEWS
Commit:21fa9634c19210050b130bed9f3ac77c5332080b Author:Johannes Schlüter Thu, 29 Mar 2012 10:54:08 +0200 Parents: 67bf07f3e79de6653681d9317229c49b5e2415db 167e2fd78224887144496cdec2089cd5b2f3312d Branches: PHP-5.3 PHP-5.4 master PHP-5.3.11 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21fa9634c19210050b130bed9f3ac77c5332080b Log: Merge remote branch 'security/PHP-5.3' into PHP-5.3 * security/PHP-5.3: fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN open_basedir check for linkinfo NEWS entry for readline fix Add open_basedir checks to readline_write_history and readline_read_history Bugs: https://bugs.php.net/61367 Changed paths: MM NEWS Diff: 21fa9634c19210050b130bed9f3ac77c5332080b diff --combined NEWS index abda82a,366315d..8d69073 --- a/NEWS +++ b/NEWS @@@ -13,12 -13,10 +13,12 @@@ PH . Fixed bug #61072 (Memory leak when restoring an exception handler). (Nikic, Laruence) . Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX). - (Laruence) +(Laruence) + . Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831). +(Ondřej Surý) . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical - vars). (Laruence) - . Fix bug #60895 (Possible invalid handler usage in windows random +vars). (Laruence) + . Fixed bug #60895 (Possible invalid handler usage in windows random functions). (Pierre) . Fixed bug #60825 (Segfault when running symfony 2 tests). (Dmitry, Laruence) @@@ -27,20 -25,10 +27,20 @@@ . Fixed bug #60227 (header() cannot detect the multi-line header with CR). (rui, Gustavo) . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia) + . Fixed bug #54374 (Insufficient validating of upload name leading to +corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at +gmail dot com, Pierre) . Fixed bug #52719 (array_walk_recursive crashes if third param of the function is by reference). (Nikita Popov) . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry) +- DOM + . Added debug info handler to DOM objects. (Gustavo, Joey Smith) + +- FPM + . Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). +(michaelhood at gmail dot com, Ilia) + - Ibase . Fixed bug #60947 (Segmentation fault while executing ibase_db_info). (Ilia) @@@ -54,6 -42,10 +54,10 @@@ - Firebird Database extension (ibase): . Fixed bug #60802 (ibase_trans() gives segfault when passing params). + - Libxml: + . Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN). + (Tim Starling) + - mysqli . Fixed bug #61003 (mysql_stat() require a valid connection). (Johannes). @@@ -83,6 -75,8 +87,8 @@@ - Readline: . Fixed bug #61088 (Memory leak in readline_callback_handler_install). (Nikic, Laruence) + . Add open_basedir checks to readline_write_history and readline_read_history. + (Rasmus, reported by Mateusz Goik) - Reflection: . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads @@@ -97,8 -91,6 +103,8 @@@ User-Agent header). (carloschilazo at gmail dot com) . Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). (Ilia) + . Fixed bug #49853 (Soap Client stream context header option ignored). +(Dmitry) - SPL . Fixed memory leak when calling SplFileInfo's constructor twice. (Felipe) @@@ -136,8 -128,7 +142,8 @@@ . Fixed bug #54682 (tidy null pointer dereference). (Tony, David Soria Parra) - XMLRPC: - . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary variable). (Nikita Popov) + . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary +variable). (Nikita Popov) . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikic) - Zlib: @@@ -252,8 -243,6 +258,8 @@@ for small images). (Florian) - Intl: + . Fixed bug #61487 (Incorrent bounds checking in grapheme_strpos). +(Stas) . Fixed bug #60192 (SegFault when Collator not constructed properly). (Florian) . Fixed memory leak in several Intl locale functions. (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert "Merge branch 'pull-request/24'" (apply correct workflow): ext/pcntl/pcntl.c
Commit:57af2875dc1bdc8768784c323d8449c02df3cff5
Author:Gustavo André dos Santos Lopes Thu, 29
Mar 2012 08:41:51 +0100
Parents: a00b447b34c21efab393fef063acaae652506938
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=57af2875dc1bdc8768784c323d8449c02df3cff5
Log:
Revert "Merge branch 'pull-request/24'" (apply correct workflow)
This reverts commit a00b447b34c21efab393fef063acaae652506938, reversing
changes made to 48daddf093b491d359b77919464827ffb20a3e86.
Changed paths:
M ext/pcntl/pcntl.c
Diff:
57af2875dc1bdc8768784c323d8449c02df3cff5
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index ecb51c1..141ff58 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argument list */
+ /* Build argumnent list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch '5.4': ext/pcntl/pcntl.c
Commit:fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
Author:Gustavo André dos Santos Lopes Thu, 29
Mar 2012 08:48:13 +0100
Parents: 57af2875dc1bdc8768784c323d8449c02df3cff5
f4873c68a600dcd0c6c548c9ecf2d605da878252
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
Log:
Merge branch '5.4'
Changed paths:
MM ext/pcntl/pcntl.c
Diff:
fc4482fd5e95dbdcc984eff6b8084a9e8949d09c
diff --combined ext/pcntl/pcntl.c
index 141ff58,e5910a5..ecb51c1
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@@ -760,7 -760,7 +760,7 @@@ PHP_FUNCTION(pcntl_exec
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argumnent list */
+ /* Build argument list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
@@@ -868,7 -868,7 +868,7 @@@ PHP_FUNCTION(pcntl_signal
}
/* Special long value case for SIG_DFL and SIG_IGN */
- if (Z_TYPE_P(handle)==IS_LONG) {
+ if (Z_TYPE_P(handle) == IS_LONG) {
if (Z_LVAL_P(handle) != (long) SIG_DFL && Z_LVAL_P(handle) !=
(long) SIG_IGN) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
value for handle argument specified");
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow): ext/pcntl/pcntl.c
Commit:616d8029747626d24a07156bdfa5e565a88c85f2
Author:Gustavo André dos Santos Lopes Thu, 29
Mar 2012 08:45:00 +0100
Parents: fe79276371e51a8ee8dff6d5151f902e2129057c
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=616d8029747626d24a07156bdfa5e565a88c85f2
Log:
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 4aeabaf8e938af00d6fe9f8316251b543640018c.
Changed paths:
M ext/pcntl/pcntl.c
Diff:
616d8029747626d24a07156bdfa5e565a88c85f2
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index e5910a5..725d55b 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argument list */
+ /* Build argumnent list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch '5.3' into 5.4: ext/pcntl/pcntl.c
Commit:f4873c68a600dcd0c6c548c9ecf2d605da878252
Author:Gustavo André dos Santos Lopes Thu, 29
Mar 2012 08:47:58 +0100
Parents: 616d8029747626d24a07156bdfa5e565a88c85f2
67bf07f3e79de6653681d9317229c49b5e2415db
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f4873c68a600dcd0c6c548c9ecf2d605da878252
Log:
Merge branch '5.3' into 5.4
Conflicts:
main/output.c
Changed paths:
MM ext/pcntl/pcntl.c
Diff:
f4873c68a600dcd0c6c548c9ecf2d605da878252
diff --combined ext/pcntl/pcntl.c
index 725d55b,b840066..e5910a5
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@@ -760,7 -760,7 +760,7 @@@ PHP_FUNCTION(pcntl_exec
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argumnent list */
+ /* Build argument list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
@@@ -849,11 -849,6 +849,11 @@@ PHP_FUNCTION(pcntl_signal
return;
}
+ if (signo < 1 || signo > 32) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid signal");
+ RETURN_FALSE;
+ }
+
if (!PCNTL_G(spares)) {
/* since calling malloc() from within a signal handler is not
portable,
* pre-allocate a few records for recording signals */
@@@ -869,9 -864,8 +869,9 @@@
/* Special long value case for SIG_DFL and SIG_IGN */
if (Z_TYPE_P(handle)==IS_LONG) {
- if (Z_LVAL_P(handle)!= (long) SIG_DFL && Z_LVAL_P(handle) !=
(long) SIG_IGN) {
+ if (Z_LVAL_P(handle) != (long) SIG_DFL && Z_LVAL_P(handle) !=
(long) SIG_IGN) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
value for handle argument specified");
+ RETURN_FALSE;
}
if (php_signal(signo, (Sigfunc *) Z_LVAL_P(handle), (int)
restart_syscalls) == SIG_ERR) {
PCNTL_G(last_error) = errno;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: ext/pcntl/pcntl.c: Fix typo in comment: ext/pcntl/pcntl.c
Commit:710335b2a329c7ab7e2a790aefd489890d528b9a
Author:Jille Timmermans Wed, 28 Mar 2012 16:18:23
+0200
Committer: Gustavo André dos Santos Lopes Thu, 29 Mar
2012 08:46:04 +0100
Parents: 117cdf384f5c65e679087ee6402143e2170b8b4b
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=710335b2a329c7ab7e2a790aefd489890d528b9a
Log:
ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans
Changed paths:
M ext/pcntl/pcntl.c
Diff:
710335b2a329c7ab7e2a790aefd489890d528b9a
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 5151d1f..b840066 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argumnent list */
+ /* Build argument list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow): ext/pcntl/pcntl.c
Commit:117cdf384f5c65e679087ee6402143e2170b8b4b
Author:Gustavo André dos Santos Lopes Thu, 29
Mar 2012 08:44:19 +0100
Parents: 55b1e612421c52ea0bb8a3772095c5bbd62045db
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=117cdf384f5c65e679087ee6402143e2170b8b4b
Log:
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 55b1e612421c52ea0bb8a3772095c5bbd62045db.
Changed paths:
M ext/pcntl/pcntl.c
Diff:
117cdf384f5c65e679087ee6402143e2170b8b4b
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index b840066..5151d1f 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -760,7 +760,7 @@ PHP_FUNCTION(pcntl_exec)
}
if (ZEND_NUM_ARGS() > 1) {
- /* Build argument list */
+ /* Build argumnent list */
args_hash = HASH_OF(args);
argc = zend_hash_num_elements(args_hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
