mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
68,141 Commits 500 Branches 1,381 Tags 797 MiB
3bf53aa911
Commit Graph

68141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Soria Parra
3bf53aa911 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:25 +02:00
reeze
ff8be9845f Cleanup Safe Mode related comment in SG(request_info) 2012-03-31 09:34:08 +02:00
Christopher Jones
aa774a51d5 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add php.ini parameter checks for OCI8
 2012-03-30 16:17:37 -07:00
Christopher Jones
132d7113ea Merge branch 'add-oci8-ini-tests' into PHP-5.3 
* add-oci8-ini-tests:
  Add php.ini parameter checks for OCI8
 2012-03-30 16:16:32 -07:00
Christopher Jones
c56cfbd234 Add php.ini parameter checks for OCI8 
Add tests for OCI8 php.ini parameters particularly to check
which parameters can be changes with ini_set().
 2012-03-30 16:12:25 -07:00
Christopher Jones
4e8cab94d3 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
 2012-03-30 10:48:45 -07:00
Xinchen Hui
14fdb8bf0a trivial change try to ci a "fake" merge 
seems now a empty merge will not be accepted by pre-receive-hook
  "remote: We cannot figure out what you comitted!"
 2012-03-30 20:50:45 +08:00
Xinchen Hui
e2edc820e0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test,  parameter signatures was introduced only into 5.4
 2012-03-30 20:45:09 +08:00
Xinchen Hui
6b4112c98a Fix test, parameter signatures was introduced only into 5.4 2012-03-30 20:37:48 +08:00
Stanislav Malyshev
82f166fa73 fix makedist for new tags 2012-03-30 00:01:52 -07:00
Christopher Jones
06235747b1 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-29 17:42:40 -07:00
Shein Alexey
c02aa086c6 Resolved conflict. 2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3 
* fix-debug-build-bug61115-1.phpt:
  Fixed bug61115-1.phpt for debug build version.
 2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416 Fixed bug61115-1.phpt for debug build version. 2012-03-29 16:51:45 +05:00
Yasuo Ohgaki
8449e0ca89 Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) 2012-03-29 20:04:15 +09:00
Yasuo Ohgaki
aecf5485e3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
 2012-03-29 19:55:06 +09:00
Yasuo Ohgaki
931831bf75 Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) 2012-03-29 19:48:58 +09:00
Johannes Schlüter
1d8664b90b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This will be PHP 5.3.12

Conflicts:
	configure.in
	main/php_version.h
 2012-03-29 11:43:26 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
Johannes Schlüter
0bca6214c6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
 2012-03-29 10:57:57 +02:00
Johannes Schlüter
21fa9634c1 Merge remote branch 'security/PHP-5.3' into PHP-5.3 
* security/PHP-5.3:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-29 10:54:08 +02:00
Gustavo André dos Santos Lopes
f4873c68a6 Merge branch '5.3' into 5.4 
Conflicts:
	main/output.c
 2012-03-29 08:47:58 +01:00
Gustavo André dos Santos Lopes
67bf07f3e7 Merge rebased pull request #24 onto 5.3 into 5.3 2012-03-29 08:46:37 +01:00
Jille Timmermans
710335b2a3 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974 Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow) 
This reverts commit 4aeabaf8e9.
 2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow) 
This reverts commit 55b1e61242.
 2012-03-29 08:44:19 +01:00
Stanislav Malyshev
fe79276371 Merge branch 'sec54' into PHP-5.4 
* sec54:
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-28 21:16:04 -07:00
Jille Timmermans
4aeabaf8e9 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 09:07:19 +09:00
Jille Timmermans
55b1e61242 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 09:07:07 +09:00
Yasuo Ohgaki
f38ee78344 Merge branch 'pull-request/25' into 5.3 
* pull-request/25:
  - fix bug #61541, Segfault when using ob_* in output_callback
 2012-03-29 08:51:29 +09:00
Christopher Jones
4b72d505ae Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Refactoring junit logger. Added generation of nested testsuites in junit.xml.
 2012-03-28 16:16:20 -07:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes
08089ebe16 Merge branch '5.3' into 5.4 2012-03-28 21:42:48 +01:00
Gustavo André dos Santos Lopes
5ddfdb8fd4 Merge commit rebase pull request 16 into 5.3 2012-03-28 21:41:59 +01:00
Shein Alexey
1e88d0033f Refactoring junit logger. Added generation of nested testsuites in junit.xml. 2012-03-28 21:39:24 +01:00
Anatoliy Belsky
92bca7436f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe
 2012-03-28 19:32:24 +02:00
Anatoliy Belsky
eeab3be303 Fix bug #61459 popen_close_basic-win32 can't run sort.exe 2012-03-28 19:25:29 +02:00
reeze
9bc91a21db - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 00:18:02 +08:00
Anatoliy Belsky
fa0d507923 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61401 ext\openssl\tests\004.phpt fails
  Fix bug #61404 ext\openssl\tests\021.phpt fails
  Fix bug #61448 intl tests fail with icu >= 4.8
 2012-03-28 17:13:16 +02:00
Anatoliy Belsky
bff8152565 Fix bug #61401 ext\openssl\tests\004.phpt fails 2012-03-28 17:11:58 +02:00
Anatoliy Belsky
4c5b427124 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:15:36 +02:00
Anatoliy Belsky
bd7bb973b1 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:04:56 +02:00
Anatoliy Belsky
bd928f0592 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 15:07:01 +02:00
Anatoliy Belsky
fa7f215d19 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Fixed problem introduced in a763929 (fixing bug #61347).
 2012-03-28 14:51:16 +02:00
Gustavo André dos Santos Lopes
a9121819d0 Merge remote branch 'origin/PHP-5.4' into 5.4 2012-03-28 13:13:52 +01:00
Gustavo André dos Santos Lopes
4fa0c2a963 Merge remote branch 'origin/PHP-5.3' into 5.3 2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes
593578c8c1 Merge branch '5.3' into 5.4 2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes
f07dd29fdc Fixed problem introduced in a763929 (fixing bug #61347). 
The test added in 8c44c85 should now pass.
 2012-03-28 13:04:41 +01:00
Anatoliy Belsky
105a9a9d45 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61448 intl tests fail with icu >= 4.8
 2012-03-28 14:01:14 +02:00
Anatoliy Belsky
103995ba22 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 13:59:51 +02:00