From: Christopher Jones <sixd@php.net>
Date: Thu, 3 May 2012 19:22:39 +0000 (-0700)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
---

31ab04ee25bc9d4edfa524c2a11a33f8cbc8d1b6
diff --cc configure.in
index edc2455969,b257cbb399..3d529c6c3a
--- 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 <stdlib.h>
 +#endif
 +
 +#ifdef HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
 +
 +#ifdef HAVE_SYS_SELECT_H
 +#include <sys/select.h>
 +#endif
 +
 +#ifdef HAVE_IEEEFP_H
 +# include <ieeefp.h>
 +#endif
 +
 +#ifdef HAVE_STRING_H
 +# include <string.h>
 +#else
 +# include <strings.h>
 +#endif
 +
 +#if ZEND_BROKEN_SPRINTF
 +int zend_sprintf(char *buffer, const char *format, ...);
 +#else
 +# define zend_sprintf sprintf
 +#endif
 +
 +#include <math.h>
 +
 +/* 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 \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --cc main/php_version.h
index 13478d1756,358c6c010d..3e80008c14
--- 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