clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,169 Commits 494 Branches 1,367 Tags 802 MiB
303c52b54d
Commit Graph

70169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
303c52b54d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Make css string constant
 2012-04-21 09:31:45 +08:00
Xinchen Hui
b999e91f5b Make css string constant 2012-04-21 09:31:00 +08:00
Xinchen Hui
465e9a1321 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed typo
 2012-04-21 00:12:10 +08:00
Xinchen Hui
da85337d13 Fixed typo 
report by reeze.xia@gmail.com
 2012-04-21 00:11:06 +08:00
Xinchen Hui
a9d54e77c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improved performance while sending error page
  - BFN
 2012-04-21 00:02:12 +08:00
Xinchen Hui
cc58373d4d Improved performance while sending error page 
this also fixed bug #61785 (Memory leak when access a non-exists file without router)
 2012-04-21 00:01:10 +08:00
Felipe Pena
bca2d6b985 - BFN 2012-04-19 23:23:59 -03:00
Felipe Pena
47cff264df Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
 2012-04-19 23:14:00 -03:00
Felipe Pena
d2798c6035 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
 2012-04-19 23:13:37 -03:00
Felipe Pena
c3b0fb4fbe - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net 2012-04-19 23:12:47 -03:00
Felipe Pena
77f43a0770 Merge branch 'PHP-5.4' 2012-04-19 20:15:26 -03:00
Felipe Pena
0a46d63f7e - Fixed expected test result (patch by ab@php.net in #61769) 2012-04-19 20:15:11 -03:00
Felipe Pena
e104d3fb6e Merge branch 'PHP-5.4' 2012-04-19 20:07:37 -03:00
Felipe Pena
d5bd45429c - Fix test title 2012-04-19 20:05:30 -03:00
Stanislav Malyshev
c7e54d56ac Merge branch 'PHP-5.4' 
* PHP-5.4:
  add pg_escape_identifier/pg_escape_literal
 2012-04-19 13:40:36 -07:00
Yasuo Ohgaki
655245afef add pg_escape_identifier/pg_escape_literal 2012-04-19 13:40:24 -07:00
Stanislav Malyshev
71884b7024 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:37:55 -07:00
Stanislav Malyshev
106e0a2e68 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:37:31 -07:00
Stanislav Malyshev
5cbf2d6785 Merge branch 'pull-request/61' into PHP-5.3 
* pull-request/61:
  Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
 2012-04-19 11:28:30 -07:00
Stanislav Malyshev
e9a73a4cf5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix RCs
  Update to 5.4.2-dev

Conflicts:
	main/php_version.h
 2012-04-19 11:03:12 -07:00
Stanislav Malyshev
2b8e9430c8 fix RCs 2012-04-19 10:45:21 -07:00
Christopher Jones
701332ce30 Update to 5.4.2-dev 
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
 2012-04-19 10:45:21 -07:00
Johannes Schlüter
d2718cb9ff Merge branch 'PHP-5.4' 
* PHP-5.4:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
 2012-04-19 12:49:47 +02:00
Johannes Schlüter
36a5565467 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:/php-src:
 2012-04-19 12:48:18 +02:00
Johannes Schlüter
0589b19abf Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Commit generated file
  Fix bug #61755 parsing bug can lead to access violations
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 12:47:47 +02:00
Johannes Schlüter
c06ec6bde4 Commit generated file 2012-04-19 12:47:09 +02:00
Johannes Schlüter
1b78aef426 Fix bug #61755 parsing bug can lead to access violations 2012-04-19 12:46:02 +02:00
Anatoliy Belsky
0e430c8ded Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 11:38:35 +02:00
Anatoliy Belsky
1f4b4c384e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
 2012-04-19 11:36:50 +02:00
Anatoliy Belsky
adfb4c62b7 Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails 
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
 2012-04-19 11:33:12 +02:00
Sherif Ramadan
2827324c7c Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer 2012-04-19 04:44:43 -04:00
Johannes Schlüter
904ca2f0b3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Drop old README
 2012-04-19 00:30:58 +02:00
Johannes Schlüter
ff7e1ff677 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Drop old README
 2012-04-19 00:30:45 +02:00
Johannes Schlüter
4650b2164b Drop old README 2012-04-19 00:29:24 +02:00
Johannes Schlüter
9ca4710c9f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)
 2012-04-19 00:08:42 +02:00
Johannes Schlüter
cc85e7c313 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)
 2012-04-19 00:08:36 +02:00
Johannes Schlüter
710021d1d4 Fix slight grammar glitch (thanks Dan Brown) 2012-04-19 00:07:40 +02:00
Johannes Schlüter
f3b3450f01 Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
 2012-04-18 22:51:15 +02:00
Johannes Schlüter
15f552dbd0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
  update NEWS
 2012-04-18 22:51:06 +02:00
Johannes Schlüter
900751e8ae Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update generated file.
  Ensure the SQL parser is regenerated after changes.
 2012-04-18 22:50:21 +02:00
Johannes Schlüter
e946eaca0b Update generated file. 2012-04-18 22:49:03 +02:00
Johannes Schlüter
dda60f3014 Ensure the SQL parser is regenerated after changes. 2012-04-18 22:48:49 +02:00
Xinchen Hui
140c8c1975 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9
  update NEWS
 2012-04-18 18:48:36 +08:00
Xinchen Hui
56d8d35300 Fix NEWS, the previous wrong was introduced in commit cb2a1c71c9 
http://git.php.net/?p=php-src.git;a=commitdiff;h=cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
 2012-04-18 18:43:46 +08:00
Xinchen Hui
172aa3c6d7 update NEWS 2012-04-18 18:42:39 +08:00
Johannes Schlüter
fcb63a8396 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS
  Implement Request #47570	libpq's PG_VERSION should be exported to userland
 2012-04-18 12:23:35 +02:00
Johannes Schlüter
0618e33b5d 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 bug #61761 ('Overriding' a private static method with a different signature causes crash)
 2012-04-18 12:22:27 +02:00
Yasuo Ohgaki
d6394e66a3 Add NEWS 2012-04-18 12:21:05 +02:00
Yasuo Ohgaki
cce0f8e507 Implement Request #47570 libpq's PG_VERSION should be exported to userland 2012-04-18 12:20:35 +02:00
Xinchen Hui
6b9e88d9e6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
 2012-04-18 18:15:29 +08:00