]> granicus.if.org Git - php/log
php
12 years agoUnified zval -> UDate conversions
Gustavo André dos Santos Lopes [Sun, 1 Jul 2012 22:24:54 +0000 (00:24 +0200)]
Unified zval -> UDate conversions

Now IntlDateFormatter::format() also accepts IntlCalendar objects.
Code is shared in MessageFormatter and IntlDateFormatter.

12 years agoAdded and fixed tests given eb346ef
Gustavo André dos Santos Lopes [Sun, 3 Jun 2012 22:02:35 +0000 (00:02 +0200)]
Added and fixed tests given eb346ef

12 years agoDateFormat plays nice with Calendar, TimeZone
Gustavo André dos Santos Lopes [Sun, 3 Jun 2012 22:01:48 +0000 (00:01 +0200)]
DateFormat plays nice with Calendar, TimeZone

The following changes were made:

* The IntlDateFormatter constructor now accepts the usual values
  for its $timezone argument. This includes timezone identifiers,
  IntlTimeZone objects, DateTimeZone objects and NULL. An empty
  string is not accepted. An invalid time zone is no longer accepted
  (it used to use UTC in this case).
* When NULL is passed to IntlDateFormatter, the time zone specified in
  date.timezone is used instead of the ICU default.
* The IntlDateFormatter $calendar argument now accepts also an
  IntlCalendar. In this case, IntlDateFormatter::getCalendar() will
  return false.
* The time zone passed to the IntlDateFormatter is ignored if it is
  NULL and if the calendar passed is an IntlCalendar object -- in this
  case, the IntlCalendar time zone will be used instead. Otherwise,
  the time zone specified in the $timezone argument is used instead.
* Added IntlDateFormatter::getCalendarObject(), which always returns
  the IntlCalendar object that backs the DateFormat, even if a
  constant was passed to the constructor, i.e., if an IntlCalendar
  was not passed to the constructor.
* Added IntlDateFormatter::setTimeZone(). It accepts the usual values
  for time zone arguments. If NULL is passed, the time zone of the
  IntlDateFormatter WILL be overridden with the default time zone,
  even if an IntlCalendar object was passed to the constructor.
* Added IntlDateFormatter::getTimeZone(), which returns the time zone
  that's associated with the DateFormat.
* Depreacated IntlDateFormatter::setTimeZoneId() and made it an alias
  for IntlDateFormatter::setTimeZone(), as the new ::setTimeZone()
  also accepts plain identifiers, besides other types.
  IntlDateFormatter::getTimeZoneId() is not deprecated however.
* IntlDateFormatter::setCalendar() with a constant passed should now
  work correctly. This requires saving the requested locale to the
  constructor.
* Centralized the hacks required to avoid compilation disasters on
  Windows due to some headers being included inside and outside of
  extern "C" blocks.

12 years agoAdded private constructor to IntlTimeZone.
Gustavo André dos Santos Lopes [Fri, 1 Jun 2012 15:17:35 +0000 (17:17 +0200)]
Added private constructor to IntlTimeZone.

12 years agoFixed write in constant memory.
Gustavo André dos Santos Lopes [Fri, 1 Jun 2012 13:13:59 +0000 (15:13 +0200)]
Fixed write in constant memory.

