Re: [PHP-CVS] com php-src: DNS name comparison is now case insensitive.: ext/openssl/openssl.c ext/openssl/tests/bug65729.phpt
Hi, On Tue, 2013-10-08 at 02:07 +, Michael Wallner wrote: > > Log: > DNS name comparison is now case insensitive. > - if (strcmp(subjectname, certname) == 0) { > + if (strcasecmp(subjectname, certname) == 0) { Shouldn't that use an non-locale-dependent (ASCII based) comparison? Else we get into trouble with the famous tolower(toupper('i')) != 'i' issue in Turkish locales. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Make 'make distclean' remove the downloaded pear PHAR: Makefile.global
hi, On Mon, 2013-09-30 at 22:46 +, Christopher Jones wrote: > Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce > Author:Christopher Jones Mon, 30 Sep 2013 15:46:22 > -0700 > Parents: d4d6a95105feb3d7a39a5dfea7c4cd3080097295 > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=d7baf0427fb56cbde55495e5c2071b1cdacb94ce > > Log: > Make 'make distclean' remove the downloaded pear PHAR My understanding of what "distclean" should do is "clean it up to distribution state". Distribution tarballs should have the pear file as bundled by the release script and therefore the pear file should not be removed. I agree that we might need an "obvious" way for git users to update that file from time to time. (I assume that is the intention with this) johannes > Changed paths: > M Makefile.global > > > Diff: > diff --git a/Makefile.global b/Makefile.global > index 05c5d15..c56ef99 100644 > --- a/Makefile.global > +++ b/Makefile.global > @@ -125,6 +125,7 @@ distclean: clean > rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm > sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html > rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h > ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h > ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h > ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h > ext/iconv/php_php_iconv_impl.h > rm -f ext/phar/phar.phar ext/phar/phar.php > + rm -f pear/install-pear-nozlib.phar > if test "$(srcdir)" != "$(builddir)"; then \ > rm -f ext/phar/phar/phar.inc; \ > fi > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] git branches 5.3/ 5.4 / 5.5
Hi, there were branches with the names 5.3 5.4 5.5 in our main repository. This was confusing with PHP-5.x which we use. As those where full merged they were most likely pushed by accident. I have deleted them from the repo. Important: To ensure you don't push them by accident please run this command to delete them from your local clone: $ git branch -d 5.3 5.4 5.5 Deleted branch 5.3 (was 15b554c). Deleted branch 5.4 (was bcdac75). Deleted branch 5.5 (was 4c76215). In case you committed anything to those branches the operation will fail and you can preserve those changes. I have archived those branches under the branch names backup5.[345] on my github clone: https://github.com/johannes/php-src/tree/backup5.3 https://github.com/johannes/php-src/tree/backup5.4 https://github.com/johannes/php-src/tree/backup5.5 johannes --- Begin Message --- Deleted branch: 5.3 User: Johannes Schlüter Thu, 15 Aug 2013 17:47:43 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php --- End Message --- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] branch php-src: 5.3 deleted
Deleted branch: 5.3 User: Johannes Schlüter Thu, 15 Aug 2013 17:47:43 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] branch php-src: 5.5 deleted
Deleted branch: 5.5 User: Johannes Schlüter Thu, 15 Aug 2013 17:47:44 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] branch php-src: 5.4 deleted
Deleted branch: 5.4 User: Johannes Schlüter Thu, 15 Aug 2013 17:47:44 + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Allow 'make distclean' to clean up the 'generated' phar.inc: Makefile.global ext/phar/Makefile.frag ext/phar/phar/phar.inc ext/phar/phar/phar.inc.in
On Thu, 2013-08-01 at 04:59 +0200, Johannes Schlüter wrote: > On Wed, 2013-07-31 at 19:31 +, Christopher Jones wrote: > > Commit:017145bc57e604153f2a2400dd6e73a397f52f96 > > Author:Christopher Jones Wed, 31 Jul 2013 > > 12:31:50 -0700 > > Parents: 4ed18d5955ad7ac0172f6eec87735fefcd113270 > > Branches: PHP-5.5 master > > > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=017145bc57e604153f2a2400dd6e73a397f52f96 > > > > Log: > > Allow 'make distclean' to clean up the 'generated' phar.inc > > This seems to be the wrong "fix" for the actual issue. Adding this to Makefile.global after reverting this commit might be better: if test $(builddir) != $(srcdir); then \ rm ext/phar/phar/phar.inc; \ fi; (untested) While I still wonder why we have to copy the file to the builddir at all .. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Allow 'make distclean' to clean up the 'generated' phar.inc: Makefile.global ext/phar/Makefile.frag ext/phar/phar/phar.inc ext/phar/phar/phar.inc.in
On Wed, 2013-07-31 at 19:31 +, Christopher Jones wrote: > Commit:017145bc57e604153f2a2400dd6e73a397f52f96 > Author:Christopher Jones Wed, 31 Jul 2013 12:31:50 > -0700 > Parents: 4ed18d5955ad7ac0172f6eec87735fefcd113270 > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=017145bc57e604153f2a2400dd6e73a397f52f96 > > Log: > Allow 'make distclean' to clean up the 'generated' phar.inc This seems to be the wrong "fix" for the actual issue. > -$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc > +$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc.in > -@test -d $(builddir)/phar || mkdir $(builddir)/phar > - -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc > $(builddir)/phar/phar.inc > + -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc.in > $(builddir)/phar/phar.inc This rule copies the file from the source to the buildir for out of tree builds ... > $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc > $(srcdir)/phar/*.php $(SAPI_CLI_PATH) > -@echo "Generating phar.php" ... where it is then used by this rule, so phar.php can include it easily or something. (a quick scan over the file didn't tell me why that .inc is different from the others ...) If sourcedir == builddir nothing should happen in the first step. If I read the Makefile correctly (mind the "$(srcdir)/phar/" argument to the "phar.php pack" call) the .in file will be added to the generated phar, too. I don't now which exact problem is meant to be solved with this change but copying files around for "no reason" seems weird. Maybe the copy from srcdir to builddir can be avoided at all? johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
johannes Mon, 29 Jul 2013 17:31:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=331029 Log: Add bukka for pecl fann Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-07-28 17:50:17 UTC (rev 331028) +++ SVNROOT/global_avail2013-07-29 17:31:03 UTC (rev 331029) @@ -376,6 +376,7 @@ avail|preilly|pecl/languages/v8js.git,phpdoc avail|adobkin|pecl/networing/apn.git,phpdoc avail|gchiesa|pecl/blenc,phpdoc +avail|bukka|pecl/tools/fann.git,phpdoc # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge from GitHub: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h
On Sun, 2013-07-28 at 09:47 +, Dmitry Stogov wrote: > index 733e544..5f414f2 100644 > --- a/ext/opcache/ZendAccelerator.h > +++ b/ext/opcache/ZendAccelerator.h > @@ -27,7 +27,7 @@ > #endif > > #define ACCELERATOR_PRODUCT_NAME "Zend OPcache" > -#define ACCELERATOR_VERSION "7.0.2-dev" > +#define ACCELERATOR_VERSION "7.0.3-dev" Having -dev versions stable branches in git is problematic as we most likely forget to change that before a release and users get "-dev" versions. Can we either remove the -dev or properly define this in README.RELEASE_PROCESS? johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 65299: NEWS ext/pdo_mysql/mysql_driver.c ext/pdo_mysql/pdo_mysql.c ext/pdo_mysql/php_pdo_mysql_int.h
Commit:7b92a227726106917a65c42676f87a88267a4770 Author:Johannes Schlüter Tue, 23 Jul 2013 14:13:22 +0200 Parents: 5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b92a227726106917a65c42676f87a88267a4770 Log: Fix bug 65299 Bugs: https://bugs.php.net/65299 Changed paths: M NEWS M ext/pdo_mysql/mysql_driver.c M ext/pdo_mysql/pdo_mysql.c M ext/pdo_mysql/php_pdo_mysql_int.h Diff: diff --git a/NEWS b/NEWS index 18bb2fd..12ab119 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ PHP NEWS . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very limited case). (Arpad) +- PDO_mysql: + . Fixed bug #65299 (pdo mysql parsing errors). (Johannes) + - SPL: . Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua Thijssen) diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index bf90f43..cd86503 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -710,7 +710,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ } } -#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND) +#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) { char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC); if (public_key) { diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 401d20d..78c4cee 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -118,7 +118,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql) REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH); REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER); -#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND) +#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY); #endif diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 42debf0..24f7aa2 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -171,7 +171,7 @@ enum { PDO_MYSQL_ATTR_SSL_CA, PDO_MYSQL_ATTR_SSL_CAPATH, PDO_MYSQL_ATTR_SSL_CIPHER, -#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND) +#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND) PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY #endif }; -- 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' into PHP-5.5: ext/pdo_mysql/mysql_driver.c
Commit:5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec Author:Johannes Schlüter Tue, 23 Jul 2013 12:57:08 +0200 Parents: 063e10b275159dc9d50228f451f94d6990a41f6d c28ab73d7346e332594c30a9a544cfd74b8bc5bb Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/pdo_mysql/mysql_driver.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix compiler warning on redefined constant: ext/pdo_mysql/mysql_driver.c
Commit:c28ab73d7346e332594c30a9a544cfd74b8bc5bb Author:Johannes Schlüter Tue, 23 Jul 2013 12:50:37 +0200 Parents: 9b6aa268a3ab431b7dcd592b922dbc399202e58d Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c28ab73d7346e332594c30a9a544cfd74b8bc5bb Log: Fix compiler warning on redefined constant Changed paths: M ext/pdo_mysql/mysql_driver.c Diff: diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index a703f93..32d13ba 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -527,9 +527,9 @@ static struct pdo_dbh_methods mysql_methods = { /* }}} */ #ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR NULL +# define PDO_DEFAULT_MYSQL_UNIX_ADDR NULL #else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +# define PDO_DEFAULT_MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ @@ -545,7 +545,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ { "dbname", "", 0 }, { "host", "localhost",0 }, { "port", "3306", 0 }, - { "unix_socket", MYSQL_UNIX_ADDR, 0 }, + { "unix_socket", PDO_DEFAULT_MYSQL_UNIX_ADDR, 0 }, }; int connect_opts = 0 #ifdef CLIENT_MULTI_RESULTS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix comment: Zend/zend_hash.h
Commit:063e10b275159dc9d50228f451f94d6990a41f6d Author:Johannes Schlüter Tue, 23 Jul 2013 12:41:24 +0200 Parents: 8aebe0f1e7003301091e91730ce50a58dc7285cb Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=063e10b275159dc9d50228f451f94d6990a41f6d Log: Fix comment Changed paths: M Zend/zend_hash.h Diff: diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index bf35771..69732cd 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -28,7 +28,7 @@ #define HASH_KEY_IS_STRING 1 #define HASH_KEY_IS_LONG 2 #define HASH_KEY_NON_EXISTENT 3 -#define HASH_KEY_NON_EXISTANT HASH_KEY_NON_EXISTENT // Keeping old define (with typo) for backward compatibility +#define HASH_KEY_NON_EXISTANT HASH_KEY_NON_EXISTENT /* Keeping old define (with typo) for backward compatibility */ #define HASH_UPDATE(1<<0) #define HASH_ADD (1<<1) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Mention git and suggest PECL for new things: CODING_STANDARDS
Commit:7daf1a6c1473e4d5f414256c02944527f2ec3c63 Author:Johannes Schlüter Fri, 19 Jul 2013 22:05:52 +0200 Parents: b278aba429ee86574f3f02294ffbcd4e858b15b1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7daf1a6c1473e4d5f414256c02944527f2ec3c63 Log: Mention git and suggest PECL for new things Changed paths: M CODING_STANDARDS Diff: diff --git a/CODING_STANDARDS b/CODING_STANDARDS index 7413be4..16ec36b 100644 --- a/CODING_STANDARDS +++ b/CODING_STANDARDS @@ -259,7 +259,10 @@ The file labelled 'EXPERIMENTAL' should include the following information:: Any authoring information (known bugs, future directions of the module). - Ongoing status notes which may not be appropriate for SVN comments. + Ongoing status notes which may not be appropriate for Git comments. + +In general new features should go to PECL or experimental branches until +there are specific reasons for directly adding it to the core distribution. Aliases & Legacy Documentation --- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update patch submitting instructions: README.SUBMITTING_PATCH
Commit:b278aba429ee86574f3f02294ffbcd4e858b15b1 Author:Johannes Schlüter Fri, 19 Jul 2013 22:00:01 +0200 Parents: 17361b9707377ef545932362615fa01b0fa7b8ab Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b278aba429ee86574f3f02294ffbcd4e858b15b1 Log: Update patch submitting instructions - we use git - pecl bugs were merged into bugs.php.net - A bit less on PEAR Changed paths: M README.SUBMITTING_PATCH Diff: diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH index 63b7156..d1b74bd 100644 --- a/README.SUBMITTING_PATCH +++ b/README.SUBMITTING_PATCH @@ -5,7 +5,7 @@ This document describes how to submit an enhancement or patch for PHP. It's easy! You don't need any login accounts or special access to download, -build, debug and begin submitting PHP, PECL or PEAR code, tests or +build, debug and begin submitting PHP or PECL code, tests or documentation. Once you've followed this README and had several patches accepted, commit privileges are often quickly granted. @@ -16,8 +16,8 @@ http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith Online Forums - There are several IRC channels where PHP developers are often -available to discuss questions. They include #php.pecl, #php.doc and -#pear on the EFNet network and #php-dev-win on FreeNode. +available to discuss questions. They include #php.pecl and #php.doc +on the EFNet network and #php-dev-win on FreeNode. PHP Patches @@ -78,7 +78,7 @@ of type 'text/*' are accepted. PECL Extension Patches: http://pecl.php.net/ If you are fixing broken functionality in a PECL extension then create -a bug or identify an existing bug at http://pecl.php.net/bugs/. A bug +a bug or identify an existing bug at http://bugs.php.net/. A bug can be used to track the patch progress and prevent your changes getting lost in the PHP mail archives. @@ -114,15 +114,15 @@ http://pear.php.net/manual/en/guide-developers.php How to create your PHP, PHP Documentation or PECL patch --- -PHP and PECL use Subversion (SVN) for revision control. Read -http://www.php.net/svn.php for help on using SVN to get and build PHP -source code. We recommend using a Sparse Directory checkout described -in http://wiki.php.net/vcs/svnfaq. If you are new to SVN, read -http://svnbook.red-bean.com. +PHP and most PECL packages use Git for revision control. Some PECL +packages use Subversion (SVN) Read http://www.php.net/git.php for help +on using Git to get and build PHP source code. We recommend to look +at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ +https://wiki.php.net/vcs/gitfaq. Generally we ask that bug fix patches work on the current stable PHP -development branches and on "trunk". New PHP features only need to -work on "trunk". +development branches and on "master". New PHP features only need to +work on "master". Read CODING_STANDARDS before you start working. @@ -134,7 +134,7 @@ comprehensive. After testing is finished, create a patch file using the command: - svn diff > your_patch.txt + git diff > your_patch.txt For ease of review and later troubleshooting, submit individual patches for each bug or feature. @@ -142,7 +142,7 @@ patches for each bug or feature. Checklist for submitting your PHP or PECL code patch - - Update SVN source just before running your final 'diff' and + - Update git source just before running your final 'diff' and before testing. - Add in-line comments and/or have external documentation ready. Use only "/* */" style comments, not "//". @@ -175,7 +175,7 @@ about these questions: What happens when your PHP or PECL patch is applied --- -Your name will likely be included in the SVN commit log. If your +Your name will likely be included in the Git commit log. If your patch affects end users, a brief description and your name might be added to the NEWS file. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Remove README about PHP 4.0 -> 4.1 API changes: README.EXTENSIONS
Commit:17361b9707377ef545932362615fa01b0fa7b8ab Author:Johannes Schlüter Fri, 19 Jul 2013 21:45:26 +0200 Parents: 85bbc8fa9dcfde80a1628ac5e05b22f14f76e222 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=17361b9707377ef545932362615fa01b0fa7b8ab Log: Remove README about PHP 4.0 -> 4.1 API changes Changed paths: D README.EXTENSIONS Diff: diff --git a/README.EXTENSIONS b/README.EXTENSIONS deleted file mode 100644 index 51e3b73..000 --- a/README.EXTENSIONS +++ /dev/null @@ -1,39 +0,0 @@ -Between PHP 4.0.6 and 4.1.0, the Zend module struct changed in a way -that broke both source and binary compatibility. If you are -maintaining a third party extension, here's how to update it: - -If this was your old module entry: - -zend_module_entry foo_module_entry = { -"foo",/* extension name */ -foo_functions,/* extension function list */ -NULL, /* extension-wide startup function */ -NULL, /* extension-wide shutdown function */ -PHP_RINIT(foo), /* per-request startup function */ -PHP_RSHUTDOWN(foo), /* per-request shutdown function */ -PHP_MINFO(foo), /* information function */ -STANDARD_MODULE_PROPERTIES -}; - -Here's how it should look if you want your code to build with PHP -4.1.0 and up: - -zend_module_entry foo_module_entry = { -#if ZEND_MODULE_API_NO >= 20010901 -STANDARD_MODULE_HEADER, -#endif -"foo",/* extension name */ -foo_functions,/* extension function list */ -NULL, /* extension-wide startup function */ -NULL, /* extension-wide shutdown function */ -PHP_RINIT(foo), /* per-request startup function */ -PHP_RSHUTDOWN(foo), /* per-request shutdown function */ -PHP_MINFO(foo), /* information function */ -#if ZEND_MODULE_API_NO >= 20010901 -FOO_VERSION, /* extension version number (string) */ -#endif -STANDARD_MODULE_PROPERTIES -}; - -If you don't care about source compatibility with earlier PHP releases -than 4.1.0, you can drop the #if/#endif lines. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Remove PHP3 conversion scripts: scripts/dev/conv_proto scripts/dev/conv_z_macros scripts/dev/extern_c.php
Commit:2a13fb106da1973ab4533315444fdafa3638df69 Author:Johannes Schlüter Wed, 17 Jul 2013 23:32:23 +0200 Parents: 57c50f8fed33bc74e41191f6b351f16cc215d3af Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a13fb106da1973ab4533315444fdafa3638df69 Log: Remove PHP3 conversion scripts Changed paths: D scripts/dev/conv_proto D scripts/dev/conv_z_macros D scripts/dev/extern_c.php Diff: diff --git a/scripts/dev/conv_proto b/scripts/dev/conv_proto deleted file mode 100755 index fad9cfa..000 --- a/scripts/dev/conv_proto +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# -# do some automatic conversion of prototypes -# - -if test "$1" = "" ; then - echo "usage: $0 list-of-files" - exit 1 -fi - -tmpfile=`mktemp -q /tmp/asd.XX` - -if test "$?" != "0" ; then - echo "$0: cannot create temporary file" - exit 1 -fi - -for file in ${1+"$@"} ; do - echo "working on $file" - cat $file | \ - sed -e \ - 's/void php3_\(.*\)(INTERNAL_FUNCTION_PARAMETERS)/PHP_FUNCTION(\1)/' \ --e 's/^extern void /void /' \ - -e 's/^extern PHP_FUNCTION/PHP_FUNCTION/' > $tmpfile - cp $tmpfile $file -done - -rm -f $tmpfile - -exit 0 diff --git a/scripts/dev/conv_z_macros b/scripts/dev/conv_z_macros deleted file mode 100755 index ea45bc2..000 --- a/scripts/dev/conv_z_macros +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh -# -# +--+ -# | PHP Version 5| -# +--+ -# | Copyright (c) 1997-2007 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: Sascha Schumann | -# +--+ -# -# $Id$ - -for i in $@; do - echo -n "Processing $i... " - sed \ - -e 's/(\*\([^()]\+\))->type/Z_TYPE_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->type/Z_TYPE_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.type/Z_TYPE(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.dval/Z_DVAL_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.dval/Z_DVAL_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.dval/Z_DVAL(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.lval/Z_LVAL_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.lval/Z_LVAL_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.lval/Z_LVAL(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.ht/Z_ARRVAL_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.ht/Z_ARRVAL_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.ht/Z_ARRVAL(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.str\.val/Z_STRVAL_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.val/Z_STRVAL_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.val/Z_STRVAL(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.str\.len/Z_STRLEN_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.str\.len/Z_STRLEN_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.str\.len/Z_STRLEN(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.obj\.properties/Z_OBJPROP_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.properties/Z_OBJPROP_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.properties/Z_OBJPROP(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.obj\.ce/Z_OBJCE_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj\.ce/Z_OBJCE_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj\.ce/Z_OBJCE(\1)/g' \ - -e 's/(\*\([^()]\+\))->value\.obj/Z_OBJ_PP(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)->value\.obj/Z_OBJ_P(\1)/g' \ - -e 's/\([a-z_][]a-z_0-9\[]*\)\.value\.obj/Z_OBJ(\1)/g' \ - -e 's/\([a-zA-Z_][a-zA-Z_0-9]*\)->Z_\([A-Z
[PHP-CVS] com php-src: Drop PHP 4 related README: README.PHP4-TO-PHP5-THIN-CHANGES
Commit:57c50f8fed33bc74e41191f6b351f16cc215d3af Author:Johannes Schlüter Wed, 17 Jul 2013 23:25:44 +0200 Parents: f7e204d7ed57754eceb01004b68dc733d3259c4c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57c50f8fed33bc74e41191f6b351f16cc215d3af Log: Drop PHP 4 related README Changed paths: D README.PHP4-TO-PHP5-THIN-CHANGES Diff: diff --git a/README.PHP4-TO-PHP5-THIN-CHANGES b/README.PHP4-TO-PHP5-THIN-CHANGES deleted file mode 100644 index 0a2c6d6..000 --- a/README.PHP4-TO-PHP5-THIN-CHANGES +++ /dev/null @@ -1,155 +0,0 @@ -1. strrpos() and strripos() now use the entire string as a needle. Be aware - that the existing scripts may no longer work as you expect. - - EX : - - - Will give you different results. The former returns 3 while the latter - returns false rather than the position of the last occurrence of 'D'. - The same applies to strripos(). - -2. Illegal use of string offsets causes E_ERROR instead of E_WARNING. - - EX : - - - Fatal error: Cannot use string offset as an array in ... on line 1 - -3. array_merge() was changed to accept only arrays. If a non-array variable is - passed, a E_WARNING will be thrown for every such parameter. Be careful - because your code may start emitting E_WARNING out of the blue. - -4. Be careful when porting from ext/mysql to ext/mysqli. The following - functions return NULL when no more data is available in the result set - (ext/mysql's functions return FALSE). - -- mysqli_fetch_row() -- mysqli_fetch_array() -- mysqli_fetch_assoc() - -5. PATH_TRANSLATED server variable is no longer set implicitly under - Apache2 SAPI in contrast to the situation in PHP 4, where it is set to the - same value as the SCRIPT_FILENAME server variable when it is not populated - by Apache. This change was made to comply with the CGI specification. - Please refer to bug #23610 for further information. - -6. Starting PHP 5.0.0 the T_ML_CONSTANT constant is no longer defined by the - ext/tokenizer extension. If error_reporting is set to E_ALL notices will - be produced. Instead of T_ML_CONSTANT for /* */ the T_COMMENT constant - is used, thus both // and /* */ are resolved as the T_COMMENT constant. - However the PHPDoc style comments /** */ ,which starting PHP 5 are parsed - by PHP, are recongnized as T_DOC_COMMENT. - -7. $_SERVER should be populated with argc and argv if variables_order - includes "S". If you have specifically configured your system to not - create $_SERVER, then of course it shouldn't be there. The change was to - always make argc and argv available in the CLI version regardless of the - variables_order setting. As in, the CLI version will now always populate - the global $argc and $argv variables. - -8. In some cases classes must be declared before used. It only happens only - if some of the new features of PHP 5 are used. Otherwise the behaviour is - the old. - Example 1 (works with no errors): - - - Example 2 (throws an error): - - - Output (example 2) : - Fatal error: Class 'a' not found in /tmp/cl.php on line 2 - -9. get_class() starting PHP 5 returns the name of the class as it was - declared which may lead to problems in older scripts that rely on - the previous behaviour - the class name is lowercased. Expect the - same behaviour from get_parent_class() when applicable. - Example : - - - Output (PHP 4): - string(6) "foobar" - string(9) "extfoobar" - - Output (PHP 5): - string(6) "FooBar" - string(9) "ExtFooBar" - -- - Example code that will break : - // - function someMethod($p) { - if (get_class($p) != 'helpingclass') { - return FALSE; - } - //... - } - //... - Possible solution is to search for get_class() and get_parent_class() in - all your scripts and use strtolower(). - -10. get_class_methods() returns the names of the methods of a class as they - declared. In PHP4 the names are all lowercased. - Example code : - - Output (PHP4): - array(2) { - [0]=> - string(5) "dofoo" - [1]=> - string(6) "hasfoo" - } - Output (PHP5): - array(2) { - [0]=> - string(5) "doFoo" - [1]=> - string(6) "hasFoo" - } - -11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special -meaning in class methods and is recognized by the PHP parser. The latter -will generate a parse error when assignment to $this is found -Example code : -assignNew($b); -echo "I was executed\n"; -?> -Output (PHP 4): -I was executed -Output (PHP 5): -PHP Fatal error: Cannot re-assign $this in /tmp/this_ex.php on line 4 - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Slightly modernize ext_skel and sekelton/: ext/ext_skel ext/skeleton/php_skeleton.h ext/skeleton/skeleton.c
Commit:f7e204d7ed57754eceb01004b68dc733d3259c4c Author:Johannes Schlüter Wed, 17 Jul 2013 23:15:37 +0200 Parents: a5d177cbc864ff983bdcd4890029ea7eb6dd4d51 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7e204d7ed57754eceb01004b68dc733d3259c4c Log: Slightly modernize ext_skel and sekelton/ - .svnignore ->.gitignore - Add .gitignore entries for DSO stand-alone builds stuff - Docs don't use CVS but SVN - reorder extname.c file so it needs less forward declarations - take forward declarations out of php_extname.h - Drop #if for 12 years old PHP version compatibility Changed paths: M ext/ext_skel M ext/skeleton/php_skeleton.h M ext/skeleton/skeleton.c Diff: diff --git a/ext/ext_skel b/ext/ext_skel index 2492bf7..061e78d 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -12,7 +12,7 @@ echo "" echo " --extname=module module is the name of your extension" echo " --proto=file file contains prototypes of functions to create" echo " --stubs=file generate only function stubs in file" -echo " --xml generate xml documentation to be added to phpdoc-cvs" +echo " --xml generate xml documentation to be added to phpdoc-svn" echo " --skel=dir path to the skeleton directory" echo " --full-xml generate xml documentation for a self-contained extension" echo " (not yet implemented)" @@ -187,11 +187,43 @@ if (PHP_$EXTNAME != "no") { eof -$ECHO_N " .svnignore$ECHO_C" -cat >.svnignore <.gitignore <= 20010901 - STANDARD_MODULE_HEADER, -#endif - "extname", - extname_functions, - PHP_MINIT(extname), - PHP_MSHUTDOWN(extname), - PHP_RINIT(extname), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(extname), /* Replace with NULL if there's nothing to do at request end */ - PHP_MINFO(extname), -#if ZEND_MODULE_API_NO >= 20010901 - "0.1", /* Replace with version number for your extension */ -#endif - STANDARD_MODULE_PROPERTIES -}; -/* }}} */ - -#ifdef COMPILE_DL_EXTNAME -ZEND_GET_MODULE(extname) -#endif - /* {{{ PHP_INI */ /* Remove comments and fill if you need to have entries in php.ini @@ -61,6 +26,35 @@ PHP_INI_END() */ /* }}} */ +/* Remove the following function when you have successfully modified config.m4 + so that your module can be compiled into PHP, it exists only for testing + purposes. */ + +/* Every user-visible function in PHP should document itself in the source */ +/* {{{ proto string confirm_extname_compiled(string arg) + Return a string to confirm that the module is compiled in */ +PHP_FUNCTION(confirm_extname_compiled) +{ + char *arg = NULL; + int arg_len, len; + char *strg; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { + return; + } + + len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg); + RETURN_STRINGL(strg, len, 0); +} +/* }}} */ +/* The previous line is meant for vim and emacs, so it can correctly fold and + unfold functions in source code. See the corresponding marks just before + function definition, where the functions purpose is also documented. Please + follow this convention for the convenience of others editing your code. +*/ + +/* __function_stubs_here__ */ + /* {{{ php_extname_init_globals */ /* Uncomment this function if you have INI entries @@ -126,35 +120,36 @@ PHP_MINFO_FUNCTION(extname) } /* }}} */ +/* {{{ extname_functions[] + * + * Every user visible function must have an entry in extname_functions[]. + */ +const zend_function_entry extname_functions[] = { + PHP_FE(confirm_extname_compiled,NULL) /* For testing, remove later. */ + /* __function_entries_here__ */ + PHP_FE_END /* Must be the last line in extname_functions[] */ +}; +/* }}} */ -/* Remove the following function when you have successfully modified config.m4 - so that your module can be compiled into PHP, it exists only for testing - purposes. */ - -/* Every user-visible function in PHP should document itself in the source */ -/* {{{ proto string confirm_extname_compiled(string arg) - Return a string to confirm that the module is compiled in */ -PHP_FUNCTION(confirm_extname_compiled) -{ - char *arg = NULL; - int arg_len, len; - char *strg; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { - return; - } - - len = spprintf(&strg, 0, "Congratulations! You have successfully modified
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c
Commit:e1a0c90b8b032ce8a677b5aeca9920ceac41fc72 Author:Johannes Schlüter Tue, 16 Jul 2013 13:55:32 +0200 Parents: 54b740a7e1ceea80690d47833a3fe667ce839522 d3a4af4db8d44f3d4a353589857c3c016ba8beda Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1a0c90b8b032ce8a677b5aeca9920ceac41fc72 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/mysqli/mysqli.c MM ext/pdo_mysql/pdo_mysql.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Make zval2myslqnd implementations aware of inheritance: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c
Commit:d3a4af4db8d44f3d4a353589857c3c016ba8beda Author:Johannes Schlüter Tue, 16 Jul 2013 13:52:57 +0200 Parents: bcb39d9c6a0b0a16c9bda5a661a0897e96de09a5 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d3a4af4db8d44f3d4a353589857c3c016ba8beda Log: Make zval2myslqnd implementations aware of inheritance Changed paths: M ext/mysqli/mysqli.c M ext/pdo_mysql/pdo_mysql.c Diff: diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 45e39d0..84f77d0 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_ #include "ext/mysqlnd/mysqlnd_reverse_api.h" static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) { - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == mysqli_link_class_entry) { + if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry) TSRMLS_CC) { MY_MYSQL * mysql; MYSQLI_RESOURCE * my_res; mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC); diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 1dbb30f..0d4e525 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -61,7 +61,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql) #include "ext/mysqlnd/mysqlnd_reverse_api.h" static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) { - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == php_pdo_get_dbh_ce()) { + if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce() TSRMLS_CC)) { pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC); if (!dbh || dbh->driver != &pdo_mysql_driver) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: truncate results at depth of 255 to prevent corruption: ext/xml/xml.c
Commit:fd803718df0aa413fd8c47eaa030fcc61f3feb28 Author:Rob Richards Sat, 6 Jul 2013 07:53:07 -0400 Committer: Johannes Schlüter Wed, 10 Jul 2013 19:40:44 +0200 Parents: 55c279ed3fd6de8ce4d9d16d98ae7bce1a8b73fa Branches: PHP-5.3.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd803718df0aa413fd8c47eaa030fcc61f3feb28 Log: truncate results at depth of 255 to prevent corruption Changed paths: M ext/xml/xml.c Diff: diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 1f0480b..9f0bc30 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -427,7 +427,7 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } if (parser->ltags) { int inx; - for (inx = 0; inx < parser->level; inx++) + for (inx = 0; ((inx < parser->level) && (inx < XML_MAXLEVEL)); inx++) efree(parser->ltags[ inx ]); efree(parser->ltags); } @@ -905,45 +905,50 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch } if (parser->data) { - zval *tag, *atr; - int atcnt = 0; + if (parser->level <= XML_MAXLEVEL) { + zval *tag, *atr; + int atcnt = 0; - MAKE_STD_ZVAL(tag); - MAKE_STD_ZVAL(atr); + MAKE_STD_ZVAL(tag); + MAKE_STD_ZVAL(atr); - array_init(tag); - array_init(atr); + array_init(tag); + array_init(atr); - _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); + _xml_add_to_info(parser,((char *) tag_name) + parser->toffset); - add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ - add_assoc_string(tag,"type","open",1); - add_assoc_long(tag,"level",parser->level); + add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */ + add_assoc_string(tag,"type","open",1); + add_assoc_long(tag,"level",parser->level); - parser->ltags[parser->level-1] = estrdup(tag_name); - parser->lastwasopen = 1; + parser->ltags[parser->level-1] = estrdup(tag_name); + parser->lastwasopen = 1; - attributes = (const XML_Char **) attrs; + attributes = (const XML_Char **) attrs; - while (attributes && *attributes) { - att = _xml_decode_tag(parser, attributes[0]); - val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); - - add_assoc_stringl(atr,att,val,val_len,0); + while (attributes && *attributes) { + att = _xml_decode_tag(parser, attributes[0]); + val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding); - atcnt++; - attributes += 2; + add_assoc_stringl(atr,att,val,val_len,0); - efree(att); - } + atcnt++; + attributes += 2; - if (atcnt) { - zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); - } else { - zval_ptr_dtor(&atr); - } + efree(att); + } + + if (atcnt) { + zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL); + } else { + zval_ptr_dtor(&atr); + } - zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->
[PHP-CVS] com php-src: add test for bug #65236: ext/xml/tests/bug65236.phpt
Commit:154a39a72db346628cce8af1246bd6c267e6d576 Author:Johannes Schlüter Wed, 10 Jul 2013 19:35:18 +0200 Parents: fd803718df0aa413fd8c47eaa030fcc61f3feb28 Branches: PHP-5.3.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=154a39a72db346628cce8af1246bd6c267e6d576 Log: add test for bug #65236 Bugs: https://bugs.php.net/65236 Changed paths: A ext/xml/tests/bug65236.phpt Diff: diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt new file mode 100644 index 000..67b26d6 --- /dev/null +++ b/ext/xml/tests/bug65236.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #65236 (heap corruption in xml parser) +--SKIPIF-- + +--FILE-- +", 1000), $a); + +echo "Done\n"; +?> +--EXPECTF-- +Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d +Done -- 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.27: NEWS configure.in main/php_version.h
Commit:b1e49d95a17f8e553172da43834588a8ea78081e Author:Johannes Schlüter Wed, 10 Jul 2013 19:43:08 +0200 Parents: 154a39a72db346628cce8af1246bd6c267e6d576 Branches: PHP-5.3.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1e49d95a17f8e553172da43834588a8ea78081e Log: PHP 5.3.27 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 66ffe87..5b0229e 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -20 Jun 2013, PHP 5.3.27RC1 +11 Jul 2013, PHP 5.3.27 - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) @@ -28,6 +28,9 @@ PHP NEWS . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems). (Laruence) +- XML: + . Fixed bug #65236 (heap corruption in xml parser). (Rob) + 06 Jun 2013, PHP 5.3.26 - Core: diff --git a/configure.in b/configure.in index b8004ea..78716ac 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=27 -PHP_EXTRA_VERSION="RC1" +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 4a28e50..6432d3e 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 27 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.27RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.27" #define PHP_VERSION_ID 50327 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: add test for bug #65236: ext/xml/tests/bug65236.phpt
Commit:710eeebc5c95692bd3c84f5d2b5d687349b6 Author:Johannes Schlüter Wed, 10 Jul 2013 19:35:18 +0200 Parents: 7d163e8a0880ae8af2dd869071393e5dc07ef271 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=710eeebc5c95692bd3c84f5d2b5d687349b6 Log: add test for bug #65236 Bugs: https://bugs.php.net/65236 Changed paths: A ext/xml/tests/bug65236.phpt Diff: diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt new file mode 100644 index 000..67b26d6 --- /dev/null +++ b/ext/xml/tests/bug65236.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #65236 (heap corruption in xml parser) +--SKIPIF-- + +--FILE-- +", 1000), $a); + +echo "Done\n"; +?> +--EXPECTF-- +Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge PHP 5.3.27 NEWS: NEWS
Commit:9c4ef501462cb672df1f6736261a1c8beea77c7e Author:Johannes Schlüter Wed, 10 Jul 2013 19:45:45 +0200 Parents: 710eeebc5c95692bd3c84f5d2b5d687349b6 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c4ef501462cb672df1f6736261a1c8beea77c7e Log: Merge PHP 5.3.27 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index d006da0..0e498b0 100644 --- a/NEWS +++ b/NEWS @@ -2,12 +2,7 @@ PHP NEWS ||| ?? ??? 2013, PHP 5.3.28 -?? ??? 2013, PHP 5.3.27 - -### -### DO NOT ADD ENTRIES HERE -### All entries go to 5.3.28 -### +11 Jul 2013, PHP 5.3.27 - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) @@ -35,6 +30,9 @@ PHP NEWS . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems). (Laruence) +- XML: + . Fixed bug #65236 (heap corruption in xml parser). (Rob) + 06 Jun 2013, PHP 5.3.26 - Core: -- 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.27
Tag php-5.3.27 in php-src.git was created Tag: 683a41866a68f1d52d1a28fb5a95868113139f47 Tagger: Johannes Schlüter Wed Jul 10 19:43:40 2013 +0200 Log: PHP 5.3.27 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJR3Z1fAAoJEH3sTmn8nIPXmD0H/1OIvPq/RXrAx54KaSIxAU5r G86N9Zp6LHVyUUEintySCwOnMtmQ0j5V3GcORMa4aAKF71TARPfqt2YL1sgkn2Yz qCDVGFJb+0TvTSJ/9zq9TzMBYO/nCmgXLqY6mmvk+V9RVhDdfiw4jTvhbDm/9AWU vtzbfN7V8HY1FzGDoMt80YM3YaBzqaPN10YA/h7GDEsrdWc04PiHUAGCXNvWizi2 PAwWuG9uyRCBUrju9PQtW3TIoYyckwaU2RUrrFLzTkc3tHH/PT70m0XxCDXR3TEM 2kGGDPiDSsILsvRTl3yjSXKXMWvbbIRYxTATgm63J3Tw6iJDesgIW6R9sXzaRto= =zR4b -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=683a41866a68f1d52d1a28fb5a95868113139f47 Target: b1e49d95a17f8e553172da43834588a8ea78081e Author: Johannes Schlüter Wed, 10 Jul 2013 19:43:08 +0200 Parents: 154a39a72db346628cce8af1246bd6c267e6d576 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1e49d95a17f8e553172da43834588a8ea78081e Target log: PHP 5.3.27 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: Make sure return value is initialised in case transaction startup fails: ext/mysqlnd/mysqlnd.c
Commit:5bc7e597d990eb3c38d07c0189d27c246c7b4ae5 Author:Johannes Schlüter Wed, 3 Jul 2013 17:08:14 +0200 Parents: 0265c2d961aa99e00361d6ab0f845dc1e8782558 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5bc7e597d990eb3c38d07c0189d27c246c7b4ae5 Log: Make sure return value is initialised in case transaction startup fails Changed paths: M ext/mysqlnd/mysqlnd.c Diff: diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index d70582b..8ed810d 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1061,7 +1061,7 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query); - enum_func_status ret; + enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_conn_data::send_query"); DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query); @@ -1468,7 +1468,7 @@ static ulong MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn, char * newstr, const char * escapestr, size_t escapestr_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, escape_string); - ulong ret; + ulong ret = FAIL; DBG_ENTER("mysqlnd_conn_data::escape_string"); DBG_INF_FMT("conn=%llu", conn->thread_id); -- 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' into PHP-5.5: ext/mysqlnd/mysqlnd.c
Commit:9aa7343ae0828d881e8438a5a9146fd4a95a93d9 Author:Johannes Schlüter Wed, 3 Jul 2013 17:10:58 +0200 Parents: 631bb27dcacf625e35f6dacc5e8df0b45624531a 5bc7e597d990eb3c38d07c0189d27c246c7b4ae5 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9aa7343ae0828d881e8438a5a9146fd4a95a93d9 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/mysqlnd/mysqlnd.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4
On Wed, 2013-07-03 at 13:07 +0200, Johannes Schlüter wrote: > The 5.3 branch is closed. Do we really need this here? Additionally I got merge conflicts due to this while merging 5.4 into 5.5, please verify the result there. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4
The 5.3 branch is closed. Do we really need this here? On Wed, 2013-07-03 at 04:36 +, Sebastian Bergmann wrote: > Commit:50ac53e1b109795e3abb92735a3a35cebcdd47a7 > Author:Sebastian Bergmann Wed, 3 Jul > 2013 06:36:54 +0200 > Parents: e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6 > Branches: PHP-5.3 > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=50ac53e1b109795e3abb92735a3a35cebcdd47a7 > > Log: > Add bison 2.6.4 to the list of supported versions > > Changed paths: > M Zend/acinclude.m4 > > > Diff: > diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 > index 136d2d8..77430ab 100644 > --- a/Zend/acinclude.m4 > +++ b/Zend/acinclude.m4 > @@ -4,7 +4,7 @@ dnl This file contains local autoconf functions. > > AC_DEFUN([LIBZEND_BISON_CHECK],[ ># we only support certain bison versions > - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 > 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" > + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 > 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4" > ># for standalone build of Zend Engine >test -z "$SED" && SED=sed > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Update git rules (5.5 is stable, 5.3 sec only): README.GIT-RULES
Commit:e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6 Author:Johannes Schlüter Thu, 20 Jun 2013 11:51:21 +0200 Parents: f0eaa02f6f773bd383e403fd5b9699cea7a8f457 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6 Log: Update git rules (5.5 is stable, 5.3 sec only) Changed paths: M README.GIT-RULES Diff: diff --git a/README.GIT-RULES b/README.GIT-RULES index 289a4e7..6e90aa9 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -45,14 +45,17 @@ Currently we have the following branches in use:: masterThe active development branch. - PHP-5.4 Is used to release the PHP 5.4.x series. It still allows for -larger enhancements. + PHP-5.5 Is used to release the PHP 5.5.x series. This is a current +stable version and is open for bugfixes only. - PHP-5.3 Is used to release the PHP 5.3.x series. This is current + PHP-5.4 Is used to release the PHP 5.4.x series. This is a current stable version and is open for bugfixes only. - PHP-5.2 Is used to release the PHP 5.2.x series. It is closed for -changes now. + PHP-5.3 Is used to release the PHP 5.3.x series. This is currently +in extended support and open forsecurity fixes only. Triaged +via secur...@php.net + + PHP-5.2 This branch is closed. PHP-5.1 This branch is closed. -- 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.27RC1: NEWS configure.in main/php_version.h
Commit:825bd97c6840bb8464a330142751600c093e8b8a Author:Johannes Schlüter Wed, 19 Jun 2013 14:57:16 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Branches: PHP-5.3.27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=825bd97c6840bb8464a330142751600c093e8b8a Log: PHP 5.3.27RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index a0f9e2b..66ffe87 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.27 +20 Jun 2013, PHP 5.3.27RC1 - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) diff --git a/configure.in b/configure.in index 0d9eff8..b8004ea 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=27 -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 1903611..4a28e50 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 27 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.27-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.27RC1" #define PHP_VERSION_ID 50327 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: This will be PHP 5.3.28: NEWS configure.in main/php_version.h
Commit:f0eaa02f6f773bd383e403fd5b9699cea7a8f457 Author:Johannes Schlüter Wed, 19 Jun 2013 15:08:02 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0eaa02f6f773bd383e403fd5b9699cea7a8f457 Log: This will be PHP 5.3.28 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index a0f9e2b..d006da0 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.28 + ?? ??? 2013, PHP 5.3.27 +### +### DO NOT ADD ENTRIES HERE +### All entries go to 5.3.28 +### + - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence) diff --git a/configure.in b/configure.in index 0d9eff8..8a0aa45 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=27 +PHP_RELEASE_VERSION=28 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 --git a/main/php_version.h b/main/php_version.h index 1903611..bddf0bc 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 27 +#define PHP_RELEASE_VERSION 28 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.27-dev" -#define PHP_VERSION_ID 50327 +#define PHP_VERSION "5.3.28-dev" +#define PHP_VERSION_ID 50328 -- 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.27RC1
Tag php-5.3.27RC1 in php-src.git was created Tag: a264dfaed7209bdd3a883e7a0be718993a85b0e1 Tagger: Johannes Schlüter Wed Jun 19 14:57:39 2013 +0200 Log: PHP 5.3.27RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRwarRAAoJEH3sTmn8nIPX5FcH/2rphk26c0LGWQRQ4+yxBu7c L+ELbRnpAa57p0U3hXoyXEAzD315G6iry96e0p/YSSr0w5lXdJOUdRjXYLrErQkq wqHfaoHrZiqqM7fg71ksLWf82ENZJmcZwe9WAHTzZewXvAllWg/de0OkueWyjmG3 XVPwDJQi77r9ZOxh6tvzn9dsPyo1jj5LVHYEX6kAzXT/SmkEmOQEBnB1RHmZdfYe ey7bJUC8Mzakr3edmFh7YGPFgPZBU+NkC8tKNtc9r2wFUFEl0xgUd6tWeYQ6y5Rf gSaLsBM4RglUOaaKZzxs5k9aOMXY9aibW+pxuZyB9i+9OqGY2y82T5y5H2YrvHE= =7jsy -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=a264dfaed7209bdd3a883e7a0be718993a85b0e1 Target: 825bd97c6840bb8464a330142751600c093e8b8a Author: Johannes Schlüter Wed, 19 Jun 2013 14:57:16 +0200 Parents: 6238dd6f3257bed9efe60a39978376862668e71c Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=825bd97c6840bb8464a330142751600c093e8b8a Target log: PHP 5.3.27RC1 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.26: configure.in main/php_version.h
Commit:4e573053dc625cc2a92917ab10511759bc19135e Author:Johannes Schlüter Wed, 5 Jun 2013 16:29:25 +0200 Parents: 882aa9c687806d44f7e70555d7dfa125b507561e Branches: PHP-5.3.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e573053dc625cc2a92917ab10511759bc19135e Log: PHP 5.3.26 Changed paths: M configure.in M main/php_version.h Diff: diff --git a/configure.in b/configure.in index 65ad742..192acee 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=26 -PHP_EXTRA_VERSION="RC1" +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 3033c1c..708ca7f 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 26 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.26RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.26" #define PHP_VERSION_ID 50326 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix NEWS: NEWS
Commit:882aa9c687806d44f7e70555d7dfa125b507561e Author:Johannes Schlüter Wed, 5 Jun 2013 16:27:49 +0200 Parents: eeb7f93294cd0a11af44905d84044e0b158d802c Branches: PHP-5.3.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=882aa9c687806d44f7e70555d7dfa125b507561e Log: Fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 3b12678..a4ea43f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ PHPNEWS ||| -23 May 2013, PHP 5.3.26RC1 +06 Jun 2013, PHP 5.3.26 + +- Core: + . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, +CVE 2013-2110). (Stas) - Calendar: . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi) -- 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.26
Tag php-5.3.26 in php-src.git was created Tag: edfecc21787880775bab25b4874aa5e864399744 Tagger: Johannes Schlüter Wed Jun 5 16:29:56 2013 +0200 Log: PHP 5.3.26 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRr0txAAoJEH3sTmn8nIPX6BkH/2RMVqCY1od5Ya4c8lpJZFRo UGESV/O9iaBGmfkncBWxjW/dpQQQvz0KchIdxn05uDjq6z7OTGFcS7qIE6vt6HWa b9HcAAJQ2S+Zt1MwXSWi3MM5Pg8HYMNmMg1L7B/hOdp1m0ht0G8F98M1vR01qORW QuV1/d7ARifCTJb99hzom5vk9YMa6qi1bh9Ws3EcAOtj/Y0Jt0ZZmoB9LS5Gvsf+ bbUQhdVzjokGFY7EQ+nCl6/1enifBjQwPp8PVeSeQZOmXvboS4Ix4x9afh1OVYXy IX8rUoNhIQebwVvSEqKve1WSwls5IpWI48zzYT7hLUo01YTz2HvW/fjj1inwd+g= =hNIW -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=edfecc21787880775bab25b4874aa5e864399744 Target: 4e573053dc625cc2a92917ab10511759bc19135e Author: Johannes Schlüter Wed, 5 Jun 2013 16:29:25 +0200 Parents: 882aa9c687806d44f7e70555d7dfa125b507561e Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e573053dc625cc2a92917ab10511759bc19135e Target log: PHP 5.3.26 Changed paths: 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: Add NEWS for PHP 5.3.26: NEWS
Commit:ec3bcbcb5a6336861951ad569e378e4b77984df5 Author:Johannes Schlüter Wed, 5 Jun 2013 16:34:18 +0200 Parents: 3c87945c95c9c31986e690bb046c70e58c8d8896 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec3bcbcb5a6336861951ad569e378e4b77984df5 Log: Add NEWS for PHP 5.3.26 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index fbb470b..a7c0426 100644 --- a/NEWS +++ b/NEWS @@ -16,9 +16,7 @@ PHP NEWS - pgsql: - Fixed bug #64609 (pg_convert enum type support). (Matteo) -?? ??? 2013, PHP 5.3.26 - -### DO NOT ADD ENTRIES HERE, ADD THEM ABOVE FOR 5.3.27 ### +06 Jun 2013, PHP 5.3.26 - Core: . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, -- 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.26RC1: NEWS configure.in main/php_version.h
Commit:9e28f20fba538c602ff3270deeb4aa5835448866 Author:Johannes Schlüter Wed, 22 May 2013 17:10:20 +0200 Parents: c50cef1dc54ffd1d0fb71d1afb8b2c3cb3c5b6ef Branches: PHP-5.3.26 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e28f20fba538c602ff3270deeb4aa5835448866 Log: PHP 5.3.26RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index fa038dc..3b12678 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.26 +23 May 2013, PHP 5.3.26RC1 - Calendar: . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi) @@ -15,16 +15,16 @@ PHP NEWS pointer has closed). (Laruence) - Phar - . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or with -non std tmp dir). (Pierre) + . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or +with non std tmp dir). (Pierre) - Streams: . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) - Zend Engine: - . Fixed bug #64821 (Custom Exception crash when internal properties overridden). -(Anatol) + . Fixed bug #64821 (Custom Exception crash when internal properties +overridden). (Anatol) 09 May 2013, PHP 5.3.25 diff --git a/configure.in b/configure.in index bfbc219..65ad742 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=26 -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 eeaffa3..3033c1c 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 26 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.26-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.26RC1" #define PHP_VERSION_ID 50326 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: This will be PHP 5.3.27: NEWS configure.in main/php_version.h
Commit:4cb25d25f10017f0b3f2158bef41a23efb85dc4d Author:Johannes Schlüter Wed, 22 May 2013 17:13:17 +0200 Parents: c50cef1dc54ffd1d0fb71d1afb8b2c3cb3c5b6ef Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cb25d25f10017f0b3f2158bef41a23efb85dc4d Log: This will be PHP 5.3.27 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index fa038dc..50d979a 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,11 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.27 + ?? ??? 2013, PHP 5.3.26 +### DO NOT ADD ENTRIES HERE, ADD THEM ABOVE FOR 5.3.27 ### + - Calendar: . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi) @@ -15,16 +19,16 @@ PHP NEWS pointer has closed). (Laruence) - Phar - . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or with -non std tmp dir). (Pierre) + . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or +with non std tmp dir). (Pierre) - Streams: . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) - Zend Engine: - . Fixed bug #64821 (Custom Exception crash when internal properties overridden). -(Anatol) + . Fixed bug #64821 (Custom Exception crash when internal properties +overridden). (Anatol) 09 May 2013, PHP 5.3.25 diff --git a/configure.in b/configure.in index bfbc219..0d9eff8 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=26 +PHP_RELEASE_VERSION=27 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 --git a/main/php_version.h b/main/php_version.h index eeaffa3..1903611 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 26 +#define PHP_RELEASE_VERSION 27 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.26-dev" -#define PHP_VERSION_ID 50326 +#define PHP_VERSION "5.3.27-dev" +#define PHP_VERSION_ID 50327 -- 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.26RC1
Tag php-5.3.26RC1 in php-src.git was created Tag: 40e490a90b74ec23fa58bf7416bfc94b45c2cb34 Tagger: Johannes Schlüter Wed May 22 17:10:49 2013 +0200 Log: PHP 5.3.26RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRnOAHAAoJEH3sTmn8nIPXA78IAIds3w/r8MX5h/Jk8p39evx+ Uo2GRAw8nzJbdv+nxU0Et6yBi89u5LVMExoxuFvifqyqCccjy8T7Qo810Cjq5B+a PpXHm7yR8FKAxJFYnIJcTrFrv9ayygtkasru9taoLBGrNrV+AlL9CU6hxcNroU82 kD7/fWzZkMpxF1OOkRp3h4yng+lcQkRojHPrG2xlxKp3S7+4ARIl0YZVHsRtJstn UTb056go2zckL9vIvEotjWbytQmPKS81JdnSfu91iSU1MrM9vUX9/wZ1Rch68uMG 8bv62qv1ptAiqtZVC0UG+RA5xkUAuE1m2HeXLi1R/1JIqBOw+IsuKgkrSahqj4Q= =Iwot -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=40e490a90b74ec23fa58bf7416bfc94b45c2cb34 Target: 9e28f20fba538c602ff3270deeb4aa5835448866 Author: Johannes Schlüter Wed, 22 May 2013 17:10:20 +0200 Parents: c50cef1dc54ffd1d0fb71d1afb8b2c3cb3c5b6ef Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e28f20fba538c602ff3270deeb4aa5835448866 Target log: PHP 5.3.26RC1 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: Recover NEWS: NEWS
Commit:22da0b7364e4290ef57ede40468564d6a4ff2797 Author:Johannes Schlüter Fri, 17 May 2013 11:22:04 +0200 Parents: 273ad58295d738b1d146abfae92babc075282d85 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22da0b7364e4290ef57ede40468564d6a4ff2797 Log: Recover NEWS Apperently wrongly merged in revision 488933792a8 Changed paths: M NEWS Diff: -- 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.25 NEWS: NEWS
Commit:1cc2162b835ff6bcb8650b9522f54d266576401e Author:Johannes Schlüter Wed, 8 May 2013 18:01:39 +0200 Parents: 5c701d19aca937e28fca32934719836991b40cf0 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1cc2162b835ff6bcb8650b9522f54d266576401e Log: PHP 5.3.25 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 2d831ae..809aad9 100644 --- a/NEWS +++ b/NEWS @@ -15,9 +15,7 @@ PHP NEWS . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open() on Windows x64). (Anatol) -?? ??? 2013, PHP 5.3.25 - -### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ### +09 May 2013, PHP 5.3.25 - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: -- 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.25
Tag php-5.3.25 in php-src.git was created Tag: 4227962d25a44b07fa6f219756db40388bd8231c Tagger: Johannes Schlüter Wed May 8 17:59:31 2013 +0200 Log: PHP 5.3.25 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRinZvAAoJEH3sTmn8nIPXuN0H/3IVmvsBEA+R1zfKa8ClFmy2 QitUqfV71aOPJCIfgSZvePCKPHsUTn0j+TFi/9r7OFPOG0wS0m2n6TYSnIN7P0yn 6kNjIxbXQEpdw2HXKA4lPjJw3BvKA9oQ+C6ct8Cu+fzXUG1Q4X5XGfdINWNIhDb0 eG+wseTUSR08wh0+AoKlFYc6bMS0G75gkd8rqIrYG6M8hKV/u54srzaO8jNScHg8 PHOgsB5MvC/zL4hbDCRhRV5xLZ+RmLRfIp4D0cN0itRbdkkn+BEY2kXUaCNLL5ta KVqyFy0SpPvFrQp9STKPRYPLGxGwAmA9PS1VRXQuij4slZwnm+ICRPceVMealVM= =Yq3D -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=4227962d25a44b07fa6f219756db40388bd8231c Target: ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Author: Johannes Schlüter Wed, 8 May 2013 17:58:52 +0200 Parents: 916226b745bab77e60fcf87041ed4f324dfdfa5c Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Target log: PHP 5.3.25 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.25: NEWS configure.in main/php_version.h
Commit:ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Author:Johannes Schlüter Wed, 8 May 2013 17:58:52 +0200 Parents: 916226b745bab77e60fcf87041ed4f324dfdfa5c Branches: PHP-5.3.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae3a37659f93bb16ca813a39d2cdd0a96a63bea8 Log: PHP 5.3.25 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index b68a43d..1aebab4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -25 Apr 2013, PHP 5.3.25RC1 +09 May 2013, PHP 5.3.25 - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: diff --git a/configure.in b/configure.in index 4341a22..7ad93be 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=25 -PHP_EXTRA_VERSION="RC1" +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 334fb6e..1096904 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 25 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.25RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.25" #define PHP_VERSION_ID 50325 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: don't include smart_str.h in a too global header, fixes #64718: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd_structs.h
Commit:062519ed4186d5f19a131a3a4c0e430a83dc0766 Author:Johannes Schlüter Tue, 30 Apr 2013 14:26:55 +0200 Parents: 36b968ae96fed67c91f3ac785e56aec8d565795a Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=062519ed4186d5f19a131a3a4c0e430a83dc0766 Log: don't include smart_str.h in a too global header, fixes #64718 Bugs: https://bugs.php.net/64718 Changed paths: M ext/mysqlnd/mysqlnd.c M ext/mysqlnd/mysqlnd_structs.h Diff: diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index ccd8af5..724876e 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -27,6 +27,7 @@ #include "mysqlnd_statistics.h" #include "mysqlnd_charset.h" #include "mysqlnd_debug.h" +#include "ext/standard/php_smart_str.h" /* TODO : diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 55775d9..99981f7 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -23,7 +23,7 @@ #ifndef MYSQLND_STRUCTS_H #define MYSQLND_STRUCTS_H -#include "ext/standard/php_smart_str.h" +#include "ext/standard/php_smart_str_public.h" #define MYSQLND_TYPEDEFED_METHODS -- 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.25RC1: NEWS configure.in main/php_version.h
Commit:916226b745bab77e60fcf87041ed4f324dfdfa5c Author:Johannes Schlüter Thu, 25 Apr 2013 17:59:56 +0200 Parents: 671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Branches: PHP-5.3.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=916226b745bab77e60fcf87041ed4f324dfdfa5c Log: PHP 5.3.25RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index f7e6d5b..b68a43d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.25 +25 Apr 2013, PHP 5.3.25RC1 - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: diff --git a/configure.in b/configure.in index f4cbab3..4341a22 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=25 -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 8ac4945..334fb6e 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 25 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.25-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.25RC1" #define PHP_VERSION_ID 50325 -- 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.5': NEWS
Commit:488933792a8e5455c55a578a12e6a66ac684b68f Author:Johannes Schlüter Thu, 25 Apr 2013 18:05:56 +0200 Parents: 22f6b6dbec4772febe0e3c31bceeb31eecf806ab 6251706ea681ac6685008f63c9e169d09e6c474a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=488933792a8e5455c55a578a12e6a66ac684b68f Log: Merge branch 'PHP-5.5' Changed paths: MM NEWS Diff: -- 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.26 this will be: NEWS configure.in main/php_version.h
Commit:63434524f82f8686e16bb6ebed10ad206987481f Author:Johannes Schlüter Thu, 25 Apr 2013 18:02:53 +0200 Parents: 671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63434524f82f8686e16bb6ebed10ad206987481f Log: PHP 5.3.26 this will be Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index f7e6d5b..5ea0f5a 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,11 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.26 + ?? ??? 2013, PHP 5.3.25 +### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ### + - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault). (Laruence) diff --git a/configure.in b/configure.in index f4cbab3..bfbc219 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=25 +PHP_RELEASE_VERSION=26 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 --git a/main/php_version.h b/main/php_version.h index 8ac4945..eeaffa3 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 25 +#define PHP_RELEASE_VERSION 26 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.25-dev" -#define PHP_VERSION_ID 50325 +#define PHP_VERSION "5.3.26-dev" +#define PHP_VERSION_ID 50326 -- 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.25RC1
Tag php-5.3.25RC1 in php-src.git was created Tag: 7884e82a2d25319af4e9b9fe64eb9dfc975fcfff Tagger: Johannes Schlüter Thu Apr 25 18:00:34 2013 +0200 Log: PHP 5.3.25RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJReVMxAAoJEH3sTmn8nIPXbTMIAI4XXKn8w66XMM8L2AuxW7Oz TDDntUcdvW4Opzsqujt4A2+wZMl8HWOrOoWMRrq7EQPB4nsPaWwiiWlrEnBANVUq LnKHMlfNLzf4SnQ8YBJcYK4HH0B8zTPyeUML+y0hfDkuPMlw215iwt5kvMyDmTBs iHXntqwjjg39rnlffDk9z43phNU+u8c7pK/ENMLX687Eu+CEQIkER4O8RV2FQlhO iEQ34mD2FuMPMvFDaSa459qQ480fZL4uA9RiBssGuNnfg0sTAqhK/YZqASj0+PCu 3xlk0346bsM8S/V5WmF7ojyRtkV/uEBGzJNBrCNxbwXYKH1BNtG5qQm8dKZAw34= =BY0e -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=7884e82a2d25319af4e9b9fe64eb9dfc975fcfff Target: 916226b745bab77e60fcf87041ed4f324dfdfa5c Author: Johannes Schlüter Thu, 25 Apr 2013 17:59:56 +0200 Parents: 671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=916226b745bab77e60fcf87041ed4f324dfdfa5c Target log: PHP 5.3.25RC1 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 NEWS: NEWS
Commit:671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Author:Johannes Schlüter Thu, 25 Apr 2013 17:58:02 +0200 Parents: 18fdab5a09b64252a9a61ad6d1b2eff4a257b8f2 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master PHP-5.3.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Log: Fix NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index af4957e..f7e6d5b 100644 --- a/NEWS +++ b/NEWS @@ -6,15 +6,15 @@ PHP NEWS . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault). (Laruence) . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas) - . Fixed bugs #47675 and #64577 (fd leak on Solaris) + . Fixed bugs #47675 and #64577 (fd leak on Solaris). (Rasmus) + +- Streams: + . Fixed Windows x64 version of stream_socket_pair() and improved error +handling. (Anatol Belski) - Zip: . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence). - (Anatol) - -- Streams: - . Fixed Windows x64 version of stream_socket_pair() and improved error handling - (Anatol Belski) +(Anatol) 11 Apr 2013, PHP 5.3.24 -- 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.14: NEWS configure.in main/php_version.h
Commit:b30251268dbee5d7780ef04a2c027f6ceb3c3f53 Author:Johannes Schlüter Wed, 10 Apr 2013 09:47:04 +0200 Parents: b4e4a2c7aea8cc0b59b7836463bdd2d214b83177 Branches: PHP-5.4.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b30251268dbee5d7780ef04a2c027f6ceb3c3f53 Log: PHP 5.4.14 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index da469dc..980953f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -28 Mar 2013, PHP 5.4.14 RC1 +11 Apr 2013, PHP 5.4.14 - Core . Fixed bug #64529 (Ran out of opcode space). (Dmitry) . Fixed bug #64515 (Memoryleak when using the same variablename two times in diff --git a/configure.in b/configure.in index e9c35b7..c5702a5 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=14 -PHP_EXTRA_VERSION="RC1" +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 cb84735..12a23db 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 14 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.4.14RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.4.14" #define PHP_VERSION_ID 50414 -- 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.14 release date: NEWS
Commit:442ff25187081212631c03a49041a0529520b505 Author:Johannes Schlüter Wed, 10 Apr 2013 09:45:16 +0200 Parents: 146d7861370114430185bb849bda5ebb9415ca66 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=442ff25187081212631c03a49041a0529520b505 Log: PHP 5.4.14 release date Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index a58e9fc..4eece09 100644 --- a/NEWS +++ b/NEWS @@ -14,7 +14,8 @@ PHP NEWS - Fileinfo: . Upgraded libmagic to 5.14. (Anatol) -?? ??? 2013, PHP 5.4.14 +11 Apr 2013, PHP 5.4.14 + - Core: . Fixed bug #64529 (Ran out of opcode space). (Dmitry) . Fixed bug #64515 (Memoryleak when using the same variablename two times in -- 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.24: NEWS configure.in main/php_version.h
Commit:c2383857790e75ff405c2518a7aaf40bde8ef788 Author:Johannes Schlüter Wed, 10 Apr 2013 09:42:48 +0200 Parents: 65cf185e0a716c75c1466b4f2a415155bfa75c21 Branches: PHP-5.3.24 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c2383857790e75ff405c2518a7aaf40bde8ef788 Log: PHP 5.3.24 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index a28657f..2b99143 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -28 Feb 2013, PHP 5.3.24RC1 +11 Apr 2013, PHP 5.3.24 - Core . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). diff --git a/configure.in b/configure.in index c0011d7..c67471f 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=24 -PHP_EXTRA_VERSION="RC1" +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 6aa01b8..a722586 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 24 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.24RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.24" #define PHP_VERSION_ID 50324 -- 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.24 release date: NEWS
Commit:ecdf8bcc455a660086f85b47f68ecc802c20ac2b Author:Johannes Schlüter Wed, 10 Apr 2013 09:41:21 +0200 Parents: 88b3cdc4e9ec199044dd9b2d82d12639226091dd Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ecdf8bcc455a660086f85b47f68ecc802c20ac2b Log: PHP 5.3.24 release date Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index d876c36..688f4f9 100644 --- a/NEWS +++ b/NEWS @@ -7,11 +7,7 @@ PHP NEWS segfault). (Laruence) . Fixed bugs #47675 and #64577 (fd leak on Solaris) -?? ??? 2013, PHP 5.3.24 - -## -## Add NEWS entries to 5.3.25 above, RM will merge and update NEWS if needed -## +11 Apr 2013, PHP 5.3.24 - Core . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). -- 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.14
Tag php-5.4.14 in php-src.git was created Tag: 99549d09b9bc88e2353d09d71b187fb63228ecae Tagger: Johannes Schlüter Wed Apr 10 09:47:27 2013 +0200 Log: PHP 5.4.14 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRZRkZAAoJEH3sTmn8nIPXg2AIAKfAxc+IrQh50rPDkFebQXV9 lyELD7FrquCZfdd6St6i37+rXot6PQuRjI2ONBC2eIH584NNJoJzi//fuyCCu2V5 QW04HtExwFrq7Uz9sB3Ao3yJAPa8W7Zzy4ZOKJkYR817YEHM1yBlU0BhuEgQcWko Cc0sb4nnzHoeM6ynrxfSn/8t5ZyzygDgBmYm3RXLL8vW+02ehTGL2SAzBH5IJixY jrMOoCmyNlU/YytAkTxaq1z309Q6TcDrPcRMFaNGB9CVd/JfjQ7fCzULcNsg5+ax wuX9bukijLOeP4O0KCgPf4wYDeatJ4+qKCci3pbmift1FhV9GbssPPB/nOfXAMc= =NllO -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=99549d09b9bc88e2353d09d71b187fb63228ecae Target: b30251268dbee5d7780ef04a2c027f6ceb3c3f53 Author: Johannes Schlüter Wed, 10 Apr 2013 09:47:04 +0200 Parents: b4e4a2c7aea8cc0b59b7836463bdd2d214b83177 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b30251268dbee5d7780ef04a2c027f6ceb3c3f53 Target log: PHP 5.4.14 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] tag php-src: create tag php-5.3.24
Tag php-5.3.24 in php-src.git was created Tag: ccbdf9210aea08c2486b321b192098ad1936f3c3 Tagger: Johannes Schlüter Wed Apr 10 09:43:24 2013 +0200 Log: PHP 5.3.24 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRZRg5AAoJEH3sTmn8nIPXC0wIAKSZ52yNE0lawBkrIkkIJugH eqXyQsgpzy2J+E5HaOK3utFS4fFgDxOp8FYhqLHmN0Xw2rY/A6kxQNEGFXLifQck ofB1VjJit2mQUrVlN/6MsVVqiiNwXdzseF2s69UaLvnkg1D7ZjsKafOIC2Qs6AEL inmficQdvTF/vBabMwqzaGtQadQJzJR99QSrozv/eE1zjHskW8uDsJdIlzONGGpb bZ5mPH1grSQbm7OOy/MC8/3EhZ9G+y9l49hDTLDN8kEvkWffCFa7au7jx9rf1N8H lzP6dqqC9uvwH8cGB+N0McdFnREtpD/r/320c2Su1LJyUJAkEq9IL62a//D70uQ= =2HOy -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=ccbdf9210aea08c2486b321b192098ad1936f3c3 Target: c2383857790e75ff405c2518a7aaf40bde8ef788 Author: Johannes Schlüter Wed, 10 Apr 2013 09:42:48 +0200 Parents: 65cf185e0a716c75c1466b4f2a415155bfa75c21 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c2383857790e75ff405c2518a7aaf40bde8ef788 Target log: PHP 5.3.24 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: Improve warning when trying to load zend ext as PHP module: ext/standard/dl.c
Commit:9587cf385e9c0220cbd999a13ed73ce5e496515b Author:Johannes Schlüter Wed, 3 Apr 2013 10:59:37 +0200 Parents: 01ca2bf8c3f694c3637a161a5d68f3c947a22c08 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9587cf385e9c0220cbd999a13ed73ce5e496515b Log: Improve warning when trying to load zend ext as PHP module Changed paths: M ext/standard/dl.c Diff: diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 1960e2c..ceb975e 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -171,6 +171,11 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC) } if (!get_module) { + if (DL_FETCH_SYMBOL(handle, "zend_extension_entry") || DL_FETCH_SYMBOL(handle, "_zend_extension_entry")) { + DL_UNLOAD(handle); + php_error_docref(NULL TSRMLS_CC, error_type, "Invalid library (appears to be a Zend Extension, try loading using zend_extension=%s from php.ini)", filename); + return FAILURE; + } DL_UNLOAD(handle); php_error_docref(NULL TSRMLS_CC, error_type, "Invalid library (maybe not a PHP library) '%s'", filename); return FAILURE; -- 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 #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, 2013-04-03 at 19:04 +0800, Laruence wrote: > Hey: >remi did, see https://bugs.php.net/bug.php?id=64503 > >but seems start from 2.4.1 Then please update Zend/acinclude.m4: accordingly. johannes -- 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 #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, 2013-04-03 at 18:26 +0800, Laruence wrote: > > Hey: yes, %code is introduced in bison 2.3+(it is said is 2.3a) . > > so, maybe we need to drop supports of 2.3 in 5.5 release, or > revert this fix,, wait for somethings (like one year) > > thanks > Bison 2.4 is from November 2008. As this is needed by developers only I think it's absolutely fine to depend on 4 year old software. I haven't tested with 2.4. If somebody does/did we should modify the configure check. johannes -- 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 #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
Hi, On Mon, 2013-03-25 at 15:48 +, Xinchen Hui wrote: > +%code requires { > +#ifdef ZTS > +# define YYPARSE_PARAM tsrm_ls > +# define YYLEX_PARAM tsrm_ls > +#endif > +} > + This doesn't seem to work with bison 2.3, either we have to increase the bison dependency or find another fix. Bison 2.3 is default with at least Solaris 11. $ bison --version bison (GNU Bison) 2.3 [...] $ ./config.nice [...] configure:5229: checking for bison version configure:5249: result: 2.3 (ok) [...] $ bison -y -p zend -v -d Zend/zend_language_parser.y -o Zend/zend_language_parser.c Zend/zend_language_parser.y:50.1-5: invalid directive: `%code' Zend/zend_language_parser.y:50.7-14: syntax error, unexpected identifier johannes -- 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.24RC1
Tag php-5.3.24RC1 in php-src.git was created Tag: b6779733e64273dc92eabeaa6afb2301c6560225 Tagger: Johannes Schlüter Thu Mar 28 15:03:32 2013 +0100 Log: PHP 5.3.24RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRVE3EAAoJEH3sTmn8nIPXDdUH/2K4fEn1XtR4bgo/6rc5FpSk uOVPf1wAjfNuUo+AJ+E3L6qCd+UvNZ9FmU/mk/rwv8L2D1Ffcbr9KFDrvHkSQZuY TH8G95RYfMY7RD1YORwROfX5GI/YJK3VpLRg0wv7GjJvTnXdGNrU0G2FBvffXPPm Ml+lcuKEOC839AHQthdgvL+Xcl72iiBXRiAts9Q7iCaMd5NocISNhi0llBtJCJHx UDl5cQj2Bm02sYwHbC1yz8Ks2NgG+V4a5y+fYdC4F2YJQUDTD+ZGzWOQfD0g81AY WyKM/+s/xmYyFrzn7LmWsklogHJLDa1+xSIGjj+Rd8bu//yl4TH9pOH5uhe1tlk= =T3qw -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=b6779733e64273dc92eabeaa6afb2301c6560225 Target: 65cf185e0a716c75c1466b4f2a415155bfa75c21 Author: Johannes Schlüter Thu, 28 Mar 2013 15:03:11 +0100 Parents: c4686b4de93a89e8265331b0d4a6a7954ccbae95 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65cf185e0a716c75c1466b4f2a415155bfa75c21 Target log: PHP 5.3.24RC1 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.24RC1: NEWS configure.in main/php_version.h
Commit:65cf185e0a716c75c1466b4f2a415155bfa75c21 Author:Johannes Schlüter Thu, 28 Mar 2013 15:03:11 +0100 Parents: c4686b4de93a89e8265331b0d4a6a7954ccbae95 Branches: PHP-5.3.24 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65cf185e0a716c75c1466b4f2a415155bfa75c21 Log: PHP 5.3.24RC1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 9d5fc6d..a28657f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.24 +28 Feb 2013, PHP 5.3.24RC1 - Core . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). diff --git a/configure.in b/configure.in index f49e195..c0011d7 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=24 -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 10e5b7d..6aa01b8 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 24 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.24-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.24RC1" #define PHP_VERSION_ID 50324 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: This will PHP 5.3.25: NEWS configure.in main/php_version.h
Commit:46ee57f2d77671bdb13819f71b43b60ca571221b Author:Johannes Schlüter Thu, 28 Mar 2013 15:05:46 +0100 Parents: c4686b4de93a89e8265331b0d4a6a7954ccbae95 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46ee57f2d77671bdb13819f71b43b60ca571221b Log: This will PHP 5.3.25 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 9d5fc6d..18fe3e5 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,15 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.25 + + + ?? ??? 2013, PHP 5.3.24 +## +## Add NEWS entries to 5.3.25 above, RM will merge and update NEWS if needed +## + - Core . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). (Anatol) diff --git a/configure.in b/configure.in index f49e195..ea57f74 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=24 +PHP_RELEASE_VERSION=25 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 --git a/main/php_version.h b/main/php_version.h index 10e5b7d..8ac4945 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 24 +#define PHP_RELEASE_VERSION 25 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.24-dev" -#define PHP_VERSION_ID 50324 +#define PHP_VERSION "5.3.25-dev" +#define PHP_VERSION_ID 50325 -- 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: sapi/cli/php.1.in
Commit:de71f435d8b4e30539284c73bd910f8dcc9e8d98 Author:Johannes Schlüter Sun, 24 Mar 2013 17:32:00 +0100 Parents: bb18fa448c104c10d0899090bf64ca66e36e492e 66682f5abe27e7e53e088ec5d8268754912b5988 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de71f435d8b4e30539284c73bd910f8dcc9e8d98 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM sapi/cli/php.1.in Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Document embedded server options in manpage: sapi/cli/php.1.in
Commit:6f560b0487b48d8364a2077b97e661fd5107054e Author:Johannes Schlüter Sun, 24 Mar 2013 17:32:30 +0100 Parents: de71f435d8b4e30539284c73bd910f8dcc9e8d98 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6f560b0487b48d8364a2077b97e661fd5107054e Log: Document embedded server options in manpage Changed paths: M sapi/cli/php.1.in Diff: diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 3ca1070..0e9d07a 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -42,6 +42,12 @@ php \- PHP Command Line Interface 'CLI' .LP \fBphp \fP[options] \fB\-a\fP .LP +.B php +[options] \-S +.IR addr:port +[\-t +.IR docroot ] +.LP .SH DESCRIPTION \fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for Web development and can be embedded into HTML. This is the command line interface @@ -78,7 +84,13 @@ and therefore reading from .B STDIN explicitly changes the next input line or skips input lines. .LP -If none of \-r \-f \-B \-R \-F or \-E is present but a single parameter is given +PHP also contains an embedded web server for application development purpose. By using the \-S option where +.B addr:port +point to a local address and port PHP will listen to HTTP requests on that address and port and serve files from the current working directory or the +.B docroot +passed by the \-t option. +.LP +If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given then this parameter is taken as the filename to parse and execute (same as with \-f). If no parameter is present then the standard input is read and executed. @@ -263,6 +275,20 @@ after processing all input lines Output HTML syntax highlighted source .TP .PD 0 +.B \-\-server \fIaddr:port\fP +.TP +.PD 1 +.B \-S \fIaddr:port\fP +Start embedded Webserver on the given local address and port +.TP +.PD 0 +.B \-\-docroot \fIdocroot\fP +.TP +.PD 1 +.B \-t \fIdocroot\fP +Specify the document root to be used by the embedded web server +.TP +.PD 0 .B \-\-version .TP .PD 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: It's 2013, even for a manpage: sapi/cli/php.1.in
Commit:66682f5abe27e7e53e088ec5d8268754912b5988 Author:Johannes Schlüter Sun, 24 Mar 2013 17:31:29 +0100 Parents: 638c4b89b7f33a86b45b02f72ee42b25a439863b Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66682f5abe27e7e53e088ec5d8268754912b5988 Log: It's 2013, even for a manpage Changed paths: M sapi/cli/php.1.in Diff: diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index c1fcb27..2dfa499 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -1,4 +1,4 @@ -.TH PHP 1 "2010" "The PHP Group" "Scripting Language" +.TH PHP 1 "2013" "The PHP Group" "Scripting Language" .SH NAME php \- PHP Command Line Interface 'CLI' .SH SYNOPSIS @@ -425,7 +425,7 @@ contributors all around the world. .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @PHP_VERSION@. .SH COPYRIGHT -Copyright \(co 1997\-2010 The PHP Group +Copyright \(co 1997\-2013 The PHP Group .LP 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 -- 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.21
Tag php-5.3.21 in php-src.git was created Tag: 92cdc2983fbad89703d336b3509a42e94d34a9d0 Tagger: Johannes Schlüter Wed Jan 16 17:35:13 2013 +0100 Log: PHP 5.3.21 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQ9tbNAAoJEH3sTmn8nIPXrsUH/3hvbf4jTkvJX8TnPnBIscbe 4wZxMLUjsIk4IPVQ2rn0iL7RODU0ray0I7dn8Lu80BG0J5j1qjJZTo79UE2JuqfG emTIode3co7vKM76Lpa25D48N/QHALP3W/qhErefrQdMuzFbPU12wXS+9PXUPlae fFn+rF50VXdgO5VDhVESr97EAcJZRuT7VIM6/0ZsXQAQWOmArjGr5Yu6jpHBsC64 /3X1yfMSSx95lpdvZlmTW225eYF0qealE36V022loVr0I1YTIq233GxMBd/toHAI L/X3q8Q/IIi9/ClxyaeeRrI59/8Nyw/TY6ueKaS5VLzJPdcYAELcYyVEWmenIjg= =wDIu -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=92cdc2983fbad89703d336b3509a42e94d34a9d0 Target: 854ababcc906677d4379fccab79adc783cd1f3a1 Author: Johannes Schlüter Wed, 16 Jan 2013 17:34:41 +0100 Parents: ec04de6368427909491866cf658e6060f79429ea Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=854ababcc906677d4379fccab79adc783cd1f3a1 Target log: PHP 5.3.21 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.23: NEWS configure.in main/php_version.h
Commit:575aeb37d0f4ce2b5ba9157884a19b8270ae07e3 Author:Johannes Schlüter Thu, 14 Mar 2013 18:07:03 +0100 Parents: 8f533d2dfd1f029b5d1a811fdeac753a4dc0a7a2 Branches: PHP-5.3.23 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=575aeb37d0f4ce2b5ba9157884a19b8270ae07e3 Log: PHP 5.3.23 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 5f19e6d..a03138a 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,10 @@ PHPNEWS ||| -28 Feb 2013, PHP 5.3.23RC1 +14 Mar 2013, PHP 5.3.23 + +- SOAP + . Improved check that soap.wsdl_cache_dir conforms to open_basedir (Dmitry) + . Disabled external entities loading. (Dmitry) - SPL: . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) diff --git a/configure.in b/configure.in index c461df2..3cc0be5 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=23 -PHP_EXTRA_VERSION="RC1" +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 3add96c..978e39d 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 23 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.23RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.3.23" #define PHP_VERSION_ID 50323 -- 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.23
Tag php-5.3.23 in php-src.git was created Tag: 35841ff0fc33b046bd8a3cad0e7342b25059469b Tagger: Johannes Schlüter Thu Mar 14 18:15:30 2013 +0100 Log: PHP 5.3.23 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRQgXIAAoJEH3sTmn8nIPXCD8H/jYonmeZjzODmLhkpEmgc+3G 6N+dME8UAPzB1P3IDnyD/GmoYp1IY5FqVKFtELfFylJOJsyRhQFnZ83QFjIGmu5O vp0+S7zRXXButnafsy3QvoCNybPBG4Df4y4CK1t6G2pQ5L3132aWmjOD6zlD1Zjr sp+SbNvPbsQ/bj7QOj9nbI2dqvlP2yA2g3DAD726YOZ3re7Fq33jBW8w14nrW/f5 buA7Gb0Fr04Mx9fYkBNfgcwFrGnk3TDkmHo+zws7VK+qTU8da/ax09bW6PM/FAu8 VwpD19uP/HR1XoHVd1o3bIPeJURziAd2KzjpzJlgEnWfdUwctNj1Ghjw5/YS99k= =7QP1 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=35841ff0fc33b046bd8a3cad0e7342b25059469b Target: 575aeb37d0f4ce2b5ba9157884a19b8270ae07e3 Author: Johannes Schlüter Thu, 14 Mar 2013 18:07:03 +0100 Parents: 8f533d2dfd1f029b5d1a811fdeac753a4dc0a7a2 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=575aeb37d0f4ce2b5ba9157884a19b8270ae07e3 Target log: PHP 5.3.23 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 #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs): NEWS ext/mysqlnd/mysqlnd_alloc.c ext/mysqlnd/mysqlnd_alloc.h
Commit:064c62e4cf078cf08a40478dfe0e64bd51789e57 Author:Johannes Schlüter Thu, 21 Feb 2013 16:49:28 +0100 Parents: 1e9bc5677505585173ac105c997a09c095f34d1d Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=064c62e4cf078cf08a40478dfe0e64bd51789e57 Log: Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) Bugs: https://bugs.php.net/60840 Changed paths: M NEWS M ext/mysqlnd/mysqlnd_alloc.c M ext/mysqlnd/mysqlnd_alloc.h Diff: diff --git a/NEWS b/NEWS index c9cc2b5..d8df7b6 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,10 @@ PHP NEWS . Fixed bug #61930 (openssl corrupts ssl key resource when using openssl_get_publickey()). (Stas) +- PDO_mysql: + . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). +(Johannes) + - SPL: . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kr...@krizalys.com, Laruence) diff --git a/ext/mysqlnd/mysqlnd_alloc.c b/ext/mysqlnd/mysqlnd_alloc.c index 380a0fb..39c1711 100644 --- a/ext/mysqlnd/mysqlnd_alloc.c +++ b/ext/mysqlnd/mysqlnd_alloc.c @@ -42,7 +42,7 @@ static const char mysqlnd_free_name[] = "_mysqlnd_free"; static const char mysqlnd_pestrndup_name[] = "_mysqlnd_pestrndup"; static const char mysqlnd_pestrdup_name[] = "_mysqlnd_pestrdup"; -const char * mysqlnd_debug_std_no_trace_funcs[] = +PHPAPI const char * mysqlnd_debug_std_no_trace_funcs[] = { mysqlnd_emalloc_name, mysqlnd_ecalloc_name, diff --git a/ext/mysqlnd/mysqlnd_alloc.h b/ext/mysqlnd/mysqlnd_alloc.h index 6bd4385..33c0070 100644 --- a/ext/mysqlnd/mysqlnd_alloc.h +++ b/ext/mysqlnd/mysqlnd_alloc.h @@ -24,7 +24,7 @@ #ifndef MYSQLND_ALLOC_H #define MYSQLND_ALLOC_H -extern const char * mysqlnd_debug_std_no_trace_funcs[]; +PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[]; #define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC #define MYSQLND_MEM_C TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: 5.3.22 NEWS: NEWS
Commit:afc1debb2f48938e98ec35dbc6545b331b1c3096 Author:Johannes Schlüter Wed, 20 Feb 2013 11:56:29 +0100 Parents: 558c5dbe655ffe13d27c47fa02e108302a7dfe73 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=afc1debb2f48938e98ec35dbc6545b331b1c3096 Log: 5.3.22 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 26d56cc..0242cff 100644 --- a/NEWS +++ b/NEWS @@ -6,10 +6,7 @@ PHP NEWS . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kr...@krizalys.com, Laruence) - -?? ??? 2013, PHP 5.3.22 - -## DON'T ADD ENTRIES TO THIS SECTION - TALK TO RM FOR MERGES +21 Feb 2013, PHP 5.3.22 - Zend Engine: . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) @@ -26,6 +23,11 @@ PHP NEWS - FPM: . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) +- SOAP + . Added check that soap.wsdl_cache_dir conforms to open_basedir +(CVE-2013-1635). (Dmitry) + . Disabled external entities loading (CVE-2013-1643). (Dmitry) + - SPL: . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). (Nikita Popov) -- 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.22
Tag php-5.3.22 in php-src.git was created Tag: 0a516d521e97c6bf788f07dc7a49795ad72ae8c2 Tagger: Johannes Schlüter Wed Feb 20 11:53:16 2013 +0100 Log: PHP 5.3.22 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRJKsnAAoJEH3sTmn8nIPXZOoH/AiYHdNaclzprvq0c0oGKgl0 VsTT9/FkeQ9AoygNBmv3O1CpszGsnM6SsV2I2lOycWLiBHYJgZcgTzyI7wnKa6Nl dFXCt6EnisAkU0xYh6weu6h4axx2RxjKAMVg0VMFom+7+2W1/Ege6kGGa5y7vslu /uP4gVQYLOqEdz//BYj5e06EyNe/A8CT8PiNskR/kHUo/SNXYhAkMzs4cOiqdbaC fS4RAamPs1d128TCy4nv2gArLQK00LXtJHGP+SD1ixeKDgEsypkKIDTTRO318VnQ m0DVNXsyMMI7kjPdnwe+GpRRGIqLkymXFK0xFe3WoeiyNYkQi5wi55QksCpXTww= =NU41 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=0a516d521e97c6bf788f07dc7a49795ad72ae8c2 Target: 13616e8856076ee7bd3d661fd492326565ae48ff Author: Johannes Schlüter Wed, 20 Feb 2013 11:52:37 +0100 Parents: 229edf4f3d76bb34637f87b24240631c013ab79e Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13616e8856076ee7bd3d661fd492326565ae48ff Target log: PHP 5.3.22 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] svn: /SVNROOT/ global_avail
johannes Fri, 15 Feb 2013 23:43:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=329485 Log: SVNROOT karma for Ferenc (tyrael) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-02-15 22:11:19 UTC (rev 329484) +++ SVNROOT/global_avail2013-02-15 23:43:33 UTC (rev 329485) @@ -13,7 +13,7 @@ # Some people also have access to the configuration files in the SVNROOT. -avail|sterling,goba,imajes,wez,iliaa,derick,jon,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp,felipe|SVNROOT +avail|sterling,goba,imajes,wez,iliaa,derick,jon,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp,felipe,tyrael|SVNROOT # Some PEAR people get access to the pear-specific avail file in SVNROOT. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
johannes Fri, 15 Feb 2013 22:11:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=329484 Log: svn to git for runkit Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-02-15 16:34:40 UTC (rev 329483) +++ SVNROOT/global_avail2013-02-15 22:11:19 UTC (rev 329484) @@ -296,7 +296,7 @@ avail|ramsey|pecl/uploadprogress,pecl/pdo_user avail|seariver,jgmdev|pecl/wxwidgets avail|pestilence669|pecl/xrange -avail|mlively,dzenovich|pecl/runkit,pecl/classkit +avail|mlively,dzenovich|pecl/php/runkit.git,pecl/classkit avail|thierry|pecl/fam avail|hamano|pecl/tcc avail|graham,myang|pecl/optimizer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Check if soap.wsdl_cache_dir confirms to open_basedir (cherry picked from commit cc4c318b0c71e1a9c9cf803b5ee5d437344d64db): ext/soap/soap.c
Commit:71c63bcfc5456a59b090754cf0b0ba2815e1bf16 Author:Dmitry Stogov Thu, 7 Feb 2013 13:04:47 +0400 Committer: Johannes Schlüter Wed, 13 Feb 2013 21:51:02 +0100 Parents: 8285a82070d7279624b876b0e13e88f629000e66 Branches: PHP-5.3.22 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71c63bcfc5456a59b090754cf0b0ba2815e1bf16 Log: Check if soap.wsdl_cache_dir confirms to open_basedir (cherry picked from commit cc4c318b0c71e1a9c9cf803b5ee5d437344d64db) Changed paths: M ext/soap/soap.c Diff: diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 843f49b..6851a9b 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -568,10 +568,44 @@ ZEND_INI_MH(OnUpdateCacheMode) return SUCCESS; } +static PHP_INI_MH(OnUpdateCacheDir) +{ + /* Only do the safemode/open_basedir check at runtime */ + if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) { + char *p; + + if (memchr(new_value, '\0', new_value_length) != NULL) { + return FAILURE; + } + + /* we do not use zend_memrchr() since path can contain ; itself */ + if ((p = strchr(new_value, ';'))) { + char *p2; + p++; + if ((p2 = strchr(p, ';'))) { + p = p2 + 1; + } + } else { + p = new_value; + } + + if (PG(safe_mode) && *p && (!php_checkuid(p, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { + return FAILURE; + } + + if (PG(open_basedir) && *p && php_check_open_basedir(p TSRMLS_CC)) { + return FAILURE; + } + } + + OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); + return SUCCESS; +} + PHP_INI_BEGIN() STD_PHP_INI_ENTRY("soap.wsdl_cache_enabled", "1", PHP_INI_ALL, OnUpdateBool, cache_enabled, zend_soap_globals, soap_globals) -STD_PHP_INI_ENTRY("soap.wsdl_cache_dir", "/tmp", PHP_INI_ALL, OnUpdateString, +STD_PHP_INI_ENTRY("soap.wsdl_cache_dir", "/tmp", PHP_INI_ALL, OnUpdateCacheDir, cache_dir, zend_soap_globals, soap_globals) STD_PHP_INI_ENTRY("soap.wsdl_cache_ttl", "86400", PHP_INI_ALL, OnUpdateLong, cache_ttl, zend_soap_globals, soap_globals) -- 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.22RC2
Tag php-5.3.22RC2 in php-src.git was created Tag: 489eed2252639afb01cfd82127af03866900f6e6 Tagger: Johannes Schlüter Wed Feb 13 21:55:31 2013 +0100 Log: PHP 5.3.22RC2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRG/3OAAoJEH3sTmn8nIPXUnwH/iz98GeC3wqnCkCQBo5yzFyF kKbkxx7y/9scBa82mh+kSKFNLwnQWelf6gmCxRIiUHv2sAkh0UJidlUKTBgiaf0p ErBWkvB8NBFROMPSwU49Q0ZpTAWGQYVJMY3jUScGEgGFHa95S5VCjPkCqKl/fUt9 exKON04RYX9cSVauf6lA0dfGtDlVJ/9N7iQjTsTp/xsL+sZoZVXvi2Z2U4Ua9gAQ g1vSJWc04hLs0Dele9hbH/gOclpEtgM0UbYW1N6bJUYZPFdnUPR+o/EAcD/qpMGX 4xhwVod7W0Ae8/frwMLo2bOJNlTcZig2TufgqHK1dyZnEINNwjYxNdWX1V638UM= =Jiia -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=489eed2252639afb01cfd82127af03866900f6e6 Target: 229edf4f3d76bb34637f87b24240631c013ab79e Author: Johannes Schlüter Wed, 13 Feb 2013 21:55:12 +0100 Parents: 588d7adcb2660ab6a4e1736b88c45b7e073aa74d Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=229edf4f3d76bb34637f87b24240631c013ab79e Target log: PHP 5.3.22RC2 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] svn: /SVNROOT/ global_avail
johannes Fri, 08 Feb 2013 14:45:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=329453 Log: Move ssdeep to git (on request by Tyrael) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2013-02-08 10:41:06 UTC (rev 329452) +++ SVNROOT/global_avail2013-02-08 14:45:43 UTC (rev 329453) @@ -344,7 +344,7 @@ avail|koubel|pecl/rrd,phpdoc avail|mbechler|pecl/krb5,phpdoc avail|cubrid|pecl/cubrid,phpdoc -avail|treffynnon|pecl/ssdeep,phpdoc +avail|treffynnon|pecl/text/ssdeep.git,phpdoc avail|nicolas,nathanb|pecl/judy,phpdoc avail|hanez|pecl/pcsc,phpdoc avail|martynas|pecl/htscanner,phpdoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix typo in error message: ext/snmp/snmp.c
Commit:b09f5a4f56348a2f0b12f3d1a15b880845aca9c6 Author:Johannes Schlüter Fri, 1 Feb 2013 12:31:07 +0100 Parents: 9d75bf35e96bfc5c8d629ecef6807a90b4c98be7 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b09f5a4f56348a2f0b12f3d1a15b880845aca9c6 Log: Fix typo in error message Changed paths: M ext/snmp/snmp.c Diff: diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 926b666..037fcce 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1135,7 +1135,7 @@ static int netsnmp_session_init(php_snmp_session **session_p, int version, char } *pptr = '\0'; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "mailformed IPv6 address, closing square bracket missing"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "malformed IPv6 address, closing square bracket missing"); return (-1); } } else { /* IPv4 address */ -- 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' into PHP-5.5: ext/snmp/snmp.c
Commit:9c821ec7a1003f5f7988114e8724657dbe026e7d Author:Johannes Schlüter Fri, 1 Feb 2013 12:32:00 +0100 Parents: 4608341303a35d05cd9d12c7db39c702151a5d39 b09f5a4f56348a2f0b12f3d1a15b880845aca9c6 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c821ec7a1003f5f7988114e8724657dbe026e7d Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/snmp/snmp.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: This will be PHP 5.3.23: NEWS configure.in main/php_version.h
Commit:a80fdc47b3b5046188aee6a9ef310879322cf4e9 Author:Johannes Schlüter Thu, 31 Jan 2013 00:57:29 +0100 Parents: 321f4f18e52bfabe19fb9217dff0bf661d48e5d3 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a80fdc47b3b5046188aee6a9ef310879322cf4e9 Log: This will be PHP 5.3.23 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index c230d22..e4ee218 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,12 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.3.23 + + ?? ??? 2013, PHP 5.3.22 +## DON'T ADD ENTRIES TO THIS SECTION - TALK TO RM FOR MERGES + - Zend Engine: . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) diff --git a/configure.in b/configure.in index f6f52bd..eb7781e 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=22 +PHP_RELEASE_VERSION=23 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 --git a/main/php_version.h b/main/php_version.h index dd418f3..3a4fbe1 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 22 +#define PHP_RELEASE_VERSION 23 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.22-dev" -#define PHP_VERSION_ID 50322 +#define PHP_VERSION "5.3.23-dev" +#define PHP_VERSION_ID 50323 -- 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.22RC1
Tag php-5.3.22RC1 in php-src.git was created Tag: 3f00f76f7c93ad297849c938304f1bfd0f6db03b Tagger: Johannes Schlüter Thu Jan 31 00:54:45 2013 +0100 Log: PHP 5.3.22RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJRCbLcAAoJEH3sTmn8nIPXhNYH/0ptXE8qRBEDpQ0YLte91Rh3 3CFGWX4ua57Fo0/PKUHElbcwu/pbHsFu3raf5NOVMTF6YwVUAeF5qMRPvh9pSRHV 0n0A0aVSJCk/z1NQ0/cod4UuVFgv35fQZyK3paYIAA/UT46nqAcvBROKGKH/UJLf IzB+S9rwzSM3UJN7p5BF7fV6t0KVgCv5kTUE722JnRjGEDY+Xc2fuqcvo/0Z1gnU K49fl9EUnGg/4ZcmIITDHb3G/qscByJIRmW98l3KEw1YVmsf74nynAQqOVHvN73B 5S1dlEYC48oOG2ZHfXo2QyflD2JGxZ696k2NmubEHObFJ+mqzwyzcV5AvQUM5Zs= =pTCe -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=3f00f76f7c93ad297849c938304f1bfd0f6db03b Target: 8285a82070d7279624b876b0e13e88f629000e66 Author: Johannes Schlüter Thu, 31 Jan 2013 00:51:16 +0100 Parents: 321f4f18e52bfabe19fb9217dff0bf661d48e5d3 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8285a82070d7279624b876b0e13e88f629000e66 Target log: PHP 5.3.22RC1 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: Zend/zend_API.h
Commit:1433854681d8cd37803873b2f891a8d60d77cc3c Author:Johannes Schlüter Tue, 29 Jan 2013 19:49:43 +0100 Parents: 264279439b5707ecbc21ad06c8f48d3ffd6bd862 ec53b60072799704a0d94cdd935bdf54bd5e5344 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1433854681d8cd37803873b2f891a8d60d77cc3c Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_API.h Diff: -- 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' into PHP-5.5: Zend/zend_API.h
Commit:78d3e66f3ae4230cee0c28722284948201e001d8 Author:Johannes Schlüter Tue, 29 Jan 2013 19:50:14 +0100 Parents: 078b025a15a22c290f36e66b0c3336376623266e 1433854681d8cd37803873b2f891a8d60d77cc3c Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=78d3e66f3ae4230cee0c28722284948201e001d8 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM Zend/zend_API.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix NEWS after 5.3.21: NEWS
Commit:be2f547497c32e845f99516df4785ddb3fbff416 Author:Johannes Schlüter Wed, 16 Jan 2013 17:38:17 +0100 Parents: f63a9f6c11c05aa76158b6cae0e05340d303a6af Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be2f547497c32e845f99516df4785ddb3fbff416 Log: Fix NEWS after 5.3.21 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 928d829..6a3acec 100644 --- a/NEWS +++ b/NEWS @@ -1,18 +1,27 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.3.23 - ?? ??? 2013, PHP 5.3.22 - Zend Engine: . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) - . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). -(Johannes) - Core . Fixed bug #63943 (Bad warning text from strpos() on empty needle). (Laruence) +- Date: + . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV). +(Laruence, Derick) + +- FPM: + . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) + +17 Jan 2013, PHP 5.3.21 + +- Zend Engine: + . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). +(Johannes) + - cURL extension: . Fixed bug (segfault due to libcurl connection caching). (Pierrick) . Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for @@ -22,13 +31,6 @@ PHP NEWS . Fixed bug #55438 (Curlwapper is not sending http header randomly). (php...@lostreality.org, Pierrick) -- Date: - . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV). -(Laruence, Derick) - -- FPM: - . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) - 20 Dec 2012, PHP 5.3.20 - Zend Engine: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias): NEWS Zend/zend_API.h
Commit:93fd9c704b9aae141008274e9f3bd2775116a83a Author:Johannes Schlüter Tue, 29 Jan 2013 19:47:45 +0100 Parents: be2f547497c32e845f99516df4785ddb3fbff416 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=93fd9c704b9aae141008274e9f3bd2775116a83a Log: Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias) Bugs: https://bugs.php.net/64099 Changed paths: M NEWS M Zend/zend_API.h Diff: diff --git a/NEWS b/NEWS index 6a3acec..24a1ba8 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2013, PHP 5.3.22 - Zend Engine: + . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) - Core diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 05170f2..f6f2c46 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -268,9 +268,9 @@ ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC); #define zend_register_class_alias(name, ce) \ - zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_DC) + zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC) #define zend_register_ns_class_alias(ns, name, ce) \ - zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_DC) + zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC) ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC); ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
johannes Thu, 17 Jan 2013 15:35:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=329181 Log: Upgrade Sherif Ramadan (googleguy) with php-src karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail 2013-01-17 15:23:11 UTC (rev 329180) +++ SVNROOT/global_avail 2013-01-17 15:35:55 UTC (rev 329181) @@ -22,7 +22,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git +avail|patrickallaert,mgdm,pierrick,ilewis,mkoppanen,lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler,sean,dkelsey,tabe,ericstewart,mbeccati,sebs,garretts,guenter,srinatar,basantk,geissert,salathe,aharvey,mj,gron,uw,fat,cataphract,sbeattie,acurioso,lytboris,shm,fa,laruence,arpad,nikic,jawed,ab,ircmaxell,tstarling,tyrael,jpauli,remi,googleguy|php-src.git,pecl,phpdoc,phd.git,web/doc.git,web/doc-editor.git # Engine karma is further restricted (this line MUST come after lines granting # php-src karma and before lines granting Zend/TSRM karma) @@ -53,7 +53,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,frogger,coldocean,fleaslob,torben,lynch,kk,ted,paul,mbritton,bibi,mrobinso,perugini,tzwenny,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,danbeck,sli,jmcastagnetto,mohrt,samesch,soneca,ronabop,glace,latoserver,rafael,jcmeloni,chrullrich,mk,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zimt,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,matroz,ave,adu,mmei
[PHP-CVS] tag php-src: create tag php-5.3.21RC1
Tag php-5.3.21RC1 in php-src.git was created Tag: 0c94d2c5b38d575189ef36df01944b6327a2d03f Tagger: Johannes Schlüter Thu Jan 3 22:57:55 2013 +0100 Log: PHP 5.3.21 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQ5f7sAAoJEH3sTmn8nIPXTLAIAMFIZvAPNwDqQ6ZpYgOWRHPa GnDkYo0TazyCm1oGI5gjwXq55Oaa5UKp28eBdHLG9lXTcgCneTV+bS2aga/h3BMv vavN/v2jotdZlFOqP56OwiQISnH14Z7z90FVS37CSNRYQfsfX9j6xVBdHon7gJlK lRvHpFIJ/QfJmZUO7YOJhCDKh/Rkw2hrFs0m2Dpy37bVW7T8fJXRzWT+KcNjZtHu PyUcU2qBN9q+/iMkXW3PqssUPdDZ92ONPyOZbnqVeq0Q3mttrwXdYE3veA3eitFN L5t8yj7SQsTu0IfC/HZETVe3M6V9hHZYhb/DnGnuWjjSJHFPEVCXe0BLHuxKyok= =pLF+ -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=0c94d2c5b38d575189ef36df01944b6327a2d03f Target: ec04de6368427909491866cf658e6060f79429ea Author: Johannes Schlüter Thu, 3 Jan 2013 22:47:29 +0100 Parents: 831fbcf3852dc866697f02f76df61ccee915e047 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec04de6368427909491866cf658e6060f79429ea Target log: PHP 5.3.21RC1 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: Update release date: NEWS
Commit:e01fe5315c5fd03231641f7bb0819dbfaaadf935 Author:Johannes Schlüter Wed, 19 Dec 2012 16:15:39 +0100 Parents: 06739a1b72ce1e7192108f9b313746814912a425 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e01fe5315c5fd03231641f7bb0819dbfaaadf935 Log: Update release date Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 78c4b7c..f5b2069 100644 --- a/NEWS +++ b/NEWS @@ -6,9 +6,7 @@ PHP NEWS . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). (Johannes) -?? ??? 2012, PHP 5.3.20 - - ADD NEWS TO 5.3.21 ONLY +20 Dec 2012, PHP 5.3.20 - Zend Engine: . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) -- 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.20
Tag php-5.3.20 in php-src.git was created Tag: a6eb90a4cafeba3ac7186742809a8c1744ab0a67 Tagger: Johannes Schlüter Wed Dec 19 16:14:07 2012 +0100 Log: PHP 5.3.20 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQ0dnUAAoJEH3sTmn8nIPX2mUH/12QMdfUDEdrNJRFOqp3hEt9 JtS/AMM0lBnf9TdazyhdjTpvKQNY7WKMQbVxJEW4VnPJZAOzeE7xi/38tzkQWJjO YrnI9LHvM4JxWmYfMu1EUdnqN+LYhHD9viaJ6Vyd6vualDdwuDJG3zvr9qIK5r4E 0O5KLBPXQ3xnXn4VS5VS+f6ps1fMPJfOB68MpeXzn93FHcwk8jmbF32kockCfc7p +jvyh0OWHBbufb845zwEQ+Gb3L1U7GyTjYVuZrq4ZCM9VWMFVRzhFC5s3RVtt8cr CSq8F5Jm9Fuq2e2VX/QRh07IwjiV/RpmOT0E7IhOep0WQoI3LfNTnq2BA9g1HTU= =WBh7 -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=a6eb90a4cafeba3ac7186742809a8c1744ab0a67 Target: 13adcc108d882e792b765fbfc4849eb7bd4e9863 Author: Johannes Schlüter Wed, 19 Dec 2012 16:13:48 +0100 Parents: c31ce8a12502fc7db84a05c36c493f4f5a84a044 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13adcc108d882e792b765fbfc4849eb7bd4e9863 Target log: PHP 5.3.20 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 Bug #63762 Sigsegv when Exception::$trace is changed by user: NEWS Zend/tests/bug63762.phpt Zend/zend_exceptions.c
Commit:a11606b18fd20be1048a858eb5011fb7117855a9 Author:Johannes Schlüter Thu, 13 Dec 2012 22:39:35 +0100 Parents: 39a3007ab2f88d860beb524024ab97fb13110561 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a11606b18fd20be1048a858eb5011fb7117855a9 Log: Fix Bug #63762 Sigsegv when Exception::$trace is changed by user Bugs: https://bugs.php.net/63762 Changed paths: M NEWS A Zend/tests/bug63762.phpt M Zend/zend_exceptions.c Diff: diff --git a/NEWS b/NEWS index 52b1b82..78c4b7c 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||| ?? ??? 2013, PHP 5.3.21 +- Zend Engine: + . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). +(Johannes) + ?? ??? 2012, PHP 5.3.20 ADD NEWS TO 5.3.21 ONLY diff --git a/Zend/tests/bug63762.phpt b/Zend/tests/bug63762.phpt new file mode 100644 index 000..8de177d --- /dev/null +++ b/Zend/tests/bug63762.phpt @@ -0,0 +1,53 @@ +--TEST-- +Bug #63762 - Sigsegv when Exception::$trace is changed by user +--FILE-- +setAccessible(TRUE); + +echo "Array of NULL:\n"; +$ref->setValue($e, array(NULL)); + +var_dump($e->getTraceAsString()); + +echo "\nArray of empty array:\n"; +$ref->setValue($e, array(array())); +var_dump($e->getTraceAsString()); + +echo "\nArray of array of NULL values:\n"; +$ref->setValue($e, array(array( +'file' => NULL, +'line' => NULL, +'class' => NULL, +'type' => NULL, +'function' => NULL, +'args' => NULL +))); +var_dump($e->getTraceAsString()); +?> +--EXPECTF-- +Array of NULL: + +Warning: Expected array for frame 0 in %s on line %d +string(9) "#0 {main}" + +Array of empty array: +string(36) "#0 [internal function]: () +#1 {main}" + +Array of array of NULL values: + +Warning: Function name is no string in %s on line %d + +Warning: Value for class is no string in %s on line %d + +Warning: Value for type is no string in %s on line %d + +Warning: Value for function is no string in %s on line %d + +Warning: args element is no array in %s on line %d +string(60) "#0 [unknown function][unknown][unknown][unknown]() +#1 {main}" + diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index a83053e..e947a97 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -337,9 +337,14 @@ ZEND_METHOD(error_exception, getSeverity) #define TRACE_APPEND_STR(val)\ TRACE_APPEND_STRL(val, sizeof(val)-1) -#define TRACE_APPEND_KEY(key)\ - if (zend_hash_find(ht, key, sizeof(key), (void**)&tmp) == SUCCESS) { \ - TRACE_APPEND_STRL(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); \ +#define TRACE_APPEND_KEY(key) \ + if (zend_hash_find(ht, key, sizeof(key), (void**)&tmp) == SUCCESS) { \ + if (Z_TYPE_PP(tmp) != IS_STRING) { \ + zend_error(E_WARNING, "Value for %s is no string", key); \ + TRACE_APPEND_STR("[unknown]"); \ + } else { \ + TRACE_APPEND_STRL(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); \ + } \ } /* }}} */ @@ -448,6 +453,11 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg HashTable *ht = Z_ARRVAL_PP(frame); zval **file, **tmp; + if (Z_TYPE_PP(frame) != IS_ARRAY) { + zend_error(E_WARNING, "Expected array for frame %lu", hash_key->h); + return ZEND_HASH_APPLY_KEEP; + } + str = va_arg(args, char**); len = va_arg(args, int*); num = va_arg(args, int*); @@ -457,15 +467,25 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg TRACE_APPEND_STRL(s_tmp, strlen(s_tmp)); efree(s_tmp); if (zend_hash_find(ht, "file", sizeof("file"), (void**)&file) == SUCCESS) { - if (zend_hash_find(ht, "line", sizeof("line"), (void**)&tmp) == SUCCESS) { - line = Z_LVAL_PP(tmp); - } else { - line = 0; + if (Z_TYPE_PP(file) != IS_STRING) { + zend_error(E_WARNING, "Function name is no string"); + TRACE_APPEND_STR("[unknown function]"); + } else
[PHP-CVS] com php-src: Fix typo: NEWS
Commit:795e3f1c0fa3a41cd933cc3ab3cd1867bbc7b817 Author:Johannes Schlüter Mon, 10 Dec 2012 13:32:08 +0100 Parents: db6d8e27247429746985cf1c424e73728449922f Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=795e3f1c0fa3a41cd933cc3ab3cd1867bbc7b817 Log: Fix typo Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 1ec60e3..52b1b82 100644 --- a/NEWS +++ b/NEWS @@ -23,7 +23,7 @@ PHP NEWS . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) - Date: - . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecon). + . Fixed bug #63435 (Datetime::format('u') sometimes wrong by 1 microsecond). (Remi) - Fileinfo: -- 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.20RC1
Tag php-5.3.20RC1 in php-src.git was created Tag: 12070197112944b3a82d2874d78125d6b094daa5 Tagger: Johannes Schlüter Wed Dec 5 18:51:32 2012 +0100 Log: PHP 5.3.20RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQv4mxAAoJEH3sTmn8nIPXQYEIAOQB+IZgtvE1VWwplX2ADA+/ bTcYWmK8Dz2lKSmQHqxvifYBlm5CPYq/DWmofKi4rl7eyZsbahyErSAAhIO1Ldze 2dOm9Ga7t7AU+ZmRqp6scMnzK+KnN/ak7F17F8uURMxxOrTtuoP3l4lMuoh0J/lk IRprIVX6LvaUNCDlc/JlkyVhJ1YPRgvpMm759O4r9gd1vkbbk/+yktq1FwmM4Y4U 0xPKWvX6BdpyMyVXaeR4eECDpPAcAZq+51e3A2CRM1mXIylZaMiS0KbejbwSVOTp SskiSh/Y4jM1v4EK6uNiUFs6ikqXLSWDrseH5w/qrVjTRt2uH6NdCw/PCCHSPKc= =IjvB -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=12070197112944b3a82d2874d78125d6b094daa5 Target: c31ce8a12502fc7db84a05c36c493f4f5a84a044 Author: Johannes Schlüter Wed, 5 Dec 2012 18:50:59 +0100 Parents: 94cbd6374adcb3e2ac15303dd47a212953f93e98 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c31ce8a12502fc7db84a05c36c493f4f5a84a044 Target log: PHP 5.3.20RC1 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.19: NEWS
Commit:cc315e79e17b7c2a64fbd0a138eaeab64530de9e Author:Johannes Schlüter Wed, 21 Nov 2012 21:09:25 +0100 Parents: 396c1e990a0e513cf2e8510e9b6f82ab425c9e3a Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc315e79e17b7c2a64fbd0a138eaeab64530de9e Log: PHP 5.3.19 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 717a382..fab5c16 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2ß12, PHP 5.3.20 +?? ??? 2012, PHP 5.3.20 - Zend Engine: . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes @@ -14,12 +14,7 @@ PHP NEWS . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) -?? ??? 2012, PHP 5.3.19 - -! -ADD NEWS ONLY ABOVE IN 5.3.20 SECTION -! -RM will merge 5.3.19 entries when merging to release branch +22 Nov 2012, PHP 5.3.19 - Core . Fixed bug #63241 (PHP fails to open Windows deduplicated files). -- 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.19
Tag php-5.3.19 in php-src.git was created Tag: 2a6f699d12a0fe28b62e3e6ece3bb9ca5d752408 Tagger: Johannes Schlüter Wed Nov 21 21:07:48 2012 +0100 Log: PHP 5.3.19 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQrTSiAAoJEH3sTmn8nIPXw7QIAJJJCWNptRKaOOpPI9ku0Gr+ ZMRpV/diHyFLAizp83OlCFhVsYdzvlKgHrhd9GxXn7EF7PlBpqG6xqvREAWBUYhn ExylzIAVYKNk/mfWl+3N6VVBopY07VDQn5hYFIGKFqSRaP/LJIU9hqzBSr2gQvl0 jI6zzILYebZIYTRKl31fangqW3NMyFxcFpz9lOf3eoUsUfEuuAUBd48BCw0ltTpP Wl/eOkZDMS3Xo29z7SqJgxoC2OLnF5KDCgb4QogDtemFKBGBcPCusC5hqPtRl03N 14ZQ+kHNfkew20g4HXh6zpZxn1PJwAN+x99XlD7aqQZYiAIUKuuqW5Zirce1BoA= =6XNI -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=2a6f699d12a0fe28b62e3e6ece3bb9ca5d752408 Target: f0799ceeb404cf7f7132cc85f075e1bd2648298d Author: Johannes Schlüter Wed, 21 Nov 2012 21:07:23 +0100 Parents: ff65385742c39a739f369baa4d5b5dcc4d31165b Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0799ceeb404cf7f7132cc85f075e1bd2648298d Target log: PHP 5.3.19 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
Re: [PHP-CVS] com php-src: Skip test if directory does not exist: tests/security/open_basedir_001.phpt
On Nov 15, 2012, at 22:45, Ferenc Kovacs wrote: > why not using create_directories() from open_basedir.inc ? We need a directory we can use in the phpt INI section. It has to exist during PHP startup. What we might do is add preprocessing to the INI section so we could I.e. set open_basedir=$PHP_SRC/ext and depend on PHP's source tree layout. I fear this opens a can of worms of new issues though. If you have a good solution: Feel free to apply it! :) Skipping a security test is bad (as is a failing security test) Thinking about it more: /tmp might work. We might set open_basedir to /tmp and create a directory /tmp/php_open_basedir_12456 inside the test and use that inside the test. Will try that when home. johannes > On Thu, Nov 15, 2012 at 12:49 PM, Pierre Joye wrote: >> it would be much better to use the current directory or root tests >> directory for this kind of tests. Maybe adding a kind of constant we >> can expand in run-tests.php? >> >> On Thu, Nov 15, 2012 at 12:28 PM, Johannes Schlüter wrote: >> > Commit:7468fc0e374ad8cd8db482e6c228cdaae8aed075 >> > Author:Johannes Schlüter Thu, 15 Nov 2012 >> > 12:28:19 +0100 >> > Parents: f5d8b638c7864150db3e7d39ecf3808850c82e0f >> > Branches: PHP-5.3 PHP-5.4 PHP-5.5 master >> > >> > Link: >> > http://git.php.net/?p=php-src.git;a=commitdiff;h=7468fc0e374ad8cd8db482e6c228cdaae8aed075 >> > >> > Log: >> > Skip test if directory does not exist >> > >> > Would be good to run this using a directory which is existing >> > everywhere. >> > >> > Changed paths: >> > M tests/security/open_basedir_001.phpt >> > >> > >> > Diff: >> > diff --git a/tests/security/open_basedir_001.phpt >> > b/tests/security/open_basedir_001.phpt >> > index e05861a..9ea9559 100644 >> > --- a/tests/security/open_basedir_001.phpt >> > +++ b/tests/security/open_basedir_001.phpt >> > @@ -5,6 +5,9 @@ openbase_dir runtime tightning >> > if (substr(PHP_OS, 0, 3) == 'WIN') { >> > die('skip.. only for unix'); >> > } >> > +if (!is_dir("/usr/local/bin")) { >> > + die('skip.. no /usr/local/bin on this machine'); >> > +} >> > --INI-- >> > open_basedir=/usr/local >> > --FILE-- >> > >> > >> > -- >> > PHP CVS Mailing List (http://www.php.net/) >> > To unsubscribe, visit: http://www.php.net/unsub.php >> > >> >> >> >> -- >> Pierre >> >> @pierrejoye | http://blog.thepimp.net | http://www.libgd.org >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php > > > > -- > Ferenc Kovács > @Tyr43l - http://tyrael.hu
Re: [PHP-CVS] com php-src: Updated NEWS: NEWS UPGRADING
On Wed, 2012-11-14 at 09:02 +, Anatoliy Belsky wrote: > > +- Apache 2.4 handler is supported as of PHP 5.3.20 > + That's Windows specific, isn't? From source, I think, we supported this for a while already. johannes -- 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.19RC1
Tag php-5.3.19RC1 in php-src.git was created Tag: 98dd54e5cb31d3034ddba91099af75778a6075b3 Tagger: Johannes Schlüter Wed Nov 7 23:58:56 2012 +0100 Log: 5.3.19RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.17 (SunOS) iQEcBAABAgAGBQJQmue6AAoJEH3sTmn8nIPXuxAIAOhPh59CvMbYVZu+GTSrxndX 85l/6bOuDg6G8EbL/GSq+YwSx3bROXPlYbZVj3C4oM/9iwpAkghcapxWIGlp0lSB JFXiE/xamNwmTYWiumYvF/eqy0oUGhAx5L/voyci45D96MINiMNuLwNZ0bjmxAQj 5fFAVqadw8I/UQgNAAgpFZ0gtny4axuKmFD3UjZevJA7LUx5Qs6RC+IPz0nf8AgR 4NlHEcT25c5JBWc5uMmbUuMwxNqwEp7YhNLa/rNdGLbHY0H28Md2qb2VpN1WO53t 5HsKeXrAVMrJFmFGMDzglYW+IaeV/4AxjlHkyZq+DCmfFLJas8ODXUX7O4Uh+d4= =Jlez -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=98dd54e5cb31d3034ddba91099af75778a6075b3 Target: ff65385742c39a739f369baa4d5b5dcc4d31165b Author: Johannes Schlüter Wed, 7 Nov 2012 23:58:36 +0100 Parents: 7fcbe4d5467300a0acee78330a0cdc9d1cbf05ad Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff65385742c39a739f369baa4d5b5dcc4d31165b Target log: 5.3.19RC1 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