0
0
mirror of https://github.com/php/php-src.git synced 2024-12-21 07:51:23 +08:00
Commit Graph

29876 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
6efc877826 Merge branch 'datefmt_tz_cal_interop'
* datefmt_tz_cal_interop:
  Added and fixed tests given eb346ef
  DateFormat plays nice with Calendar, TimeZone
  Added private constructor to IntlTimeZone.
  Fixed write in constant memory.
2012-06-03 23:08:19 +01:00
Gustavo André dos Santos Lopes
758f0686d4 Added and fixed tests given eb346ef 2012-06-04 00:02:35 +02:00
Felipe Pena
9434f5e41f Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' 2012-06-03 19:02:00 -03:00
Gustavo André dos Santos Lopes
eb346ef0f4 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.
2012-06-04 00:01:48 +02:00
Gustavo André dos Santos Lopes
72beff0d41 Added private constructor to IntlTimeZone. 2012-06-03 23:39:34 +02:00
Gustavo André dos Santos Lopes
f3802db7a0 Fixed write in constant memory.
clang did not forgive.
2012-06-03 23:39:27 +02:00
Felipe Pena
e59b6dc0ae - Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind) 2012-06-03 15:23:07 -03:00
andrey
2c230fb574 close the underlying stream as early as possible and so notify the
NET layer
2012-06-01 22:12:08 +03:00
andrey
ba23ddd06c Merge branch 'master' of git.php.net:php-src 2012-06-01 11:22:52 +03:00
andrey
f96d19fa70 close the stream whenever possible, no need to keep it open altough the
connection is marked as unusable
2012-06-01 11:22:19 +03:00
Xinchen Hui
fc6462ec7b Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed Bug  (ReflectionParameter::getDefaultValue() memory leaks with constant)
  sort NEWS
2012-06-01 15:00:55 +08:00
Xinchen Hui
b548d9ad2e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug  (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 15:00:02 +08:00
Xinchen Hui
1f5327a602 Fixed Bug (ReflectionParameter::getDefaultValue() memory leaks with constant) 2012-06-01 14:57:27 +08:00
andrey
9a64a23caf Merge branch 'master' of git.php.net:php-src 2012-05-31 15:46:55 +03:00
andrey
0d1bc3e8e5 more refactoring stuff. Reduced code duplication in the authentication
code
2012-05-31 15:46:26 +03:00
Stanislav Malyshev
0c658c39f6 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix bug  - erealloc without updating pointer
2012-05-30 22:27:54 -07:00
Stanislav Malyshev
ed6ce83101 fix bug - erealloc without updating pointer 2012-05-30 22:26:26 -07:00
Johannes Schlüter
33849c2211 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug  readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b08)
2012-05-31 01:18:02 +02:00
Johannes Schlüter
428dddd3e8 Fix bug readline fails to compile 2012-05-31 01:15:22 +02:00
Stanislav Malyshev
fa05f038cb fix unchecked emalloc
(cherry picked from commit 158d8a6b08)
2012-05-30 21:37:28 +02:00
andrey
56532895a8 Merge branch 'master' of git.php.net:php-src 2012-05-30 15:25:26 +03:00
andrey
5a2578a333 small refactoring - factour out code from connection establishment.
Add a define for the default authentication protocol - get away from
the hardcoded magic value
2012-05-30 15:24:17 +03:00
Stanislav Malyshev
ec2029a894 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix test
  fix test
2012-05-29 23:53:01 -07:00
Stanislav Malyshev
9b98cf7865 fix test 2012-05-29 23:52:47 -07:00
Xinchen Hui
4770fe2c97 Merge branch 'PHP-5.4'
* PHP-5.4:
  Typofix in comment in proc_open.c
