jani                                     Sat, 13 Nov 2010 11:12:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305312

Log:
- WS + cleanup
# Note:
# Considering DTrace support: Why does it really need any configure time stuff?
# 3 macros for static stuff that could be made much cleaner with simple 
Makefile.dtrace
# addition. The only thing required in configure is that --enable flag part..
#

Bug: http://bugs.php.net/3 (Closed) extern for errno missing in debugger.c
      
Changed paths:
    U   php/php-src/trunk/NEWS
    U   php/php-src/trunk/acinclude.m4
    U   php/php-src/trunk/configure.in

Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS      2010-11-13 11:07:38 UTC (rev 305311)
+++ php/php-src/trunk/NEWS      2010-11-13 11:12:07 UTC (rev 305312)
@@ -1,14 +1,17 @@
-´╗┐PHP                                                                        
NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 201?, PHP 5.3.99
 - Upgraded bundled sqlite to version 3.7.3. (Ilia)
 - Upgraded bundled PCRE to version 8.10. (Ilia)

-- Updated _SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
+- Changed $_SERVER['REQUEST_TIME'] to include microsecond precision. (Ilia)
+
 - Added apache compatible functions (apache_child_terminate, getallheaders,
-  apache_request_headers, apache_response_headers) to FastCGI SAPI (Dmitry)
+  apache_request_headers, apache_response_headers) to FastCGI SAPI. (Dmitry)
+
 - Added caches to eliminate repeatable run-time bindings of functions, classes,
-  constants, methods and properties (Dmitry)
+  constants, methods and properties. (Dmitry)
+
 - Added a number of small performance tweaks and optimizations (Dmitry)
   . ZEND_RECV now always has IS_CV as its result
   . ZEND_CATCH now has to be used only with constant class names
@@ -30,44 +33,55 @@
     required after them instead.
   . improved performance of FastCGI request parsing
   . improved performance of @ (silence) operator
+
 - Added concept of interned strings. All strings constants known at compile
   time are allocated in a single copy and never changed. (Dmitry)
 - Added an optimization which saves memory and emalloc/efree calls for empty
-  HashTables (Stas, Dmitry)
+  HashTables. (Stas, Dmitry)

-- Added named pipes support in mysqlnd (Request#48082). (Andrey)
+- Added named pipes support in mysqlnd (FR #48082). (Andrey)
 - Added support for Traits. (Stefan)
 - Added array dereferencing support. (Felipe)
 - Added DTrace support. (David Soria Parra)
 - Added Tokyo Cabinet abstract DB support to ext/dba. (Michael Maclean)
+- Added Berkeley DB 5 support to the DBA extension (Johannes, Chris Jones)
+
 - Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen)
 - Added FNV-1 hash support to ext/hash. (Michael Maclean)
-- Added ReflectionExtension::isTemporary() and
-  ReflectionExtension::isPersistent(). (Johannes)
+
+- Added ReflectionExtension::isTemporary() and 
ReflectionExtension::isPersistent(). (Johannes)
 - Added ReflectionZendExtension class. (Johannes)
 - Added ReflectionClass::isCloneable(). (Felipe)
+
 - Added command line option --rz to CLI. (Johannes)
+
 - Added closure $this support back. (Stas)
+
 - Added SplObjectStorage::getHash() hook. (Etienne)
-- Added JsonSerializable interface (Sara)
+
+- Added JsonSerializable interface. (Sara)
 - Added JSON_BIGINT_AS_STRING, extended json_decode() sig with $options. (Sara)
+- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
+  numeric strings to integers. (Ilia)
+
 - Added support for storing upload progress feedback in session data. (Arnaud)
 - Added nextRowset support for PDO_dblib. (Stanley)
+
 - Added support for CURLOPT_MAX_RECV_SPEED_LARGE and 
CURLOPT_MAX_SEND_SPEED_LARGE.
-  FR #51815. (Pierrick)
+  (FR #51815). (Pierrick)
+
 - Added iterator support in MySQLi. mysqli_result implements Traversable.
   (Andrey, Johannes)
+
 - Added scalar typehints to the parser and the reflection API. (Ilia, Derick)
-- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
-  numeric strings to integers. (Ilia)
-- Added support for object references in recursive serialize() calls. FR 
#36424.
-  (Mike)
-- Added Berkeley DB 5 support to the DBA extension (Johannes, Chris Jones)

+- Added support for object references in recursive serialize() calls. (FR 
#36424). (Mike)
+
 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)

 - Changed the structure of op_array.opcodes. The constant values are moved from
   opcode operands into a separate literal table. (Dmitry)
+
 - Changed session.entropy_file to default to /dev/urandom or /dev/arandom if
   either is present at compile time. (Rasmus)

@@ -142,6 +156,7 @@
 - Fixed bug #52211 (iconv() returns part of string on error). (Felipe)
 - Fixed bug #50755 (PDO DBLIB Fails with OOM). (Stanley)

+

 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)

Modified: php/php-src/trunk/acinclude.m4
===================================================================
--- php/php-src/trunk/acinclude.m4      2010-11-13 11:07:38 UTC (rev 305311)
+++ php/php-src/trunk/acinclude.m4      2010-11-13 11:12:07 UTC (rev 305312)
@@ -2664,19 +2664,19 @@
     CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0"
   fi
   for arg in $ac_configure_args; do
-     if test `expr -- $arg : "'.*"` = 0; then
-        if test `expr -- $arg : "--.*"` = 0; then
-                 break;
-        fi
-        echo "'[$]arg' \\" >> $1
-        CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'"
-     else
-        if test `expr -- $arg : "'--.*"` = 0; then
-                 break;
-        fi
-        echo "[$]arg \\" >> $1
-        CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"
-     fi
+    if test `expr -- $arg : "'.*"` = 0; then
+      if test `expr -- $arg : "--.*"` = 0; then
+        break;
+      fi
+      echo "'[$]arg' \\" >> $1
+      CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS '[$]arg'"
+    else
+      if test `expr -- $arg : "'--.*"` = 0; then
+        break;
+      fi
+      echo "[$]arg \\" >> $1
+      CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS [$]arg"
+    fi
   done
   echo '"[$]@"' >> $1
   chmod +x $1
@@ -2692,19 +2692,19 @@
   for arg in $ac_configure_args; do
     case $arg in
       --with-*[)]