clang did not forgive.

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Thu, 31 May 2012 05:27:54 +0000 (22:27 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix bug #55042 - erealloc without updating pointer

12 years agofix bug #55042 - erealloc without updating pointer
Stanislav Malyshev [Thu, 31 May 2012 05:26:26 +0000 (22:26 -0700)]
fix bug #55042 - erealloc without updating pointer

12 years agoMerge branch 'PHP-5.4'
Johannes Schlüter [Wed, 30 May 2012 23:18:02 +0000 (01:18 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 30 May 2012 23:16:42 +0000 (01:16 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)

12 years agoFix bug #62186 readline fails to compile
Johannes Schlüter [Wed, 30 May 2012 23:15:22 +0000 (01:15 +0200)]
Fix bug #62186 readline fails to compile

12 years agofix unchecked emalloc
Stanislav Malyshev [Tue, 29 May 2012 01:54:15 +0000 (18:54 -0700)]
fix unchecked emalloc
(cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)

12 years agoMerge branch 'master' of git.php.net:php-src
andrey [Wed, 30 May 2012 12:25:26 +0000 (15:25 +0300)]
Merge branch 'master' of git.php.net:php-src

12 years agosmall refactoring - factour out code from connection establishment.
andrey [Wed, 30 May 2012 12:24:17 +0000 (15:24 +0300)]
small refactoring - factour out code from connection establishment.
Add a define for the default authentication protocol - get away from
the hardcoded magic value

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Wed, 30 May 2012 06:53:01 +0000 (23:53 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix test
  fix test

12 years agofix test php-5.4.4RC2
Stanislav Malyshev [Wed, 30 May 2012 06:52:07 +0000 (23:52 -0700)]
fix test

12 years agofix test
Stanislav Malyshev [Wed, 30 May 2012 06:42:37 +0000 (23:42 -0700)]
fix test

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Wed, 30 May 2012 06:44:35 +0000 (14:44 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Typofix in comment in proc_open.c

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Wed, 30 May 2012 06:43:55 +0000 (14:43 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Typofix in comment in proc_open.c

12 years agoTypofix in comment in proc_open.c
Jille Timmermans [Tue, 29 May 2012 13:44:04 +0000 (15:44 +0200)]
Typofix in comment in proc_open.c

12 years agoMerge branch 'PHP-5.4'
Stanislav Malyshev [Wed, 30 May 2012 06:14:09 +0000 (23:14 -0700)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix CVE-2012-2143

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Wed, 30 May 2012 06:07:27 +0000 (23:07 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix CVE-2012-2143

12 years agofix CVE-2012-2143
Stanislav Malyshev [Thu, 24 May 2012 18:54:51 +0000 (13:54 -0500)]
fix CVE-2012-2143

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Tue, 29 May 2012 15:42:35 +0000 (17:42 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated the libmagic patch after Felipes regex fix

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 29 May 2012 15:41:57 +0000 (17:41 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  updated the libmagic patch after Felipes regex fix

12 years agoupdated the libmagic patch after Felipes regex fix
Anatoliy Belsky [Tue, 29 May 2012 15:38:30 +0000 (17:38 +0200)]
updated the libmagic patch after Felipes regex fix

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Tue, 29 May 2012 14:43:40 +0000 (16:43 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 29 May 2012 14:43:20 +0000 (16:43 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt

12 years agoFix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Matt Ficken [Tue, 29 May 2012 14:38:57 +0000 (16:38 +0200)]
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt

12 years agoBug #62177 deactivate the linux test version on win
Matt Ficken [Tue, 29 May 2012 14:37:19 +0000 (16:37 +0200)]
Bug #62177 deactivate the linux test version on win

12 years agoFix bug #62177 Test Bug - finfo_file_regex.phpt
Matt Ficken [Tue, 29 May 2012 14:31:47 +0000 (16:31 +0200)]
Fix bug #62177 Test Bug - finfo_file_regex.phpt

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Tue, 29 May 2012 10:25:25 +0000 (12:25 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4: (21 commits)
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
  ...

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Tue, 29 May 2012 10:19:20 +0000 (12:19 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
NEWS
sapi/fpm/fpm/fpm_main.c

12 years agoFixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
Matt Ficken [Tue, 29 May 2012 09:41:44 +0000 (11:41 +0200)]
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt

12 years agofix unchecked emalloc
Stanislav Malyshev [Tue, 29 May 2012 01:54:15 +0000 (18:54 -0700)]
fix unchecked emalloc

12 years agoadd CVE
Stanislav Malyshev [Tue, 29 May 2012 01:54:02 +0000 (18:54 -0700)]
add CVE

12 years agoadd bug 62146
Stanislav Malyshev [Tue, 29 May 2012 00:43:36 +0000 (17:43 -0700)]
add bug 62146

12 years agoadd bug #62082
Stanislav Malyshev [Thu, 24 May 2012 18:38:36 +0000 (13:38 -0500)]
add bug #62082

12 years agoAdded support for CURLOPT_MAIL_AUTH
Pierrick Charron [Mon, 28 May 2012 03:43:52 +0000 (23:43 -0400)]
Added support for CURLOPT_MAIL_AUTH

pull-request/92:
  Added support for CURLOPT_MAIL_AUTH for libcurl >= 7.25.0

12 years agosync with HEAD
Nuno Lopes [Mon, 28 May 2012 00:14:31 +0000 (20:14 -0400)]
sync with HEAD

12 years agosync with HEAD
Nuno Lopes [Mon, 28 May 2012 00:13:09 +0000 (20:13 -0400)]
sync with HEAD

12 years ago128 MB is enough for everyone (TM)
Nuno Lopes [Mon, 28 May 2012 00:03:58 +0000 (20:03 -0400)]
128 MB is enough for everyone (TM)

this is an initial tentative to avoid some testcases go crazy and consume 16 GB of memory. Additional measures will have to be taken if the problem persists.
Please patch individual tests that really require more than 128MB of memory

12 years agoMerge branch 'master' of https://git.php.net/push/php-src
Nuno Lopes [Sun, 27 May 2012 23:58:00 +0000 (19:58 -0400)]
Merge branch 'master' of https://git.php.net/push/php-src

12 years agoremove remaining traces of unicode.* ini settings
Nuno Lopes [Sun, 27 May 2012 23:57:34 +0000 (19:57 -0400)]
remove remaining traces of unicode.* ini settings

12 years agoVIM uses spaces as tabs and that doesn't comply with the coding
Your Name [Sun, 27 May 2012 22:39:45 +0000 (15:39 -0700)]
VIM uses spaces as tabs and that doesn't comply with the coding
standard. I think I'd fixed it so it's using real tabs now.

12 years agoRemoved syslog.h. That should never have been commited.
Your Name [Sun, 27 May 2012 08:50:29 +0000 (01:50 -0700)]
Removed syslog.h. That should never have been commited.

12 years agoFixed the libcurl version checking for CURLOPT_MAIL_AUTH
Your Name [Sun, 27 May 2012 07:21:08 +0000 (00:21 -0700)]
Fixed the libcurl version checking for CURLOPT_MAIL_AUTH

12 years agoAdded support for CURLOPT_MAIL_AUTH
Your Name [Sun, 27 May 2012 07:02:53 +0000 (00:02 -0700)]
Added support for CURLOPT_MAIL_AUTH

12 years agoFixed bug #61218 (the previous patch was not enough restritive on fcgi name string...
Jerome Loyet [Sat, 26 May 2012 17:37:24 +0000 (19:37 +0200)]
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)

12 years agoFixed bug #61218 (the previous patch was not enough restritive on fcgi name string...
Jerome Loyet [Sat, 26 May 2012 17:37:09 +0000 (19:37 +0200)]
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)

12 years agoFixed bug #61218 (the previous patch was not enough restritive on fcgi name string...
Jerome Loyet [Sat, 26 May 2012 17:36:01 +0000 (19:36 +0200)]
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)

12 years agoFixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI...
Jerome Loyet [Sat, 26 May 2012 17:29:01 +0000 (19:29 +0200)]
Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)

12 years agoFixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI...
Jerome Loyet [Sat, 26 May 2012 17:27:45 +0000 (19:27 +0200)]
Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)

12 years agoFixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI...
Jerome Loyet [Sat, 26 May 2012 17:27:02 +0000 (19:27 +0200)]
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)

12 years agoFixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error...
Jerome Loyet [Sat, 26 May 2012 16:48:56 +0000 (18:48 +0200)]
Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)

12 years agoFixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error...
Jerome Loyet [Sat, 26 May 2012 16:48:40 +0000 (18:48 +0200)]
Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)

12 years ago- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an...
Jerome Loyet [Sat, 26 May 2012 16:44:35 +0000 (18:44 +0200)]
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)

12 years ago- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
Jerome Loyet [Sat, 26 May 2012 16:24:28 +0000 (18:24 +0200)]
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)

12 years ago- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
Jerome Loyet [Sat, 26 May 2012 16:24:08 +0000 (18:24 +0200)]
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)

12 years ago- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
Jerome Loyet [Sat, 26 May 2012 16:22:12 +0000 (18:22 +0200)]
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)

12 years ago- add missing headers to avoid warnings
Jerome Loyet [Sat, 26 May 2012 15:38:39 +0000 (17:38 +0200)]
- add missing headers to avoid warnings

12 years ago- add missing headers to avoid warnings
Jerome Loyet [Sat, 26 May 2012 15:38:08 +0000 (17:38 +0200)]
- add missing headers to avoid warnings

12 years ago- add missing headers to avoid warnings
Jerome Loyet [Sat, 26 May 2012 15:37:33 +0000 (17:37 +0200)]
- add missing headers to avoid warnings

12 years ago- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched...
Jerome Loyet [Fri, 25 May 2012 19:23:39 +0000 (21:23 +0200)]
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)

12 years ago- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched...
Jerome Loyet [Fri, 25 May 2012 19:22:54 +0000 (21:22 +0200)]
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)

