clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,989 Commits 494 Branches 1,367 Tags 807 MiB
a4fff4dc45
Commit Graph

69989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Popa Adrian Marius
66b3b44fd5 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-04-02 10:02:45 +03:00
Popa Adrian Marius
e3e7f47441 Merge branch 'master' of git.php.net:php-src 2012-04-02 09:57:48 +03:00
Gustavo André dos Santos Lopes
1c16c89b96 Merge branch 'intl_calendar' 2012-04-01 23:36:59 +01:00
Gustavo André dos Santos Lopes
0e8d928c07 Update UPGRADING with changes. 2012-04-01 23:35:29 +01:00
Gustavo André dos Santos Lopes
d32ac3efc8 Fixed tests that required a "default" timezone. 
Added date.timezone=Atlantic/Azores to all tests that were failing because
of ext/date warning about a timezone not having been set.
 2012-04-01 23:28:01 +01:00
Gustavo André dos Santos Lopes
95fbae891a Compatibility with old versions of ICU (4.0+). 2012-04-01 23:28:01 +01:00
Gustavo André dos Santos Lopes
69f75bb43c Added support for new method TimeZone::getUnknown() added in ICU 49. 2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
d3a29c108b Supported Calendar methods new to ICU 49. 2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
7460741f99 Fix TimeZone tests failing due to new data in ICU 49. 2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
5e65205a8f Initial checkin of calendar/timezone code. 2012-04-01 23:28:00 +01:00
Gustavo André dos Santos Lopes
6c891f33d7 Put new function in correct section. 2012-04-01 23:27:50 +01:00
Gustavo André dos Santos Lopes
ab627e0eb0 Convert EOL style to Unix. 2012-04-01 11:00:05 +02:00
Ferenc Kovacs
15a98ece9f Revert "making the test fail for testing jenkins report mail. I will revert this soon." 
This reverts commit b8fe28f455.
 2012-03-31 11:23:26 +02:00
Ferenc Kovacs
b8fe28f455 making the test fail for testing jenkins report mail. I will revert this soon. 2012-03-31 11:22:16 +02:00
David Soria Parra
cae2556462 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:43 +02:00
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
8b2a51c62c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add php.ini parameter checks for OCI8
 2012-03-30 16:18:15 -07: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
15405e2abd Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' 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:49 -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
1904cf696b Merge branch 'PHP-5.4' 
* PHP-5.4:
  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 20:57:55 +08: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
c3fd894d0a Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' 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)
  Revert "Merge branch 'pull-request/24'" (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
  ext/pcntl/pcntl.c: Fix typo in comment
  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:43 -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
Popa Adrian Marius
1338e971fc Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix firebird bug #60947 , tested and now it prints the header page information from database
 2012-03-29 18:28:38 +03:00
Popa Adrian Marius
5d8a0fd7ec Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix firebird bug #60947 , tested and now it prints the header page information from database
 2012-03-29 18:28:22 +03:00
Popa Adrian Marius
97f4fc22c5 Fix firebird bug #60947 , tested and now it prints the header page information from database 2012-03-29 18:28:01 +03:00
Shein Alexey
babe3ee0d2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
 2012-03-29 17:25:49 +05: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
48033ed48d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
 2012-03-29 20:06:00 +09: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
dde1bff4c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  This will be PHP 5.3.12
 2012-03-29 11:44:10 +02: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
27378c2b5a Merge branch 'PHP-5.4' 
* PHP-5.4:
 2012-03-29 10:59:02 +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
fc4482fd5e Merge branch '5.4' 2012-03-29 08:48:13 +01: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