Commit Graph

71928 Commits

Author SHA1 Message Date
husman
ad570991cf synergy ftl. Removed duplicate fields. 2012-09-30 19:20:51 -07:00
husman
6ec6b208e8 adding test phpt 2012-09-30 19:20:44 -07:00
husman
491b1efacb Bug #63162 - parse_url does not matches password component 2012-09-30 19:20:37 -07:00
Stanislav Malyshev
f879e1162f fix news 2012-09-30 19:08:24 -07:00
Reeze Xia
dedbba4e5b Eliminate process running requirement of dump_bt in .gdbinit
Most of the time scope are avaible, but if not, it will be hard to get them,
since we can't call function if no proccess running. try to get class name
if we can.
2012-10-01 03:10:15 +08:00
Xinchen Hui
175a9de47f Fix test 2012-10-01 00:15:47 +08:00
Reeze Xia
752280d4d2 Add missing ____executor_globals in dump_bt if needed 2012-09-30 23:05:03 +08:00
Lonny Kapelushnik
b3469560f3 Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour)
Prevent a unix timestamp, which is always GMT when being parsed, from taking on
the local timezones DST flag.
2012-09-30 04:31:29 +00:00
Reeze Xia
613674c7a2 Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace) 2012-09-30 03:16:26 +08:00
ULF WENDEL
20e76f4487 Minor changes for MySQL 5.6 2012-09-29 12:10:24 +02:00
Gustavo Lopes
519f93ef99 NEWS for 76601c4 2012-10-12 20:27:53 +02:00
ULF WENDEL
4969c7d50a Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  - Fixed bug #63214 (Large PDO Firebird Queries)
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
  sapi/litespeed/lsapi_main.c: Fix bug #63228
  fix test
  constify
  Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
2012-09-29 09:56:55 +02:00
Felipe Pena
5cf6334e84 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #63214 (Large PDO Firebird Queries)
2012-10-12 19:43:00 -03:00
Gustavo Lopes
2634f55992 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #63240 on stream_get_line()
2012-10-12 20:24:28 +02:00
Anatoliy Belsky
1d87ad89b2 Merge branch 'PHP-5.4'
* PHP-5.4:
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
2012-10-12 19:54:25 +02:00
Anatoliy Belsky
2528b3c75e Merge branch 'master' of git.php.net:php-src 2012-10-12 19:40:52 +02:00
Anatoliy Belsky
a4c964ca7b Merge branch 'PHP-5.4'
* PHP-5.4:
  fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:38:49 +02:00
George Wang
1407b4a080 Merge branch '5.4'
* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
2012-10-12 13:29:37 -04:00
George Wang
68e528a6bc Merge branch '5.3' into 5.4
* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
2012-10-12 13:09:53 -04:00
George Wang
22611b8d37 sapi/litespeed/lsapi_main.c: Fix bug #63228
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2012-10-12 13:04:22 -04:00
Andrey Hristov
6fbcf69375 fix test 2012-10-12 10:35:45 +02:00
Andrey Hristov
0f3fb08a8d Merge branch 'master' of ssh://git.php.net/php-src 2012-10-12 10:20:37 +02:00
Andrey Hristov
225792c5db constify 2012-10-12 10:20:09 +02:00
Xinchen Hui
d709442faf Merge branch 'PHP-5.4' 2012-10-12 10:39:20 +08:00
Xinchen Hui
7a7b2a0642 Merge branch 'PHP-5.4' 2012-10-10 17:24:40 +08:00
Anatoliy Belsky
e70aed5c74 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix warnings preventing this test from passing
2012-10-10 11:06:34 +02:00
Xinchen Hui
4e5e8c9da0 Merge branch 'PHP-5.4' 2012-10-10 10:45:34 +08:00
Xinchen Hui
b17039c737 Remove executable permission on phpt 2012-10-10 10:32:58 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Xinchen Hui
14bfd3126c Merge branch 'PHP-5.4' 2012-10-09 13:16:53 +08:00
Xinchen Hui
6cd6a74c5a Merge branch 'PHP-5.4' 2012-10-08 23:00:57 +08:00
Stanislav Malyshev
531e2533dd Use zend_execute_internal always to call internal functions 2012-10-05 08:14:20 +02:00
Stanislav Malyshev
bda93f5405 use zend_execute_internal 2012-10-04 22:43:13 -07:00
Anatoliy Belsky
d5494d5e24 Merge branch 'PHP-5.4'
* PHP-5.4:
  exposing the libxpm version in phpinfo
  5.4.9-dev

Conflicts:
	NEWS
	configure.in
	main/php_version.h
2012-10-04 18:24:42 +02:00
Andrey Hristov
713a3fc58c update 2012-10-04 13:40:23 +02:00
Derick Rethans
61bee020e1 Merge branch 'master' of git.php.net:/php-src 2012-10-04 08:38:56 +01:00
Johannes Schlüter
9b2303afd6 Merge branch 'PHP-5.4' 2012-10-04 02:37:27 +02:00
Andrey Hristov
06dfb96bf5 add a check for libmysql 2012-10-03 14:14:59 +02:00
Andrey Hristov
3262de2f62 Merge branch 'master' of ssh://git.php.net/php-src 2012-10-03 14:03:05 +02:00
Andrey Hristov
4c9e222f99 if ssl has been switched on transmit clear-text password 2012-10-03 14:02:33 +02:00
Anatoliy Belsky
eea88c58db Merge branch 'PHP-5.4'
* PHP-5.4:
  reverted the previous fix for libpng include
2012-10-02 10:03:03 +02:00
Anatoliy Belsky
6d1f81ebc0 Merge branch 'PHP-5.4'
* PHP-5.4:
  fixed include checks for libpng under win
2012-10-02 09:41:24 +02:00
Xinchen Hui
62fa875f3e Merge branch 'PHP-5.4' 2012-10-02 00:31:47 +08:00
Xinchen Hui
2ccae0ee75 Merge branch 'PHP-5.4' 2012-10-02 00:05:25 +08:00
Xinchen Hui
a81d431068 Merge branch 'PHP-5.4' 2012-10-01 22:45:15 +08:00
Stanislav Malyshev
0a3b6e4ee9 Merge branch 'PHP-5.4'
* PHP-5.4:
  Eliminate process running requirement of dump_bt in .gdbinit
  Add missing ____executor_globals in dump_bt if needed
  Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
2012-09-30 20:32:04 -07:00
Stanislav Malyshev
e3e3fba66d Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
2012-09-30 20:21:11 -07:00
Stanislav Malyshev
4ba2d546c8 Merge branch 'PHP-5.4'
* PHP-5.4:
  add news for --offline
  add --offline option to run-tests command
  Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
  Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
  gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:41:54 -07:00
Stanislav Malyshev
815248d8fb Merge branch 'PHP-5.4'
* PHP-5.4:
  add bug #63162
  fix test and move to proper place
  synergy ftl. Removed duplicate fields.
  adding test phpt
  Bug #63162 - parse_url does not matches password component
  fix news
2012-09-30 19:28:42 -07:00