12 years ago- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched...
Jerome Loyet [Fri, 25 May 2012 19:21:44 +0000 (21:21 +0200)]
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)

12 years ago- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
Jerome Loyet [Fri, 25 May 2012 19:15:06 +0000 (21:15 +0200)]
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).

12 years ago- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
Jerome Loyet [Fri, 25 May 2012 19:13:57 +0000 (21:13 +0200)]
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

12 years ago- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
Jerome Loyet [Fri, 25 May 2012 19:10:17 +0000 (21:10 +0200)]
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

12 years agoMerge branch 'PHP-5.4'
Xinchen Hui [Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62128 superfluous ";"

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 25 May 2012 14:33:17 +0000 (22:33 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62128 superfluous ";"

12 years agoFixed bug #62128 superfluous ";"
Xinchen Hui [Fri, 25 May 2012 14:31:26 +0000 (22:31 +0800)]
Fixed bug #62128 superfluous ";"

12 years agoFixed problem in IntlCalendar debug handler
Gustavo André dos Santos Lopes [Fri, 25 May 2012 09:55:50 +0000 (11:55 +0200)]
Fixed problem in IntlCalendar debug handler

*is_temp was not being set.

Also deleted a redundant assignment to *is_temp in IntlTimeZone.

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 25 May 2012 08:53:09 +0000 (10:53 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 25 May 2012 08:52:38 +0000 (10:52 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build

12 years agoFixed bug #62149 Test Bug - ext/curl/tests/bug61948
Matt Ficken [Fri, 25 May 2012 08:44:59 +0000 (10:44 +0200)]
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948

12 years agoFixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
Matt Ficken [Fri, 25 May 2012 08:34:33 +0000 (10:34 +0200)]
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Fri, 25 May 2012 08:05:23 +0000 (10:05 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62147 test bug - popen_pclose_basic-win32

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 25 May 2012 07:55:53 +0000 (09:55 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62147 test bug - popen_pclose_basic-win32

12 years agoFixed bug #62147 test bug - popen_pclose_basic-win32
Matt Ficken [Fri, 25 May 2012 07:53:51 +0000 (09:53 +0200)]
Fixed bug #62147 test bug - popen_pclose_basic-win32

12 years agoMerge branch 'PHP-5.4'
Johannes Schlüter [Thu, 24 May 2012 22:25:16 +0000 (00:25 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #62146  com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 24 May 2012 22:23:51 +0000 (00:23 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug #62146  com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN

12 years agoFix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
Johannes Schlüter [Thu, 24 May 2012 22:22:25 +0000 (00:22 +0200)]
Fix bug #62146  com_dotnet cannot be built shared, tested by Anatoliy

12 years agoThose changes are in 5.3.15
Johannes Schlüter [Thu, 24 May 2012 22:20:29 +0000 (00:20 +0200)]
Those changes are in 5.3.15

12 years agoMerge branch 'pull-request/54'
Stanislav Malyshev [Thu, 24 May 2012 19:17:07 +0000 (14:17 -0500)]
Merge branch 'pull-request/54'

* pull-request/54:
  Allow arbitrary expressions for empty()

    This change is as per RFC https://wiki.php.net/rfc/empty_isset_exprs.

    The change allows passing the result of function calls and other
    expressions to the empty() language construct. This is accomplished by
    simply rewriting empty(expr) to !expr.

    The change does not affect the suppression of errors when using empty()
    on variables. empty($undefinedVar) will continue not to throw errors.
    When an expression is used inside empty() on the other hand, errors will
    not be suppressed. Thus empty($undefinedVar + $somethingElse) *will*
    throw a notice.

    The change also does not make empty() into a real function, so using
    'empty' as a callback is still not possible.

    In addition to the empty() changes the commit adds nicer error messages
    when isset() is used on function call results or other expressions.

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Felipe Pena [Thu, 24 May 2012 16:45:36 +0000 (13:45 -0300)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

12 years ago- BFN
Felipe Pena [Thu, 24 May 2012 16:45:03 +0000 (13:45 -0300)]
- BFN

12 years agoMerge branch 'PHP-5.4'
Felipe Pena [Thu, 24 May 2012 16:43:53 +0000 (13:43 -0300)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed magic file regex support

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Felipe Pena [Thu, 24 May 2012 16:43:35 +0000 (13:43 -0300)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed magic file regex support

12 years ago- Fixed magic file regex support
Felipe Pena [Thu, 24 May 2012 16:42:47 +0000 (13:42 -0300)]
- Fixed magic file regex support

12 years agoMerge remote-tracking branch 'origin/PHP-5.4'
Xinchen Hui [Thu, 24 May 2012 15:38:53 +0000 (23:38 +0800)]
Merge remote-tracking branch 'origin/PHP-5.4'

* origin/PHP-5.4:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Thu, 24 May 2012 15:34:14 +0000 (23:34 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)

12 years agoFixed bug #62073
Xinchen Hui [Thu, 24 May 2012 15:20:21 +0000 (23:20 +0800)]
Fixed bug #62073

(Different ways of iterating over an SplMaxHeap result in in different keys)

12 years agoMerge branch '5.4'
Gustavo André dos Santos Lopes [Thu, 24 May 2012 12:33:42 +0000 (14:33 +0200)]
Merge branch '5.4'

12 years agoMerge branch '5.3' into 5.4
Gustavo André dos Santos Lopes [Thu, 24 May 2012 12:33:24 +0000 (14:33 +0200)]
Merge branch '5.3' into 5.4

12 years agoFixed bug #55610: ResourceBundle and Traversable
Gustavo André dos Santos Lopes [Thu, 24 May 2012 12:31:07 +0000 (14:31 +0200)]
Fixed bug #55610: ResourceBundle and Traversable

12 years agoMerge branch '5.4' with no code changes.
Gustavo André dos Santos Lopes [Thu, 24 May 2012 12:18:38 +0000 (14:18 +0200)]
Merge branch '5.4' with no code changes.

12 years agoFixed last commit on 5.4
Gustavo André dos Santos Lopes [Thu, 24 May 2012 12:04:19 +0000 (14:04 +0200)]
Fixed last commit on 5.4

There's no change from the intended behavior. If INTL_G(default_locale)
is NULL, the default ICU locale, as given by locale_get_default() in
master, will still be used by ures_open().

12 years agoMerge branch 'PHP-5.4'
Anatoliy Belsky [Thu, 24 May 2012 11:59:57 +0000 (13:59 +0200)]
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails

12 years agoFixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
Anatoliy Belsky [Thu, 24 May 2012 11:58:42 +0000 (13:58 +0200)]
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails

12 years agoMerge branch '5.4'
Gustavo André dos Santos Lopes [Thu, 24 May 2012 11:52:06 +0000 (13:52 +0200)]
Merge branch '5.4'

Conflicts:
UPGRADING