[PHP-CVS] com php-src: remove dead and unused for more than 8 years code: ext/mysqli/mysqli_report.h ext/mysqli/package.xml ext/mysqli/php_mysqli_structs.h
Commit:57f7bd0d858542cfc23a35b9f619137489c873f9 Author:andrey Thu, 3 May 2012 12:22:25 +0200 Parents: 62de1cfe3386190eeb9fc3f4cd9067e58fd88f18 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57f7bd0d858542cfc23a35b9f619137489c873f9 Log: remove dead and unused for more than 8 years code Changed paths: D ext/mysqli/mysqli_report.h M ext/mysqli/package.xml M ext/mysqli/php_mysqli_structs.h Diff: diff --git a/ext/mysqli/mysqli_report.h b/ext/mysqli/mysqli_report.h deleted file mode 100644 index 4035a4b..000 --- a/ext/mysqli/mysqli_report.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - +--+ - | PHP Version 5| - +--+ - | Copyright (c) 1997-2012 The PHP Group| - +--+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is| - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | lice...@php.net so we can mail you a copy immediately. | - +--+ - | Author: Georg Richter | - +--+ - - $Id$ -*/ - -#ifndef __HAVE_MYSQLI_PROFILER_H__ -#define __HAVE_MYSQLI_PROFILER_H__ - -#ifdef PHP_WIN32 -#include -#include -#include "win32/time.h" -#else -#include -#include -#include -#include -#include -#endif - -typedef struct { - struct timeval starttime, - endtime;/* execution time */ -} PR_TIME_INFO; - - -#define MYSQLI_PR_REPORT_STDERR1 -#define MYSQLI_PR_REPORT_PORT 2 - - - -/*** PROFILER MACROS ***/ -#define MYSQLI_PROFILER_STARTTIME(ptr) if (MyG(profiler.mode)) gettimeofday(&ptr.starttime, NULL) -#define MYSQLI_PROFILER_ENDTIME(ptr) if (MyG(profiler.mode)) gettimeofday(&ptr.endtime, NULL) -#define MYSQLI_PROFILER_REPORT(_type, _time, ptr) if (MyG(profiler.mode)) php_mysqli_profiler_report(_type, _time, (void *)ptr) - - - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ diff --git a/ext/mysqli/package.xml b/ext/mysqli/package.xml index 6de81d7..c27316a 100644 --- a/ext/mysqli/package.xml +++ b/ext/mysqli/package.xml @@ -43,7 +43,6 @@ package.xml added to support installation using pear installer - diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index ed468e2..32e3e1e 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -131,12 +131,6 @@ typedef struct { } MY_MYSQL; typedef struct { - int mode; - int socket; - FILE*fp; -} PROFILER; - -typedef struct { void*ptr; /* resource: (mysql, result, stmt) */ void*info; /* additional buffer */ enum mysqli_status status; /* object status */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix typo: Zend/zend_interfaces.c
Commit:bbf8a50281ae46c6572bd5e68f62826cde356a28 Author:Xinchen Hui Thu, 3 May 2012 18:37:19 +0800 Parents: 69ed09a31c6ebb07c85013d1fab33b48efb438e1 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bbf8a50281ae46c6572bd5e68f62826cde356a28 Log: Fix typo picked form pull request of reeze@gmail.com Changed paths: M Zend/zend_interfaces.c Diff: diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 218bad4..47dbe0b 100755 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -127,7 +127,7 @@ ZEND_API zval *zend_user_it_new_iterator(zend_class_entry *ce, zval *object TSRM } /* }}} */ -/* {{{ zend_user_it_dtor */ +/* {{{ zend_user_it_invalidate_current */ ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC) { zend_user_iterator *iter = (zend_user_iterator*)_iter; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4: Zend/zend_interfaces.c
Commit:75d23f571479b15e48e3f51aa6ec12759f5fef01 Author:Xinchen Hui Thu, 3 May 2012 18:40:57 +0800 Parents: cdce62b724379ea2eb22c0cac426ca6db187d5d4 bbf8a50281ae46c6572bd5e68f62826cde356a28 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75d23f571479b15e48e3f51aa6ec12759f5fef01 Log: Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 * origin/PHP-5.3: Fix typo Changed paths: MM Zend/zend_interfaces.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: here comes the news: NEWS
Commit:0ce37188cd06d498049d009af3db579ebe0ce298 Author:andrey Thu, 3 May 2012 13:02:34 +0200 Parents: e0c7ed91a4e14ff1a166dd46fceaf6ae4af0fd19 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0ce37188cd06d498049d009af3db579ebe0ce298 Log: here comes the news Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index ff5a31d..42c2f83 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,10 @@ PHP NEWS still exists for backward compatibility but is doing nothing). (Pierrick) . Fixed bug #54995 (Missing CURLINFO_RESPONSE_CODE support). (Pierrick) +- MySQLi + . Dropped support for LOAD DATA LOCAL INFILE handlers when using libmysql. +Known for stability problems. (Andrey) + - PCRE: . Deprecated the /e modifier (https://wiki.php.net/rfc/remove_preg_replace_eval_modifier). (Nikita Popov) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: phoenix from the ashes: ext/mysqli/tests/local_infile_tools.inc
Commit:b850fa14e0fc75cc025972ab1582fbf56f9d2770 Author:andrey Thu, 3 May 2012 13:34:26 +0200 Parents: 0ce37188cd06d498049d009af3db579ebe0ce298 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b850fa14e0fc75cc025972ab1582fbf56f9d2770 Log: phoenix from the ashes Changed paths: A ext/mysqli/tests/local_infile_tools.inc Diff: diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc new file mode 100644 index 000..bb9872f --- /dev/null +++ b/ext/mysqli/tests/local_infile_tools.inc @@ -0,0 +1,156 @@ +errno) { + return $link->error; + } + } + mysqli_query($link, sprintf('DROP TABLE IF EXISTS %s', $table_name)); + return ""; + } + + function create_standard_csv($offset, $verbose = true) { + // create a CVS file + $file = tempnam(sys_get_temp_dir(), 'mysqli_test'); + if (!$fp = fopen($file, 'w')) { + if ($verbose) + printf("[%03d + 1] Cannot create CVS file '%s'\n", $offset, $file); + return NULL; + } else { + /* Looks ugly? No, handy if you have crashes... */ + register_shutdown_function("shutdown_clean", $file); + } + + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { + if (!fwrite($fp, (binary)"'97';'x';\n") || + !fwrite($fp, (binary)"'98';'y';\n") || + !fwrite($fp, (binary)"99;'z';\n")) { + if ($verbose) + printf("[%03d + 2] Cannot write CVS file '%s'\n", $offset, $file); + return NULL; + } + } else { + if (!fwrite($fp, "97;'x';\n") || + !fwrite($fp, "98;'y';\n") || + !fwrite($fp, "99;'z';\n")) { + if ($verbose) + printf("[%03d + 3] Cannot write CVS file '%s'\n", $offset, $file); + return NULL; + } + } + + fclose($fp); + + if (!chmod($file, 0644)) { + if ($verbose) + printf("[%03d + 4] Cannot change the file perms of '%s' from 0600 to 0644, MySQL might not be able to read it\n", + $offset, $file); + return NULL; + } + return $file; + } + + function try_handler($offset, $link, $file, $handler, $expected = null) { + + if ('default' == $handler) { + mysqli_set_local_infile_default($link); + } else if (!mysqli_set_local_infile_handler($link, $handler)) { + printf("[%03d] Cannot set infile handler to '%s'\n", $offset, $handler); + return false; + } + printf("Callback set to '%s'\n", $handler); + + if (!mysqli_query($link, sprintf("DELETE FROM test"))) { + printf("[%03d] Cannot remove records, [%d] %s\n", $offset + 1, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' + INTO TABLE test + FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\'' + LINES TERMINATED BY '\n'", + mysqli_real_escape_string($link, $file { + printf("[%03d] LOAD DATA failed, [%d] %s\n", + $offset + 2, + mysqli_errno($link), mysqli_error($link)); + } + + if (!$res = mysqli_query($link, "SELECT id, label FROM test ORDER BY id")) { + printf("[%03d] [%d] %s\n", $offset + 3, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!is_array($expected)) + return true; + + foreach ($expected as $k => $values) { + if (!$tmp = mysqli_fetch_assoc($res)) { + printf("[%03d/%d] [%d] '%s'\n", $offset + 4, $k, mysqli_errno($link), mysqli_error($link)); + return false; + } + if ($values['id'] != $tmp['id']) { + printf("[%03d/%d] Expecting %s got %s\n", + $offset + 5, $k, + $values['id'], $tmp['id']); +
[PHP-CVS] com php-src: Fixed test bug #61892: Zend/tests/gc_029.phpt Zend/tests/gc_029_zts.phpt
Commit:d74d88fbb9c29b1dd5ff05a54b72cf7c9250955c Author:Xinchen Hui Thu, 3 May 2012 19:56:49 +0800 Parents: 75d23f571479b15e48e3f51aa6ec12759f5fef01 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d74d88fbb9c29b1dd5ff05a54b72cf7c9250955c Log: Fixed test bug #61892 Bugs: https://bugs.php.net/61892 Changed paths: M Zend/tests/gc_029.phpt A Zend/tests/gc_029_zts.phpt Diff: diff --git a/Zend/tests/gc_029.phpt b/Zend/tests/gc_029.phpt index 4380534..edd2317 100644 --- a/Zend/tests/gc_029.phpt +++ b/Zend/tests/gc_029.phpt @@ -1,5 +1,7 @@ --TEST-- GC 029: GC and destructors +--SKIPIF-- +bar !== null) { + $this->x = null; + unset($this->bar); + } + } +} +class Bar { + public $foo; +function __destruct() { +if ($this->foo !== null) { +unset($this->foo); +} +} + +} +$foo = new Foo(); +$bar = new Bar(); +$foo->bar = $bar; +$bar->foo = $foo; +unset($foo); +unset($bar); +var_dump(gc_collect_cycles()); +?> +--EXPECT-- +int(3) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: bump mysqlnd versions: ext/mysqlnd/mysqlnd.h
Commit:267f691a45cc18a819bc2742b87dc7eae91934bc Author:andrey Thu, 3 May 2012 15:33:47 +0200 Parents: b850fa14e0fc75cc025972ab1582fbf56f9d2770 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=267f691a45cc18a819bc2742b87dc7eae91934bc Log: bump mysqlnd versions Changed paths: M ext/mysqlnd/mysqlnd.h Diff: diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index c32ac72..8cf 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -22,10 +22,10 @@ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Id$" -#define MYSQLND_VERSION_ID 50010 +#define MYSQLND_VERSION "mysqlnd 5.0.11-dev - 20120503 - $Id$" +#define MYSQLND_VERSION_ID 50011 -#define MYSQLND_PLUGIN_API_VERSION 1 +#define MYSQLND_PLUGIN_API_VERSION 2 #define MYSQLND_STRING_TO_INT_CONVERSION /* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config): NEWS Zend/zend.c
Commit:72f19e9a8bcf5712b24fa333a26616eff19ac1ce Author:Xinchen Hui Thu, 3 May 2012 22:39:53 +0800 Parents: d74d88fbb9c29b1dd5ff05a54b72cf7c9250955c Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=72f19e9a8bcf5712b24fa333a26616eff19ac1ce Log: Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) Bugs: https://bugs.php.net/61922 Changed paths: M NEWS M Zend/zend.c Diff: diff --git a/NEWS b/NEWS index 8796cf4..9ef6abf 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,8 @@ PHP NEWS (Laruence) - Core: + . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config). +(Laruence) . Fixed missing bound check in iptcparse(). (chris at chiappa.net) . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy) . Fixed bug #61761 ('Overriding' a private static method with a different diff --git a/Zend/zend.c b/Zend/zend.c index dd299f1..37a1a27 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -781,6 +781,8 @@ void zend_register_standard_ini_entries(TSRMLS_D) /* {{{ */ void zend_post_startup(TSRMLS_D) /* {{{ */ { #ifdef ZTS + zend_encoding **script_encoding_list; + zend_compiler_globals *compiler_globals = ts_resource(compiler_globals_id); zend_executor_globals *executor_globals = ts_resource(executor_globals_id); @@ -795,7 +797,12 @@ void zend_post_startup(TSRMLS_D) /* {{{ */ zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); free(compiler_globals->function_table); free(compiler_globals->class_table); - compiler_globals_ctor(compiler_globals, tsrm_ls); + if ((script_encoding_list = (zend_encoding **)compiler_globals->script_encoding_list)) { + compiler_globals_ctor(compiler_globals, tsrm_ls); + compiler_globals->script_encoding_list = (const zend_encoding **)script_encoding_list; + } else { + compiler_globals_ctor(compiler_globals, tsrm_ls); + } free(EG(zend_constants)); executor_globals_ctor(executor_globals, tsrm_ls); global_persistent_list = &EG(persistent_list); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config): NEWS Zend/zend.c
Hi, Dmitry: you may want to review this, :) thanks On Thu, May 3, 2012 at 10:39 PM, Xinchen Hui wrote: > Commit: 72f19e9a8bcf5712b24fa333a26616eff19ac1ce > Author: Xinchen Hui Thu, 3 May 2012 22:39:53 > +0800 > Parents: d74d88fbb9c29b1dd5ff05a54b72cf7c9250955c > Branches: PHP-5.4 > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=72f19e9a8bcf5712b24fa333a26616eff19ac1ce > > Log: > Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) > > Bugs: > https://bugs.php.net/61922 > > Changed paths: > M NEWS > M Zend/zend.c > > > Diff: > diff --git a/NEWS b/NEWS > index 8796cf4..9ef6abf 100644 > --- a/NEWS > +++ b/NEWS > @@ -10,6 +10,8 @@ PHP > NEWS > (Laruence) > > - Core: > + . Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config). > + (Laruence) > . Fixed missing bound check in iptcparse(). (chris at chiappa.net) > . Fixed bug #61827 (incorrect \e processing on Windows) (Anatoliy) > . Fixed bug #61761 ('Overriding' a private static method with a different > diff --git a/Zend/zend.c b/Zend/zend.c > index dd299f1..37a1a27 100644 > --- a/Zend/zend.c > +++ b/Zend/zend.c > @@ -781,6 +781,8 @@ void zend_register_standard_ini_entries(TSRMLS_D) /* {{{ > */ > void zend_post_startup(TSRMLS_D) /* {{{ */ > { > #ifdef ZTS > + zend_encoding **script_encoding_list; > + > zend_compiler_globals *compiler_globals = > ts_resource(compiler_globals_id); > zend_executor_globals *executor_globals = > ts_resource(executor_globals_id); > > @@ -795,7 +797,12 @@ void zend_post_startup(TSRMLS_D) /* {{{ */ > zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); > free(compiler_globals->function_table); > free(compiler_globals->class_table); > - compiler_globals_ctor(compiler_globals, tsrm_ls); > + if ((script_encoding_list = (zend_encoding > **)compiler_globals->script_encoding_list)) { > + compiler_globals_ctor(compiler_globals, tsrm_ls); > + compiler_globals->script_encoding_list = (const zend_encoding > **)script_encoding_list; > + } else { > + compiler_globals_ctor(compiler_globals, tsrm_ls); > + } > free(EG(zend_constants)); > executor_globals_ctor(executor_globals, tsrm_ls); > global_persistent_list = &EG(persistent_list); > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Laruence Xinchen Hui http://www.laruence.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.4.2: NEWS configure.in main/php_version.h
Commit:32246bf50749709a9f99feda09088181598e5121 Author:David Soria Parra Thu, 3 May 2012 18:58:52 +0200 Parents: 55869a95ab75c0eb99c57201bfeccaef57e0d36d Branches: PHP-5.4.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32246bf50749709a9f99feda09088181598e5121 Log: PHP 5.4.2 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 5468348..de1e55f 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ PHPNEWS ||| +03 Mar 2012, PHP 5.4.2 + +- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus) + 26 Apr 2012, PHP 5.4.1 - CLI Server: diff --git a/configure.in b/configure.in index e081ae4..2470856 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 -PHP_RELEASE_VERSION=1 +PHP_RELEASE_VERSION=2 PHP_EXTRA_VERSION="" 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 585c84e..e609c7a 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 1 +#define PHP_RELEASE_VERSION 2 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.4.1" -#define PHP_VERSION_ID 50401 +#define PHP_VERSION "5.4.2" +#define PHP_VERSION_ID 50402 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix for CVE-2012-1823: sapi/cgi/cgi_main.c
Commit:55869a95ab75c0eb99c57201bfeccaef57e0d36d Author:Rasmus Lerdorf Thu, 3 May 2012 15:51:52 +0200 Committer: David Soria Parra Thu, 3 May 2012 18:56:07 +0200 Parents: 02db9931c8ccbe7ab0b4adb9af44577c27213eeb Branches: PHP-5.4.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=55869a95ab75c0eb99c57201bfeccaef57e0d36d Log: Fix for CVE-2012-1823 Changed paths: M sapi/cgi/cgi_main.c Diff: diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 1e40387..84e0d63 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -70,6 +70,7 @@ #include "php_main.h" #include "fopen_wrappers.h" #include "ext/standard/php_standard.h" +#include "ext/standard/url.h" #ifdef PHP_WIN32 # include @@ -1752,6 +1753,9 @@ int main(int argc, char *argv[]) #ifndef PHP_WIN32 int status = 0; #endif + char *query_string; + char *decoded_query_string; + int skip_getopt = 0; #if 0 && defined(PHP_DEBUG) /* IIS is always making things more difficult. This allows @@ -1802,7 +1806,16 @@ int main(int argc, char *argv[]) } } - while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { + if(query_string = getenv("QUERY_STRING")) { + decoded_query_string = strdup(query_string); + php_url_decode(decoded_query_string, strlen(decoded_query_string)); + if(*decoded_query_string == '-' && strchr(decoded_query_string, '=') == NULL) { + skip_getopt = 1; + } + free(decoded_query_string); + } + + while (!skip_getopt && (c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { switch (c) { case 'c': if (cgi_sapi_module.php_ini_path_override) { -- 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.4.2
Tag php-5.4.2 in php-src.git was created Tag: 5415480e3a04677a2c853c909e4a739fe83c02c4 Tagger: David Soria Parra Thu May 3 19:11:03 2012 +0200 Log: PHP 5.4.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJPorwrAAoJEME8cLhyZ7UtMCwP/2a4h9xvJXSMmhkIyOinJsru uAghAPQIEkeCgcXHrnJkV5uyQHIV6Rtd1scQT8ZzT+lr3XWRC1LfeDylauKjRouP PihW0z81rG5j9FSuBYYxZNlQNVjf2qnM2QjY/5ZLb7h+K4Z7WtqPnRZr09ru0NRV +CKeKVrCQu4Bje8qZR9aVKjRkhHR9O37wiJUiyFduYzdV6+OFyAfQoAbz6epFoEB rs+KBToG+JSu2fq6+Fb74ItFnSejxEAEyNzAO9BbbkttO1Lcvp+klPmEUrsilw7P 9htC0nnDefOfGWET0bN+Mo/S+dt/Y0rHr6NvIctxbGzLXG2txEZgjYXZL0+eIEr8 OJrG3vqL3f/I0b7oWpI0Dd7TJ+sfkVpdaA+5SuVvmSTp73eKW1tOZuMDqLRNFp3A B9v7YCQRov/h6DBlCX6XzsucPZRStaIPffFSo5FtsQZqN6lNbenlYEqYMm31Atgs 5Wy51yMvt2HJtJao78mT6XmG889Pid/GajoCUzLVT7y97EVCSkNDuYZG70i80YOd lTaRlEyfLy8q2Ib9kQXznfeSfzelJqO8YR8kD9vNUxHp1Llmf5n7c2usJZXSurhE nm8naWnaSxcC09JOaj9a+7TajxQk+EGaR6Nx48zt9xNgcyz6/EWysFsiSRF06Ezu uNjn7y5ACMNjTh/ycwvN =Cu6Z -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=5415480e3a04677a2c853c909e4a739fe83c02c4 Target: 32246bf50749709a9f99feda09088181598e5121 Author: David Soria Parra Thu, 3 May 2012 18:58:52 +0200 Parents: 55869a95ab75c0eb99c57201bfeccaef57e0d36d Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32246bf50749709a9f99feda09088181598e5121 Target log: PHP 5.4.2 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: Fix for CVE-2012-1823: sapi/cgi/cgi_main.c
Commit:29300b1f9dab068d477b241d8fd872e3a7c829b3 Author:Rasmus Lerdorf Thu, 3 May 2012 15:51:52 +0200 Committer: Johannes Schlüter Thu, 3 May 2012 15:51:52 +0200 Parents: 704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Branches: PHP-5.3.12 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29300b1f9dab068d477b241d8fd872e3a7c829b3 Log: Fix for CVE-2012-1823 Changed paths: M sapi/cgi/cgi_main.c Diff: diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index dfd77e4..bb37aba 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -70,6 +70,7 @@ #include "php_main.h" #include "fopen_wrappers.h" #include "ext/standard/php_standard.h" +#include "ext/standard/url.h" #ifdef PHP_WIN32 # include @@ -1507,6 +1508,9 @@ int main(int argc, char *argv[]) #ifndef PHP_WIN32 int status = 0; #endif + char *query_string; + char *decoded_query_string; + int skip_getopt = 0; #if 0 && defined(PHP_DEBUG) /* IIS is always making things more difficult. This allows @@ -1556,7 +1560,16 @@ int main(int argc, char *argv[]) } } - while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { + if(query_string = getenv("QUERY_STRING")) { + decoded_query_string = strdup(query_string); + php_url_decode(decoded_query_string, strlen(decoded_query_string)); + if(*decoded_query_string == '-' && strchr(decoded_query_string, '=') == NULL) { + skip_getopt = 1; + } + free(decoded_query_string); + } + + while (!skip_getopt && (c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { switch (c) { case 'c': if (cgi_sapi_module.php_ini_path_override) { -- 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.12: NEWS configure.in main/php_version.h
Commit:03cb63bc1da6344f65a075f25721d29b59670cfe Author:Johannes Schlüter Thu, 3 May 2012 15:54:59 +0200 Parents: 29300b1f9dab068d477b241d8fd872e3a7c829b3 Branches: PHP-5.3.12 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03cb63bc1da6344f65a075f25721d29b59670cfe Log: PHP 5.3.12 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index d26ffea..6d95962 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ PHPNEWS ||| +03 Mar 2012, PHP 5.3.12 +- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus) + 26 Apr 2012, PHP 5.3.11 - Core: diff --git a/configure.in b/configure.in index a74771e..e9cf322 100644 --- a/configure.in +++ b/configure.in @@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=11 +PHP_RELEASE_VERSION=12 PHP_EXTRA_VERSION="" 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 d3037da..5103b1c 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 11 +#define PHP_RELEASE_VERSION 12 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.3.11" -#define PHP_VERSION_ID 50311 +#define PHP_VERSION "5.3.12" +#define PHP_VERSION_ID 50312 -- 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.12
Tag php-5.3.12 in php-src.git was created Tag: 215eedecc9223bfbd8572ae62423171176e6dac2 Tagger: Johannes Schlüter Thu May 3 15:55:11 2012 +0200 Log: PHP 5.3.12 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJPoo5JAAoJEH3sTmn8nIPXAbgH/jPFlin8pgWXrXhaq5huTqRT 979MC1gcnQDFk+JIoHjpQYTAeCdxxsNkbOo//qG7mvAC5y31uxFx1vWDyJIcugAE 1xL8uFfF5s1XlxZuyublTI6cKmhu7N8BuRurUKdcG6opTVdwQuzc/vQYTpfegpl3 76jOp1w1GwZ6HN85eBxG5/nrdAOQhTX+Yf6pUCngbV2FAx/Yz3DiOMZsJlFEde7d SVt7MntLiL/9AK8QxAVbPR+hd3FB91E2xb7ARWjnK8EQU5HNZo5imCSnUl5jBgHD FFCvz4P7bwtprVDeXySkiTrriLcwIb96EJN4vSEi5RRW9yLbrw+6K18r9ynC1zg= =Tutu -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=215eedecc9223bfbd8572ae62423171176e6dac2 Target: 03cb63bc1da6344f65a075f25721d29b59670cfe Author: Johannes Schlüter Thu, 3 May 2012 15:54:59 +0200 Parents: 29300b1f9dab068d477b241d8fd872e3a7c829b3 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03cb63bc1da6344f65a075f25721d29b59670cfe Target log: PHP 5.3.12 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: Merge branch 'PHP-5.3' into PHP-5.4: configure.in main/php_version.h
Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 Author:Christopher Jones Thu, 3 May 2012 12:22:39 -0700 Parents: 72f19e9a8bcf5712b24fa333a26616eff19ac1ce 0956c00af999c295c5a13644ec835da8f96ad48d Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Bump to next version Conflicts: configure.in main/php_version.h Changed paths: MM configure.in MM main/php_version.h Diff: diff --cc configure.in index edc2455,b257cbb..3d529c6 --- a/configure.in +++ b/configure.in @@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADER(main/php_config.h) +AH_TOP([ +#if defined(__GNUC__) && __GNUC__ >= 4 +# define ZEND_API __attribute__ ((visibility("default"))) +# define ZEND_DLEXPORT __attribute__ ((visibility("default"))) +#else +# define ZEND_API +# define ZEND_DLEXPORT +#endif + +#define ZEND_DLIMPORT + +#undef uint +#undef ulong + +/* Define if you want to enable memory limit support */ +#define MEMORY_LIMIT 0 +]) +AH_BOTTOM([ +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS + +#ifdef HAVE_STDLIB_H +# include +#endif + +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +#ifdef HAVE_SYS_SELECT_H +#include +#endif + +#ifdef HAVE_IEEEFP_H +# include +#endif + +#ifdef HAVE_STRING_H +# include +#else +# include +#endif + +#if ZEND_BROKEN_SPRINTF +int zend_sprintf(char *buffer, const char *format, ...); +#else +# define zend_sprintf sprintf +#endif + +#include + +/* To enable the is_nan, is_infinite and is_finite PHP functions */ +#ifdef NETWARE + #define HAVE_ISNAN 1 + #define HAVE_ISINF 1 + #define HAVE_ISFINITE 1 +#endif + +#ifndef zend_isnan +#ifdef HAVE_ISNAN +#define zend_isnan(a) isnan(a) +#elif defined(HAVE_FPCLASS) +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) +#else +#define zend_isnan(a) 0 +#endif +#endif + +#ifdef HAVE_ISINF +#define zend_isinf(a) isinf(a) +#elif defined(INFINITY) +/* Might not work, but is required by ISO C99 */ +#define zend_isinf(a) (((a)==INFINITY)?1:0) +#elif defined(HAVE_FPCLASS) +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) +#else +#define zend_isinf(a) 0 +#endif + +#ifdef HAVE_FINITE +#define zend_finite(a) finite(a) +#elif defined(HAVE_ISFINITE) || defined(isfinite) +#define zend_finite(a) isfinite(a) +#elif defined(fpclassify) +#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0) +#else +#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1) +#endif + +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ + +#ifdef NETWARE +#ifdef USE_WINSOCK +#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T +#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H +#endif +#endif + +#undef PTHREADS +]) PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=13 +PHP_MINOR_VERSION=4 - PHP_RELEASE_VERSION=2 ++PHP_RELEASE_VERSION=3 PHP_EXTRA_VERSION="-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` diff --cc main/php_version.h index 13478d1,358c6c0..3e80008 --- a/main/php_version.h +++ b/main/php_version.h @@@ -1,8 -1,8 +1,8 @@@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 13 +#define PHP_MINOR_VERSION 4 - #define PHP_RELEASE_VERSION 2 ++#define PHP_RELEASE_VERSION 3 #define PHP_EXTRA_VERSION "-dev" - #define PHP_VERSION "5.4.2-dev" - #define PHP_VERSION_ID 50402 -#define PHP_VERSION "5.3.13-dev" -#define PHP_VERSION_ID 50313 ++#define PHP_VERSION "5.4.3-dev" ++#define PHP_VERSION_ID 50403 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in main/php_version.h
Whoops - something went wrong here. On 05/03/2012 12:22 PM, Christopher Jones wrote: Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 Author:Christopher Jones Thu, 3 May 2012 12:22:39 -0700 Parents: 72f19e9a8bcf5712b24fa333a26616eff19ac1ce 0956c00af999c295c5a13644ec835da8f96ad48d Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Bump to next version Conflicts: configure.in main/php_version.h Changed paths: MM configure.in MM main/php_version.h Diff: diff --cc configure.in index edc2455,b257cbb..3d529c6 --- a/configure.in +++ b/configure.in @@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADER(main/php_config.h) +AH_TOP([ +#if defined(__GNUC__)&& __GNUC__>= 4 +# define ZEND_API __attribute__ ((visibility("default"))) +# define ZEND_DLEXPORT __attribute__ ((visibility("default"))) +#else +# define ZEND_API +# define ZEND_DLEXPORT +#endif + +#define ZEND_DLIMPORT + +#undef uint +#undef ulong + +/* Define if you want to enable memory limit support */ +#define MEMORY_LIMIT 0 +]) +AH_BOTTOM([ +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS + +#ifdef HAVE_STDLIB_H +# include +#endif + +#ifdef HAVE_SYS_TYPES_H +# include +#endif + +#ifdef HAVE_SYS_SELECT_H +#include +#endif + +#ifdef HAVE_IEEEFP_H +# include +#endif + +#ifdef HAVE_STRING_H +# include +#else +# include +#endif + +#if ZEND_BROKEN_SPRINTF +int zend_sprintf(char *buffer, const char *format, ...); +#else +# define zend_sprintf sprintf +#endif + +#include + +/* To enable the is_nan, is_infinite and is_finite PHP functions */ +#ifdef NETWARE + #define HAVE_ISNAN 1 + #define HAVE_ISINF 1 + #define HAVE_ISFINITE 1 +#endif + +#ifndef zend_isnan +#ifdef HAVE_ISNAN +#define zend_isnan(a) isnan(a) +#elif defined(HAVE_FPCLASS) +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) +#else +#define zend_isnan(a) 0 +#endif +#endif + +#ifdef HAVE_ISINF +#define zend_isinf(a) isinf(a) +#elif defined(INFINITY) +/* Might not work, but is required by ISO C99 */ +#define zend_isinf(a) (((a)==INFINITY)?1:0) +#elif defined(HAVE_FPCLASS) +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) +#else +#define zend_isinf(a) 0 +#endif + +#ifdef HAVE_FINITE +#define zend_finite(a) finite(a) +#elif defined(HAVE_ISFINITE) || defined(isfinite) +#define zend_finite(a) isfinite(a) +#elif defined(fpclassify) +#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0) +#else +#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1) +#endif + +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ + +#ifdef NETWARE +#ifdef USE_WINSOCK +#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T +#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H +#endif +#endif + +#undef PTHREADS +]) PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=13 +PHP_MINOR_VERSION=4 - PHP_RELEASE_VERSION=2 ++PHP_RELEASE_VERSION=3 PHP_EXTRA_VERSION="-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` diff --cc main/php_version.h index 13478d1,358c6c0..3e80008 --- a/main/php_version.h +++ b/main/php_version.h @@@ -1,8 -1,8 +1,8 @@@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 13 +#define PHP_MINOR_VERSION 4 - #define PHP_RELEASE_VERSION 2 ++#define PHP_RELEASE_VERSION 3 #define PHP_EXTRA_VERSION "-dev" - #define PHP_VERSION "5.4.2-dev" - #define PHP_VERSION_ID 50402 -#define PHP_VERSION "5.3.13-dev" -#define PHP_VERSION_ID 50313 ++#define PHP_VERSION "5.4.3-dev" ++#define PHP_VERSION_ID 50403 -- christopher.jo...@oracle.com http://twitter.com/#!/ghrd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php