2012-05-30 14:44:35 +08:00
Xinchen Hui
7511f972fd Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Typofix in comment in proc_open.c
2012-05-30 14:43:55 +08:00
Jille Timmermans
a331f43f8c Typofix in comment in proc_open.c 2012-05-30 14:42:39 +08:00
Stanislav Malyshev
f428578138 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix CVE-2012-2143
2012-05-29 23:14:09 -07:00
Stanislav Malyshev
692b3bcd88 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix CVE-2012-2143
2012-05-29 23:08:04 -07:00
Stanislav Malyshev
aab49e934d fix CVE-2012-2143 2012-05-29 23:07:04 -07:00
Anatoliy Belsky
9a9362cb09 Merge branch 'PHP-5.4'
* PHP-5.4:
  updated the libmagic patch after Felipes regex fix
2012-05-29 17:42:35 +02:00
Anatoliy Belsky
6074da9809 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated the libmagic patch after Felipes regex fix
2012-05-29 17:41:57 +02:00
Anatoliy Belsky
8d5e953a19 updated the libmagic patch after Felipes regex fix 2012-05-29 17:38:30 +02:00
Anatoliy Belsky
3a35479e59 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug  Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug  deactivate the linux test version on win
  Fix bug  Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:40 +02:00
Anatoliy Belsky
c0e046a130 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug  Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug  deactivate the linux test version on win
  Fix bug  Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
Matt Ficken
ad0371ac7e Fix bug Test Bug - ext/fileinfo/tests/finfo_open_error.phpt 2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93 Bug deactivate the linux test version on win 2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c Fix bug Test Bug - finfo_file_regex.phpt 2012-05-29 16:31:47 +02:00
Anatoliy Belsky
dffbc98239 Merge branch 'PHP-5.4'
* PHP-5.4: (21 commits)
  Fixed bug  Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug 
  sync with HEAD
  sync with HEAD
  Fixed bug  (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug  (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug  (FPM drops connection while receiving some binary values in FastCGI requests)
  Fixed bug  (FPM drops connection while receiving some binary valuesin FastCGI requests)
  Fixed bug  (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug  (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug  (Add process.priority to set nice(2) priorities)
  - Fixed bug  (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - add missing headers to avoid warnings
  - Fixed bug  (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug  (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug  (php-fpm exits with status 0 on some failures to start)
  ...

Conflicts:
	NEWS
2012-05-29 12:25:25 +02:00
Stanislav Malyshev
158d8a6b08 fix unchecked emalloc 2012-05-28 18:54:15 -07:00
Pierrick Charron
fde8762e90 Added support for CURLOPT_MAIL_AUTH
pull-request/92:
  Added support for CURLOPT_MAIL_AUTH for libcurl >= 7.25.0
2012-05-27 23:43:52 -04:00
Nuno Lopes
af2d6a63bf remove remaining traces of unicode.* ini settings 2012-05-27 19:57:34 -04:00
Your Name
60c4728594 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.
2012-05-27 15:39:45 -07:00
Your Name
0667da8cb4 Removed syslog.h. That should never have been commited. 2012-05-27 01:50:29 -07:00
Your Name
d41fb16a52 Fixed the libcurl version checking for CURLOPT_MAIL_AUTH 2012-05-27 00:21:08 -07:00
Your Name
f75c1ed201 Added support for CURLOPT_MAIL_AUTH 2012-05-27 00:02:53 -07:00
Gustavo André dos Santos Lopes
a1e97bada8 Fixed problem in IntlCalendar debug handler
*is_temp was not being set.

Also deleted a redundant assignment to *is_temp in IntlTimeZone.
2012-05-25 13:29:19 +02:00
Anatoliy Belsky
c8d8d2442e Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug  Test Bug - ext/curl/tests/bug61948
  Fixed bug  mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:53:09 +02:00
Anatoliy Belsky
16a592b13a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug  Test Bug - ext/curl/tests/bug61948
  Fixed bug  mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:52:38 +02:00
Matt Ficken
86d2fafded Fixed bug Test Bug - ext/curl/tests/bug61948 2012-05-25 10:44:59 +02:00