-       arg_name="`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`"
+        arg_name="`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`"
         ;;
       --without-*[)]
-       arg_name="`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`"
+        arg_name="`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`"
         ;;
       --enable-*[)]
-       arg_name="`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`"
+        arg_name="`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 
's/=.*//g'`"
         ;;
       --disable-*[)]
-       arg_name="`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 
's/=.*//g'`"
+        arg_name="`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 
's/=.*//g'`"
         ;;
       *[)]
-       continue
+        continue
         ;;
     esac
     case $arg_name in

Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in      2010-11-13 11:07:38 UTC (rev 305311)
+++ php/php-src/trunk/configure.in      2010-11-13 11:12:07 UTC (rev 305312)
@@ -879,13 +879,13 @@
   AC_DEFINE(HAVE_IPV6, 1, [Whether to enable IPv6 support])
 fi

-dnl ## DTRACE CHECHKS
-dnl ## this needs to be done before SAPI configureation
+dnl ##
+dnl ## DTRACE CHECKS
+dnl ## this needs to be done before SAPI configuration
+dnl ##
 PHP_ARG_ENABLE(dtrace, whether to enable DTrace support,
 [  --enable-dtrace         Enable DTrace support], no, no)

-dnl ## DTRACE CHECHKS
-dnl ## this needs to be done before SAPI configureation
 if test "$PHP_DTRACE" = "yes"; then
   AC_CHECK_HEADERS([sys/sdt.h], [
     PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
@@ -896,6 +896,7 @@
   ], [
     AC_MSG_ERROR([Cannot find sys/sdt.h which is required for DTrace support])
   ])
+  PHP_SUBST(PHP_DTRACE_OBJS)
 fi

 AC_MSG_CHECKING([how big to make fd sets])
@@ -1224,7 +1225,6 @@
 PHP_SUBST(PHP_CLI_TARGET)
 PHP_SUBST(PHP_SAPI_OBJS)
 PHP_SUBST(PHP_CLI_OBJS)
-PHP_SUBST(PHP_DTRACE_OBJS)
 PHP_SUBST(PHP_GLOBAL_OBJS)

 PHP_SUBST(PHP_MODULES)
@@ -1327,8 +1327,8 @@
 dnl This hack works around it. Ugly.
 case $host_alias in
 *darwin9*|*darwin10*)
-       ac_cv_exeext=
-       ;;
+  ac_cv_exeext=
+  ;;
 esac

 dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called 
(by PHP_REQUIRE_CXX).

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

Reply via email to