Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in main/php_version.h

2012-05-03 Thread Christopher Jones 


Whoops - something went wrong here.

On 05/03/2012 12:22 PM, Christopher Jones wrote:

Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Author:Christopher Jones  Thu, 3 May 2012 12:22:39 
-0700
Parents:   72f19e9a8bcf5712b24fa333a26616eff19ac1ce 
0956c00af999c295c5a13644ec835da8f96ad48d
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
   Bump to next version

Conflicts:
configure.in
main/php_version.h

Changed paths:
   MM  configure.in
   MM  main/php_version.h


Diff:
diff --cc configure.in
index edc2455,b257cbb..3d529c6
--- a/configure.in
+++ b/configure.in
@@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice
   PHP_CANONICAL_HOST_TARGET

   AC_CONFIG_HEADER(main/php_config.h)
  +AH_TOP([
  +#if defined(__GNUC__)&&  __GNUC__>= 4
  +# define ZEND_API __attribute__ ((visibility("default")))
  +# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
  +#else
  +# define ZEND_API
  +# define ZEND_DLEXPORT
  +#endif
  +
  +#define ZEND_DLIMPORT
  +
  +#undef uint
  +#undef ulong
  +
  +/* Define if you want to enable memory limit support */
  +#define MEMORY_LIMIT 0
  +])
  +AH_BOTTOM([
  +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
  +
  +#ifdef HAVE_STDLIB_H
  +# include
  +#endif
  +
  +#ifdef HAVE_SYS_TYPES_H
  +# include
  +#endif
  +
  +#ifdef HAVE_SYS_SELECT_H
  +#include
  +#endif
  +
  +#ifdef HAVE_IEEEFP_H
  +# include
  +#endif
  +
  +#ifdef HAVE_STRING_H
  +# include
  +#else
  +# include
  +#endif
  +
  +#if ZEND_BROKEN_SPRINTF
  +int zend_sprintf(char *buffer, const char *format, ...);
  +#else
  +# define zend_sprintf sprintf
  +#endif
  +
  +#include
  +
  +/* To enable the is_nan, is_infinite and is_finite PHP functions */
  +#ifdef NETWARE
  + #define HAVE_ISNAN 1
  + #define HAVE_ISINF 1
  + #define HAVE_ISFINITE 1
  +#endif
  +
  +#ifndef zend_isnan
  +#ifdef HAVE_ISNAN
  +#define zend_isnan(a) isnan(a)
  +#elif defined(HAVE_FPCLASS)
  +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
  +#else
  +#define zend_isnan(a) 0
  +#endif
  +#endif
  +
  +#ifdef HAVE_ISINF
  +#define zend_isinf(a) isinf(a)
  +#elif defined(INFINITY)
  +/* Might not work, but is required by ISO C99 */
  +#define zend_isinf(a) (((a)==INFINITY)?1:0)
  +#elif defined(HAVE_FPCLASS)
  +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
  +#else
  +#define zend_isinf(a) 0
  +#endif
  +
  +#ifdef HAVE_FINITE
  +#define zend_finite(a) finite(a)
  +#elif defined(HAVE_ISFINITE) || defined(isfinite)
  +#define zend_finite(a) isfinite(a)
  +#elif defined(fpclassify)
  +#define zend_finite(a) 
((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
  +#else
  +#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
  +#endif
  +
  +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
  +
  +#ifdef NETWARE
  +#ifdef USE_WINSOCK
  +#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
  +#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
  +#endif
  +#endif
  +
  +#undef PTHREADS
  +])

   PHP_MAJOR_VERSION=5
  -PHP_MINOR_VERSION=3
  -PHP_RELEASE_VERSION=13
  +PHP_MINOR_VERSION=4
- PHP_RELEASE_VERSION=2
++PHP_RELEASE_VERSION=3
   PHP_EXTRA_VERSION="-dev"
   
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
   PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
diff --cc main/php_version.h
index 13478d1,358c6c0..3e80008
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
   /* automatically generated by configure */
   /* edit configure.in to change version number */
   #define PHP_MAJOR_VERSION 5
  -#define PHP_MINOR_VERSION 3
  -#define PHP_RELEASE_VERSION 13
  +#define PHP_MINOR_VERSION 4
- #define PHP_RELEASE_VERSION 2
++#define PHP_RELEASE_VERSION 3
   #define PHP_EXTRA_VERSION "-dev"
- #define PHP_VERSION "5.4.2-dev"
- #define PHP_VERSION_ID 50402
  -#define PHP_VERSION "5.3.13-dev"
  -#define PHP_VERSION_ID 50313
++#define PHP_VERSION "5.4.3-dev"
++#define PHP_VERSION_ID 50403




--
christopher.jo...@oracle.com
http://twitter.com/#!/ghrd

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in main/php_version.h

2012-05-03 Thread Christopher Jones 
Commit:31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
Author:Christopher Jones  Thu, 3 May 2012 12:22:39 
-0700
Parents:   72f19e9a8bcf5712b24fa333a26616eff19ac1ce 
0956c00af999c295c5a13644ec835da8f96ad48d
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump to next version

Conflicts:
configure.in
main/php_version.h

Changed paths:
  MM  configure.in
  MM  main/php_version.h


Diff:
diff --cc configure.in
index edc2455,b257cbb..3d529c6
--- a/configure.in
+++ b/configure.in
@@@ -17,109 -38,10 +17,109 @@@ PHP_CONFIG_NICE(config.nice
  PHP_CANONICAL_HOST_TARGET
  
  AC_CONFIG_HEADER(main/php_config.h)
 +AH_TOP([
 +#if defined(__GNUC__) && __GNUC__ >= 4
 +# define ZEND_API __attribute__ ((visibility("default")))
 +# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
 +#else
 +# define ZEND_API
 +# define ZEND_DLEXPORT
 +#endif
 +
 +#define ZEND_DLIMPORT
 +
 +#undef uint
 +#undef ulong
 +
 +/* Define if you want to enable memory limit support */
 +#define MEMORY_LIMIT 0
 +])
 +AH_BOTTOM([
 +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
 +
 +#ifdef HAVE_STDLIB_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_SYS_TYPES_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_SYS_SELECT_H
 +#include 
 +#endif
 +
 +#ifdef HAVE_IEEEFP_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_STRING_H
 +# include 
 +#else
 +# include 
 +#endif
 +
 +#if ZEND_BROKEN_SPRINTF
 +int zend_sprintf(char *buffer, const char *format, ...);
 +#else
 +# define zend_sprintf sprintf
 +#endif
 +
 +#include 
 +
 +/* To enable the is_nan, is_infinite and is_finite PHP functions */
 +#ifdef NETWARE
 +  #define HAVE_ISNAN 1
 +  #define HAVE_ISINF 1
 +  #define HAVE_ISFINITE 1
 +#endif
 +
 +#ifndef zend_isnan
 +#ifdef HAVE_ISNAN
 +#define zend_isnan(a) isnan(a)
 +#elif defined(HAVE_FPCLASS)
 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 +#else
 +#define zend_isnan(a) 0
 +#endif
 +#endif
 +
 +#ifdef HAVE_ISINF
 +#define zend_isinf(a) isinf(a)
 +#elif defined(INFINITY)
 +/* Might not work, but is required by ISO C99 */
 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
 +#elif defined(HAVE_FPCLASS)
 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
 +#else
 +#define zend_isinf(a) 0
 +#endif
 +
 +#ifdef HAVE_FINITE
 +#define zend_finite(a) finite(a)
 +#elif defined(HAVE_ISFINITE) || defined(isfinite)
 +#define zend_finite(a) isfinite(a)
 +#elif defined(fpclassify)
 +#define zend_finite(a) 
((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
 +#else
 +#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
 +#endif
 +
 +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
 +
 +#ifdef NETWARE
 +#ifdef USE_WINSOCK
 +#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
 +#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
 +#endif
 +#endif
 +
 +#undef PTHREADS
 +])
  
  PHP_MAJOR_VERSION=5
 -PHP_MINOR_VERSION=3
 -PHP_RELEASE_VERSION=13
 +PHP_MINOR_VERSION=4
- PHP_RELEASE_VERSION=2
++PHP_RELEASE_VERSION=3
  PHP_EXTRA_VERSION="-dev"
  
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
  PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
diff --cc main/php_version.h
index 13478d1,358c6c0..3e80008
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
  /* automatically generated by configure */
  /* edit configure.in to change version number */
  #define PHP_MAJOR_VERSION 5
 -#define PHP_MINOR_VERSION 3
 -#define PHP_RELEASE_VERSION 13
 +#define PHP_MINOR_VERSION 4
- #define PHP_RELEASE_VERSION 2
++#define PHP_RELEASE_VERSION 3
  #define PHP_EXTRA_VERSION "-dev"
- #define PHP_VERSION "5.4.2-dev"
- #define PHP_VERSION_ID 50402
 -#define PHP_VERSION "5.3.13-dev"
 -#define PHP_VERSION_ID 50313
++#define PHP_VERSION "5.4.3-dev"
++#define PHP_VERSION_ID 50403


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in

2012-04-13 Thread David Soria Parra 
Commit:de6dfe5bbd197e6387f0044b857b518e29e27283
Author:David Soria Parra  Fri, 13 Apr 2012 16:33:25 
+0200
Parents:   676f0deb38910bcc859924f871c284b73a9dd13d 
e9b978c374e0b8f2afd32ff07920f419fce4b9fb
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=de6dfe5bbd197e6387f0044b857b518e29e27283

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
configure.in

Changed paths:
  MM  configure.in


Diff:
diff --cc configure.in
index 49a88b1,f038f87..76f3598
--- a/configure.in
+++ b/configure.in
@@@ -8,9 -30,8 +8,9 @@@ sinclude(Zend/acinclude.m4
  dnl Basic autoconf + automake initialization, generation of config.nice.
  dnl -
  
 -AC_PREREQ(2.13)
 +AC_PREREQ(2.59)
- AC_INIT(README.SVN-RULES)
+ AC_INIT(README.GIT-RULES)
 +ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
  
  PHP_CONFIG_NICE(config.nice)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in ext/soap/php_http.c

2012-03-24 Thread Hannes Magnusson 
On Sat, Mar 24, 2012 at 17:20, Hannes Magnusson  wrote:
> Commit:    7a1c76538541e74719faf2311d72a70acd3c01e4
> Author:    Hannes Magnusson          Sat, 24 Mar 2012 17:20:14 
> +0100
> Parents:   69b647c43be5729337024abdc6bf8565a1aa9a5b 
> 4fc4dd8760ddd8a53df9b59921093cc6b523154e
> Branches:  PHP-5.4 master
>
> Link:       
> http://git.php.net/?p=php-src.git;a=commitdiff;h=7a1c76538541e74719faf2311d72a70acd3c01e4
>
> Log:
> Merge branch 'PHP-5.3' into PHP-5.4
>
> * PHP-5.3:
>  This is a git checkout
>  Revert incorrect fix
>
> Changed paths:
>  MM  configure.in
>  MM  ext/soap/php_http.c


I only touched bison error message line in configure.in.. I don't know
where the rest of the billion line changes from configure.in came from
(I did as the workflow wiki recommends; git merge --no-ff --log
PHP-5.3).
As for the "revert incorrect fix" commit, it looks like ilia only
reverted it in the 5.3 branch, forgetting the others -  don't know if
that was intentional?

I'm a bit unsure if I fckd stuff up here, if the mails are just weird
(and the attached gigantic patch), or the wiki is simply wrong.

David & Alexendar, could you please check it out?

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in ext/soap/php_http.c

2012-03-24 Thread Hannes Magnusson 
Commit:7a1c76538541e74719faf2311d72a70acd3c01e4
Author:Hannes Magnusson  Sat, 24 Mar 2012 17:20:14 
+0100
Parents:   69b647c43be5729337024abdc6bf8565a1aa9a5b 
4fc4dd8760ddd8a53df9b59921093cc6b523154e
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=7a1c76538541e74719faf2311d72a70acd3c01e4

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  This is a git checkout
  Revert incorrect fix

Changed paths:
  MM  configure.in
  MM  ext/soap/php_http.c

7a1c76538541e74719faf2311d72a70acd3c01e4
diff --combined configure.in
index 0a6fcd1,d3f96b0..49a88b1
--- a/configure.in
+++ b/configure.in
@@@ -1,6 -1,28 +1,6 @@@
  ## $Id$ -*- autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
 -divert(1)
 -
 -dnl ## Diversion 1 is the autoconf + automake setup phase. We also
 -dnl ## set the PHP version, deal with platform-specific compile
 -dnl ## options and check for the basic compile tools.
 -
 -dnl ## Diversion 2 is the initial checking of OS features, programs,
 -dnl ## libraries and so on.
 -
 -dnl ## In diversion 3 we check for compile-time options to the PHP
 -dnl ## core and how to deal with different system dependencies. 
 -dnl ## This includes whether debugging or short tags are enabled
 -dnl ## and the default behaviour of php.ini options.
 -dnl ## This is also where an SAPI interface is selected (choosing between
 -dnl ## Apache module, CGI etc.)
 -
 -dnl ## In diversion 4 we check user-configurable general settings.
 -
 -dnl ## In diversion 5 we check which extensions should be compiled.
 -dnl ## All of these are normally in the extension directories.
 -dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
 -
  dnl include Zend specific macro definitions first
  dnl -
  sinclude(Zend/acinclude.m4)
@@@ -8,119 -30,19 +8,119 @@@
  dnl Basic autoconf + automake initialization, generation of config.nice.
  dnl -
  
 -AC_PREREQ(2.13)
 +AC_PREREQ(2.59)
  AC_INIT(README.SVN-RULES)
 +ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
  
  PHP_CONFIG_NICE(config.nice)
  
  PHP_CANONICAL_HOST_TARGET
  
  AC_CONFIG_HEADER(main/php_config.h)
 +AH_TOP([
 +#if defined(__GNUC__) && __GNUC__ >= 4
 +# define ZEND_API __attribute__ ((visibility("default")))
 +# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
 +#else
 +# define ZEND_API
 +# define ZEND_DLEXPORT
 +#endif
 +
 +#define ZEND_DLIMPORT
 +
 +#undef uint
 +#undef ulong
 +
 +/* Define if you want to enable memory limit support */
 +#define MEMORY_LIMIT 0
 +])
 +AH_BOTTOM([
 +#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
 +
 +#ifdef HAVE_STDLIB_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_SYS_TYPES_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_SYS_SELECT_H
 +#include 
 +#endif
 +
 +#ifdef HAVE_IEEEFP_H
 +# include 
 +#endif
 +
 +#ifdef HAVE_STRING_H
 +# include 
 +#else
 +# include 
 +#endif
 +
 +#if ZEND_BROKEN_SPRINTF
 +int zend_sprintf(char *buffer, const char *format, ...);
 +#else
 +# define zend_sprintf sprintf
 +#endif
 +
 +#include 
 +
 +/* To enable the is_nan, is_infinite and is_finite PHP functions */
 +#ifdef NETWARE
 +  #define HAVE_ISNAN 1
 +  #define HAVE_ISINF 1
 +  #define HAVE_ISFINITE 1
 +#endif
 +
 +#ifndef zend_isnan
 +#ifdef HAVE_ISNAN
 +#define zend_isnan(a) isnan(a)
 +#elif defined(HAVE_FPCLASS)
 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
 +#else
 +#define zend_isnan(a) 0
 +#endif
 +#endif
 +
 +#ifdef HAVE_ISINF
 +#define zend_isinf(a) isinf(a)
 +#elif defined(INFINITY)
 +/* Might not work, but is required by ISO C99 */
 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
 +#elif defined(HAVE_FPCLASS)
 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
 +#else
 +#define zend_isinf(a) 0
 +#endif
 +
 +#ifdef HAVE_FINITE
 +#define zend_finite(a) finite(a)
 +#elif defined(HAVE_ISFINITE) || defined(isfinite)
 +#define zend_finite(a) isfinite(a)
 +#elif defined(fpclassify)
 +#define zend_finite(a) 
((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
 +#else
 +#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
 +#endif
 +
 +#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
 +
 +#ifdef NETWARE
 +#ifdef USE_WINSOCK
 +#/*This detection against winsock is of no use*/ undef HAVE_SOCKLEN_T
 +#/*This detection against winsock is of no use*/ undef HAVE_SYS_SOCKET_H
 +#endif
 +#endif
 +
 +#undef PTHREADS
 +])
  
  PHP_MAJOR_VERSION=5
 -PHP_MINOR_VERSION=3
 -PHP_RELEASE_VERSION=11
 -PHP_EXTRA_VERSION="-dev"
 +PHP_MINOR_VERSION=4
 +PHP_RELEASE_VERSION=1
 +PHP_EXTRA_VERSION="RC1-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`
  
@@@ -233,7 -155,7 +233,7 @@@ dnl Check i