[PHP-CVS] com php-src: Reverted patch (it was used for internal testing and was committed by accident): sapi/cgi/cgi_main.c
Commit:51fca2b4b35c5db11a7136087fbf8cf3651200c1
Author:Dmitry Stogov dmi...@zend.com Tue, 1 Oct 2013 11:32:11
+0400
Parents: aeb6e9c264fc0054fb829da13c739cdafa276115
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=51fca2b4b35c5db11a7136087fbf8cf3651200c1
Log:
Reverted patch (it was used for internal testing and was committed by accident)
Changed paths:
M sapi/cgi/cgi_main.c
Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4f3d504..4c78fca 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -154,7 +154,6 @@ static const opt_struct OPTIONS[] = {
{'?', 0, usage},/* help alias (both '?' and 'usage') */
{'v', 0, version},
{'z', 1, zend-extension},
- {'W', 1, warmup},
{'T', 1, timing},
{'-', 0, NULL} /* end of args */
};
@@ -1755,7 +1754,6 @@ int main(int argc, char *argv[])
int fcgi_fd = 0;
fcgi_request *request = NULL;
int repeats = 1;
- int warmup_repeats = 0;
int benchmark = 0;
#if HAVE_GETTIMEOFDAY
struct timeval start, end;
@@ -2105,9 +2103,6 @@ consult the installation file that came with this
distribution, or visit \n\
time(start);
#endif
break;
- case 'W':
- warmup_repeats = atoi(php_optarg);
- break;
case 'h':
case '?':
if (request) {
@@ -2521,24 +2516,12 @@ fastcgi_request_done:
if (!fastcgi) {
if (benchmark) {
- if (warmup_repeats) {
- warmup_repeats--;
- if (!warmup_repeats) {
-#ifdef HAVE_GETTIMEOFDAY
- gettimeofday(start,
NULL);
-#else
- time(start);
-#endif
- }
+ repeats--;
+ if (repeats 0) {
+ script_file = NULL;
+ php_optind = orig_optind;
+ php_optarg = orig_optarg;
continue;
- } else {
- repeats--;
- if (repeats 0) {
- script_file = NULL;
- php_optind =
orig_optind;
- php_optarg =
orig_optarg;
- continue;
- }
}
}
break;
--
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': sapi/cgi/cgi_main.c
Commit:66cd9ef04cf20ead3db58f0bb387bb2070dbc591 Author:Dmitry Stogov dmi...@zend.com Tue, 1 Oct 2013 11:34:19 +0400 Parents: 954a0f8bf4f8779f509b8361c1bc02246bd1ea20 51fca2b4b35c5db11a7136087fbf8cf3651200c1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66cd9ef04cf20ead3db58f0bb387bb2070dbc591 Log: Merge branch 'PHP-5.5' * PHP-5.5: Reverted patch (it was used for internal testing and was committed by accident) Changed paths: MM sapi/cgi/cgi_main.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fixed bug #61548: NEWS ext/standard/http_fopen_wrapper.c ext/standard/tests/http/bug61548.phpt
Commit:18b04b480ebc41841b2004cc11797eda40fb3958
Author:Michael Wallner m...@php.net Tue, 1 Oct 2013 11:07:55 +0200
Parents: 679bf479b63356f977c0bb04b5650b86cd4e15a1
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=18b04b480ebc41841b2004cc11797eda40fb3958
Log:
Fixed bug #61548
Bugs:
https://bugs.php.net/61548
Changed paths:
M NEWS
M ext/standard/http_fopen_wrapper.c
A ext/standard/tests/http/bug61548.phpt
Diff:
diff --git a/NEWS b/NEWS
index 4dc7ef7..9bb6032 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,10 @@ PHP
NEWS
. Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
imap). (ryotakatsuki at gmail dot com)
+- Standard:
+ . Fixed bug #61548 (content-type must appear at the end of headers for 201
+Location to work in http). (Mike)
+
19 Sep 2013, PHP 5.4.20
- Core:
diff --git a/ext/standard/http_fopen_wrapper.c
b/ext/standard/http_fopen_wrapper.c
index b8676bb..4605e74 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -84,6 +84,30 @@
#define HTTP_WRAPPER_HEADER_INIT1
#define HTTP_WRAPPER_REDIRECTED 2
+static inline void strip_header(char *header_bag, char *lc_header_bag,
+ const char *lc_header_name)
+{
+ char *lc_header_start = strstr(lc_header_bag, lc_header_name);
+ char *header_start = header_bag + (lc_header_start - lc_header_bag);
+
+ if (lc_header_start
+(lc_header_start == lc_header_bag || *(lc_header_start-1) == '\n')
+ ) {
+ char *lc_eol = strchr(lc_header_start, '\n');
+ char *eol = header_start + (lc_eol - lc_header_start);
+
+ if (lc_eol) {
+ size_t eollen = strlen(lc_eol);
+
+ memmove(lc_header_start, lc_eol+1, eollen);
+ memmove(header_start, eol+1, eollen);
+ } else {
+ *lc_header_start = '\0';
+ *header_start = '\0';
+ }
+ }
+}
+
php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char
*path, char *mode, int options, char **opened_path, php_stream_context
*context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */
{
php_stream *stream = NULL;
@@ -425,40 +449,17 @@ finish:
if (tmp strlen(tmp) 0) {
char *s;
- if (!header_init) { /* Remove post headers for
redirects */
- int l = strlen(tmp);
- char *s2, *tmp_c = estrdup(tmp);
-
- php_strtolower(tmp_c, l);
- if ((s = strstr(tmp_c, content-length:))) {
- if ((s2 = memchr(s, '\n', tmp_c + l -
s))) {
- int b = tmp_c + l - 1 - s2;
- memmove(tmp, tmp + (s2 + 1 -
tmp_c), b);
- memmove(tmp_c, s2 + 1, b);
-
- } else {
- tmp[s - tmp_c] = *s = '\0';
- }
- l = strlen(tmp_c);
- }
- if ((s = strstr(tmp_c, content-type:))) {
- if ((s2 = memchr(s, '\n', tmp_c + l -
s))) {
- memmove(tmp, tmp + (s2 + 1 -
tmp_c), tmp_c + l - 1 - s2);
- } else {
- tmp[s - tmp_c] = '\0';
- }
- }
-
- efree(tmp_c);
- tmp_c = php_trim(tmp, strlen(tmp), NULL, 0,
NULL, 3 TSRMLS_CC);
- efree(tmp);
- tmp = tmp_c;
- }
-
user_headers = estrdup(tmp);
/* Make lowercase for easy comparison against
'standard' headers */
php_strtolower(tmp, strlen(tmp));
+
+ if (!header_init) {
+ /* strip POST headers on redirect */
+ strip_header(user_headers, tmp,
content-length:);
+ strip_header(user_headers, tmp,
content-type:);
+ }
+
if ((s = strstr(tmp, user-agent:))
(s == tmp || *(s-1) == '\r' || *(s-1) == '\n' ||
*(s-1) == '\t' || *(s-1) == ' ')) {
diff --git
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/standard/http_fopen_wrapper.c
Commit:d29a01de3f35a33c539a805e28a22a6514924a19
Author:Michael Wallner m...@php.net Tue, 1 Oct 2013 11:11:48 +0200
Parents: 66cd9ef04cf20ead3db58f0bb387bb2070dbc591
ad139d9a00d9de206c7aae4f85eff08eff2c429e
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d29a01de3f35a33c539a805e28a22a6514924a19
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #61548
Conflicts:
ext/standard/http_fopen_wrapper.c
Bugs:
https://bugs.php.net/61548
Changed paths:
MM ext/standard/http_fopen_wrapper.c
Diff:
diff --cc ext/standard/http_fopen_wrapper.c
index 8762fa4,4605e74..f5184ce
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@@ -85,8 -84,31 +85,33 @@@
#define HTTP_WRAPPER_HEADER_INIT1
#define HTTP_WRAPPER_REDIRECTED 2
- php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, const
char *path, const char *mode, int options,
-
char **opened_path, php_stream_context *context, int redirect_max, int flags
STREAMS_DC TSRMLS_DC) /* {{{ */
+ static inline void strip_header(char *header_bag, char *lc_header_bag,
+ const char *lc_header_name)
+ {
+ char *lc_header_start = strstr(lc_header_bag, lc_header_name);
+ char *header_start = header_bag + (lc_header_start - lc_header_bag);
+
+ if (lc_header_start
+(lc_header_start == lc_header_bag || *(lc_header_start-1) == '\n')
+ ) {
+ char *lc_eol = strchr(lc_header_start, '\n');
+ char *eol = header_start + (lc_eol - lc_header_start);
+
+ if (lc_eol) {
+ size_t eollen = strlen(lc_eol);
+
+ memmove(lc_header_start, lc_eol+1, eollen);
+ memmove(header_start, eol+1, eollen);
+ } else {
+ *lc_header_start = '\0';
+ *header_start = '\0';
+ }
+ }
+ }
+
-php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char
*path, char *mode, int options, char **opened_path, php_stream_context
*context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */
++php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
++ const char *path, const char *mode, int options, char
**opened_path,
++ php_stream_context *context, int redirect_max, int flags
STREAMS_DC TSRMLS_DC) /* {{{ */
{
php_stream *stream = NULL;
php_url *resource = NULL;
--
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.5.5RC1
Tag php-5.5.5RC1 in php-src.git was created Tag: cf2a9478a5195840d6cd2acab2541dd8b10dfe03 Tagger: Julien Paulijpa...@php.net Tue Oct 1 14:26:09 2013 +0200 Log: Tagged PHP-5.5.5RC1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJSSr9rAAoJEP6FfZqQ2Q7BPvAH/16BC6rZzlBehk89VgRcvNpa UVzOoWGAhHMK4iBx080zaSbK/sE8cIk/7/g1asfhimNVObphf7kmoERQ9gtaC4XF xutME9ihf2QL3aY8Gr9Mn0B0Mf9dzh3KmyPvLNBMv8Qvcl9PkDMO4BRxHFdTJO+Q 0vgRj9gNyTFaEMGGqSR79NfSmkuhbrCDSalKDvNGQOhU+uPgclbYVW02ahdb5LLY hbL5qkKif7K2G4RlWxmfb1UQ8zPLFWcDABcHZml7sz7Ru4LfqUM7nqdKxiH2y6Bu 0Y/hw3d8du33i8EFa+3LaOdLNCcHKUUJVCFODNBw/KczvQRHZ0/ldLMLeTHiBic= =As+T -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=cf2a9478a5195840d6cd2acab2541dd8b10dfe03 Target: ca4fd954c798e8005e412c0e7f494cfa7c4632c6 Author: Julien Pauli jpa...@php.net Tue, 1 Oct 2013 14:03:38 +0200 Parents: ad139d9a00d9de206c7aae4f85eff08eff2c429e Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca4fd954c798e8005e412c0e7f494cfa7c4632c6 Target log: Preparing PHP5.5.5RC1 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.4' into PHP-5.5: run-tests.php
Commit:4b61203b013468992dc86dea74379a5688ba19c7 Author:Michael Wallner m...@php.net Tue, 1 Oct 2013 17:01:44 +0200 Parents: ad139d9a00d9de206c7aae4f85eff08eff2c429e cd1cab3f4726751a0476ac8701ce09cc37cb36df Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b61203b013468992dc86dea74379a5688ba19c7 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode()) Bugs: https://bugs.php.net/62396 Changed paths: MM run-tests.php Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode()): NEWS run-tests.php
Commit:cd1cab3f4726751a0476ac8701ce09cc37cb36df
Author:Michael Wallner m...@php.net Tue, 1 Oct 2013 17:01:03 +0200
Parents: 18b04b480ebc41841b2004cc11797eda40fb3958
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=cd1cab3f4726751a0476ac8701ce09cc37cb36df
Log:
fix bug #62396 'make test' crashes starting with 5.3.14
(missing gzencode())
Bugs:
https://bugs.php.net/62396
Changed paths:
M NEWS
M run-tests.php
Diff:
diff --git a/NEWS b/NEWS
index 9bb6032..b889e66 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,11 @@ PHP
NEWS
. Fixed bug #61548 (content-type must appear at the end of headers for 201
Location to work in http). (Mike)
+- Build system:
+ . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing
+gzencode())). (Mike)
+
+
19 Sep 2013, PHP 5.4.20
- Core:
diff --git a/run-tests.php b/run-tests.php
index 935f821..317f607 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -455,7 +455,7 @@ $pass_options = '';
$compression = 0;
$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
-if ($compression) {
+if ($compression in_array(compress.zlib, stream_get_filters())) {
$output_file = 'compress.zlib://' . $output_file . '.gz';
}
@@ -1545,6 +1545,16 @@ TEST $file
}
}
}
+
+ if (!extension_loaded(zlib)
+(array_key_exists(GZIP_POST, $section_text)
+ || array_key_exists(DEFLATE_POST, $section_text))
+ ) {
+ $message = ext/zlib required;
+ show_result('SKIP', $tested, $tested_file, reason: $message,
$temp_filenames);
+ junit_mark_test_as('SKIP', $shortname, $tested, null,
![CDATA[\n$message\n]]);
+ return 'SKIPPED';
+ }
if (@count($section_text['REDIRECTTEST']) == 1) {
$test_files = array();
--
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
On 09/30/2013 05:07 PM, Johannes Schlüter wrote: hi, On Mon, 2013-09-30 at 22:46 +, Christopher Jones wrote: Commit:d7baf0427fb56cbde55495e5c2071b1cdacb94ce Author:Christopher Jones s...@php.net 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) It was to clean up out-of-tree builds, so that the whole build process is 100% repeatable. Not related to the issue I was looking at, the git-clean target uses -X. Does anyone recall why it doesn't do a full clean? Separately, I notice that the 5.5 snap is including things like an autom4te.cache dir and various *.orig files. This could be improved. Also depending who does release bundling, the bison etc versions used can vary between releases which isn't so good. -- christopher.jo...@oracle.com http://twitter.com/ghrd Free PHP Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Revert Make 'make distclean' remove the downloaded pear PHAR: Makefile.global
Commit:60e38b3243577abc80ce6bbcfb0b4125b08acb85 Author:Christopher Jones s...@php.net Tue, 1 Oct 2013 10:33:39 -0700 Parents: ec5b87c50dd9b77bd3b638157f317749237d5566 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60e38b3243577abc80ce6bbcfb0b4125b08acb85 Log: Revert Make 'make distclean' remove the downloaded pear PHAR This reverts commit d7baf0427fb56cbde55495e5c2071b1cdacb94ce. Changed paths: M Makefile.global Diff: diff --git a/Makefile.global b/Makefile.global index c56ef99..05c5d15 100644 --- a/Makefile.global +++ b/Makefile.global @@ -125,7 +125,6 @@ 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] com php-src: Merge branch 'PHP-5.5': Makefile.global
Commit:67df40fd54b65a62340bfd107ee29e2390a92dca Author:Christopher Jones s...@php.net Tue, 1 Oct 2013 10:35:03 -0700 Parents: 471413ab19f1052d2f7e950229d661547f6e1657 60e38b3243577abc80ce6bbcfb0b4125b08acb85 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67df40fd54b65a62340bfd107ee29e2390a92dca Log: Merge branch 'PHP-5.5' * PHP-5.5: Revert Make 'make distclean' remove the downloaded pear PHAR Changed paths: MM Makefile.global Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: 5.4.21 rc1: NEWS configure.in main/php_version.h
Commit:2fad4c7375a4b66a03216250df8843980f04d3c0 Author:Stanislav Malyshev s...@php.net Tue, 1 Oct 2013 21:52:41 -0700 Parents: 33fd0e0b78ba1d6718ab49ab4f746a264f06d3c5 Branches: PHP-5.4.21 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fad4c7375a4b66a03216250df8843980f04d3c0 Log: 5.4.21 rc1 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index b889e66..0e60cad 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2013, PHP 5.4.21 +03 Oct 2013, PHP 5.4.21 RC1 - Core: . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita) diff --git a/configure.in b/configure.in index 30de2c3..a32fbda 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=21 -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 e30528e..deb6335 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 21 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.4.21-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.4.21RC1 #define PHP_VERSION_ID 50421 -- 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.21RC1
Tag php-5.4.21RC1 in php-src.git was created Tag: 200c1c32c47cbb7622e25c1437c9445ebd3e6958 Tagger: Stanislav Malyshevs...@php.net Tue Oct 1 21:53:39 2013 -0700 Log: 5.4.21 rc1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (Darwin) iF4EABEIAAYFAlJLptgACgkQL3lWvF2gS11vrwEAiVVHHIl9saIuv4gyI1ePzFSP LN5D95uL+Vbd4cLywnAA+QF/KHfSYpbV5MwM9q8s+GKD+1+oSksKHJQU5Z5qzXe7 =rhrI -END PGP SIGNATURE- Link: http://git.php.net/?p=php-src.git;a=tag;h=200c1c32c47cbb7622e25c1437c9445ebd3e6958 Target: 2fad4c7375a4b66a03216250df8843980f04d3c0 Author: Stanislav Malyshev s...@php.net Tue, 1 Oct 2013 21:52:41 -0700 Parents: 33fd0e0b78ba1d6718ab49ab4f746a264f06d3c5 Target link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fad4c7375a4b66a03216250df8843980f04d3c0 Target log: 5.4.21 rc1 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: 5.4.22-dev now: NEWS configure.in main/php_version.h
Commit:b2f8f35a889e77c3123ade348907e73bf6d6689e Author:Stanislav Malyshev s...@php.net Tue, 1 Oct 2013 22:25:56 -0700 Parents: 33fd0e0b78ba1d6718ab49ab4f746a264f06d3c5 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b2f8f35a889e77c3123ade348907e73bf6d6689e Log: 5.4.22-dev now Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index b889e66..9bef174 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2013, PHP 5.4.22 + ?? ??? 2013, PHP 5.4.21 - Core: diff --git a/configure.in b/configure.in index 30de2c3..aa58df6 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 -PHP_RELEASE_VERSION=21 +PHP_RELEASE_VERSION=22 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 e30528e..3058fef 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 21 +#define PHP_RELEASE_VERSION 22 #define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.4.21-dev -#define PHP_VERSION_ID 50421 +#define PHP_VERSION 5.4.22-dev +#define PHP_VERSION_ID 50422 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
