Felipe Pena
eb8d603d46
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:26 -03:00
Felipe Pena
de884997e0
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:13 -03:00
Anatoliy Belsky
747d2f8417
Merge branch 'PHP-5.4'
...
* PHP-5.4:
updated mpir version
Fixed defective cloning in ext/intl classes
2012-08-29 17:56:42 +02:00
Anatoliy Belsky
677de8568a
updated mpir version
2012-08-29 17:49:02 +02:00
Nikita Popov
f4ce364628
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
2012-08-13 16:54:53 +02:00
Andrew Faulds
d12f8d6790
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
...
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Xinchen Hui
07d0eab204
Merge branch 'PHP-5.4'
...
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (2) and Xinchen Hui (2)
* PHP-5.4:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
merge 5.3 entries
restore NEWS
Fix ext/intl build on ICU < 4.8
Optimization in ext/intl/msgformat
Fixed tests in ext/intl
Changed XFAILed collator_get_sort_key.phpt
2012-06-07 14:42:35 +08:00
Xinchen Hui
83542dcf3b
Merge branch 'PHP-5.3' into PHP-5.4
...
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (1) and Xinchen Hui (1)
* PHP-5.3:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
Fix ext/intl build on ICU < 4.8
Optimization in ext/intl/msgformat
Fixed tests in ext/intl
Changed XFAILed collator_get_sort_key.phpt
2012-06-07 14:32:47 +08:00
Xinchen Hui
6ecc9f1d9d
Remove unused codes
2012-06-07 14:31:35 +08:00
slayercat
d9810af45a
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
...
via http://technet.microsoft.com/en-us/library/ms724284(v=vs.85).aspx
"Do not cast a pointer to a FILETIME structure to either a
ULARGE_INTEGER* or __int64* value because it can cause alignment faults on 64-bit Windows."
2012-06-07 14:28:05 +08:00
Nikita Popov
ca59e5464d
Add empty Generator class
2012-05-20 00:03:27 +02:00
Felipe Pena
42faa077f9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #55299 (multiple null pointer in win32/registry.c)
2012-05-16 08:40:53 -03:00
Felipe Pena
1abcd81872
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #55299 (multiple null pointer in win32/registry.c)
2012-05-16 08:40:45 -03:00
Felipe Pena
93c91c733c
- Fixed bug #55299 (multiple null pointer in win32/registry.c)
2012-05-16 08:40:12 -03:00
Anatoliy Belsky
257d0b5566
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
2012-05-11 14:39:29 +02:00
Anatoliy Belsky
4458f3bcf6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
2012-05-11 14:38:43 +02:00
Anatoliy Belsky
81ba6b14c7
Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
...
This fixes a general issue. In this ticket and not for the first time
is being seen, that people are trying to use data from "examples"
in the tests. When extracting a test pack only "tests" and its siblings
was taken into account. Now "examples" are copied as well.
2012-05-11 14:24:12 +02:00
Johannes Schlüter
c62a41860e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:29 +02:00
Johannes Schlüter
6ecac26972
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:00 +02:00
Johannes Schlüter
21d314a767
Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:29:55 +02:00
Pierre Joye
69e0e03457
- update to openssl 0.9.8u
2012-04-02 13:09:19 +02:00
Pierre Joye
55a6f3a12d
- update to openssl 0.9.8u
2012-04-02 13:07:59 +02:00
Pierre Joye
45416cbe56
- update to openssl 0.9.8u
2012-04-02 13:06:44 +02:00
Pierre Joye
2c43149f21
- fix bug #61290 , fix build
2012-03-05 20:53:40 +00:00
Pierre Joye
d1f7d3c8a9
- fix bug #61290 , fix build
2012-03-05 20:53:40 +00:00
Pierre Joye
3a24a0b76e
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 22:15:12 +00:00
Pierre Joye
ad8474c578
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 22:15:12 +00:00
Pierre Joye
d85cc4a1a1
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 15:23:24 +00:00
Pierre Joye
bda5ea7111
- fix bug #54407 , Incorrectly defined NTDDI_VERSION macro
2012-03-04 15:23:24 +00:00
Pierre Joye
94994104a5
- bump minimum version, no more XP/2003
2012-03-04 15:08:12 +00:00
Pierre Joye
e31a457c72
- libssh2 1.3.0
2012-01-30 11:04:19 +00:00
Pierre Joye
90321eaa98
- libssh2 1.3.0
2012-01-30 11:04:19 +00:00
Pierre Joye
7053fe29ea
- libssh2 1.3.0
2012-01-30 11:04:19 +00:00
Pierre Joye
614c22e105
- update libs
2012-01-27 17:35:01 +00:00
Pierre Joye
f75f11857c
- update libs
2012-01-27 17:35:01 +00:00
Pierre Joye
544e36dfff
- update libs
2012-01-27 17:35:01 +00:00
Pierre Joye
499bb11887
- update libs
2012-01-27 17:31:17 +00:00
Pierre Joye
9c948ad564
- update libs
2012-01-27 17:31:17 +00:00
Pierre Joye
52697bcfd3
- update libs
2012-01-27 17:31:17 +00:00
Pierre Joye
7e865a1555
- update libs
2012-01-27 13:27:03 +00:00
Pierre Joye
2e1e20b69b
- update libs
2012-01-27 13:27:03 +00:00
Pierre Joye
d762f04dd8
- update libs
2012-01-27 13:27:03 +00:00
Pierre Joye
d54710ae2f
- fix #60895 , possible invalid handler usage
2012-01-27 10:56:33 +00:00
Pierre Joye
4879a01b54
- fix #60895 , possible invalid handler usage
2012-01-27 10:56:33 +00:00
Pierre Joye
1e462057cd
- fix #60895 , possible invalid handler usage
2012-01-27 10:56:33 +00:00
Pierre Joye
07cf07df61
- openssl 0.9.8t, curl 7.24.0
2012-01-26 12:11:02 +00:00
Pierre Joye
d997e578b7
- openssl 0.9.8t, curl 7.24.0
2012-01-26 12:11:02 +00:00
Pierre Joye
9fa30bf52b
- openssl 0.9.8t, curl 7.24.0
2012-01-26 12:11:02 +00:00
Pierre Joye
993992d6db
- add new build type, optional. has been used for the last 2 RCs
2012-01-11 15:47:37 +00:00
Pierre Joye
612e73b00b
- add new build type, optional. has been used for the last 2 RCs
2012-01-11 15:46:45 +00:00
Pierre Joye
92120997c9
- add new build type, optional. has been used for the last 2 RCs
2012-01-11 15:46:45 +00:00
Pierre Joye
96e02805fb
- spl tests are also under examples (sigh)
2012-01-09 13:56:46 +00:00
Pierre Joye
7f2c8b347c
- spl tests are also under examples (sigh)
2012-01-09 13:56:46 +00:00
Pierre Joye
f6a7b27198
- spl tests are also under examples (sigh)
2012-01-09 13:56:46 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Pierre Joye
4e03e70575
- copy run-test php
2011-12-12 15:10:40 +00:00
Pierre Joye
9cfc56d445
- copy run-test php
2011-12-12 15:09:52 +00:00
Pierre Joye
cb4b1616b7
- copy run-test php
2011-12-12 15:09:52 +00:00
Pierre Joye
bb78412b07
- update libcurl to 7.21.7
2011-08-03 13:19:03 +00:00
Pierre Joye
38cb153c42
- update libcurl to 7.21.7
2011-08-03 13:19:03 +00:00
Pierre Joye
ab38726a59
- update libcurl to 7.21.7
2011-08-03 13:19:03 +00:00
Pierre Joye
9805e1674a
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
2011-07-22 11:25:30 +00:00
Pierre Joye
e825d1b579
- update libpng to 1.2.46
2011-07-19 10:22:42 +00:00
Pierre Joye
eccc017ab5
- update libpng to 1.2.46
2011-07-19 10:22:42 +00:00
Pierre Joye
101a9ee4e2
- update libpng to 1.2.46
2011-07-19 10:22:42 +00:00
Pierre Joye
58b7766aec
- not a good idea after all and did not do what I thought it should do
2011-07-18 12:00:08 +00:00
Pierre Joye
3c323a5d6d
- not a good idea after all and did not do what I thought it should do
2011-07-18 12:00:08 +00:00
Pierre Joye
731029a672
- fix decl
2011-07-14 10:54:39 +00:00
Pierre Joye
cf9aaf22ce
- fix decl
2011-07-14 10:54:39 +00:00
Pierre Joye
1655d6d4c7
- bind to the available crt version
2011-07-13 06:42:39 +00:00
Pierre Joye
29b47bbff4
- bind to the available crt version
2011-07-13 06:42:39 +00:00
Pierre Joye
b8251d54a8
- Bug #55169 , improve fix, allow non interactive user, hash-like ops only usage
2011-07-12 11:46:41 +00:00
Pierre Joye
96b5e69889
- Bug #55169 , improve fix, allow non interactive user, hash-like ops only usage
2011-07-12 11:46:41 +00:00
Pierre Joye
76285595b4
- Bug #55169 , improve fix, allow non interactive user, hash-like ops only usage
2011-07-12 11:46:41 +00:00
Pierre Joye
5d5951f247
- fix bug #55169 , mcrypt_create_iv always fails to gather sufficient random data
2011-07-10 14:36:32 +00:00
Pierre Joye
04432e7dd8
- fix bug #55169 , mcrypt_create_iv always fails to gather sufficient random data
2011-07-10 14:36:32 +00:00
Pierre Joye
4276fd63b5
- fix bug #55169 , mcrypt_create_iv always fails to gather sufficient random data
2011-07-10 14:36:32 +00:00
Pierre Joye
6ff1746371
- update libpng to 1.2.45
2011-07-10 02:20:34 +00:00
Pierre Joye
c6396dd9de
- update libpng to 1.2.45
2011-07-10 02:20:34 +00:00
Pierre Joye
c43276abd6
- fix nts build
2011-06-16 10:20:25 +00:00
Pierre Joye
25849ab967
- fix nts build
2011-06-16 10:20:25 +00:00
Pierre Joye
0ff4d7d811
- fix nts build
2011-06-16 10:20:25 +00:00
Pierre Joye
358316b2ed
- init win32 rng context once per process
2011-06-16 01:31:10 +00:00
Pierre Joye
23c4c46b36
- init win32 rng context once per process
2011-06-16 01:31:10 +00:00
Pierre Joye
1d357d964c
- init win32 rng context once per process
2011-06-16 01:31:10 +00:00
Pierre Joye
221a07b669
- initial import, will add all libs later
2011-05-19 13:36:29 +00:00
Pierre Joye
1920f5a690
- initial import, will add all libs later
2011-05-19 13:36:29 +00:00
Pierre Joye
1e2aa4416c
- initial import, will add all libs later
2011-05-19 13:36:29 +00:00
Pierrick Charron
1368364469
Fix common typos in the source code (Reported in Bug #54065 )
...
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Pierrick Charron
e8486cc374
Fix common typos in the source code (Reported in Bug #54065 )
...
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Pierre Joye
0625b3882d
- re enable static analyzer, crash fixed with snapshot builds
2011-03-28 10:55:34 +00:00
Pierre Joye
4ad6108b7d
- re enable static analyzer, crash fixed with snapshot builds
2011-03-28 10:55:34 +00:00
Moriyoshi Koizumi
a497999481
- Merge from trunk.
2011-03-02 18:35:10 +00:00
Moriyoshi Koizumi
f093c7db8d
- Enable windows build system to accept paths containing spaces.
2011-03-02 05:22:22 +00:00
Pierre Joye
afb36bb4eb
- missing
2011-02-10 21:42:13 +00:00
Pierre Joye
628e946411
- missing
2011-02-10 21:40:50 +00:00
Pierre Joye
555e42fb5a
- disable realloc warning about not checking its return value, 100% valid but way too many of them for now, reduce noises
2011-02-07 10:17:14 +00:00
Pierre Joye
312235cdac
- disable realloc warning about not checking its return value, 100% valid but way too many of them for now, reduce noises
2011-02-07 10:17:14 +00:00
Pierre Joye
0297128ace
- xp sp3 does not have them
2011-01-19 19:48:28 +00:00
Pierre Joye
1ec3ec1326
-disable the analyzer for the snapshot in 5.3 too
2011-01-13 19:44:00 +00:00
Pierre Joye
f9c61024a5
- do not enable analyzer for snapshot
2011-01-10 21:04:50 +00:00
Pierre Joye
639d3fbcfb
- possible NULL deref
2011-01-10 08:07:38 +00:00
Pierre Joye
f25ab1bf9c
- possible NULL deref
2011-01-10 08:07:38 +00:00
Pierre Joye
10a1f90ab0
- local redeclaration
2011-01-10 01:04:36 +00:00
Pierre Joye
f45b9c4a0b
- local redeclaration
2011-01-10 01:04:36 +00:00
Pierre Joye
eddd9b7510
- new sec flags should not be on by default for 5.3, yet
2011-01-09 21:41:54 +00:00
Pierre Joye
eda798fd7a
- add configure option to enable the builtin static analyzer (will be enabled for snaps' log)
2011-01-09 21:38:46 +00:00
Pierre Joye
0d3c6914ad
- add configure option to enable the builtin static analyzer (will be enabled for snaps' log)
2011-01-09 21:38:46 +00:00
Pierre Joye
92894b3a81
- debug code--
2011-01-09 15:19:03 +00:00
Pierre Joye
7c6310852e
- let try to fix pecl header install so we can do the same than unix, install them in ext/<extname> instead of pecl<extname>
2011-01-09 14:01:21 +00:00
Pierre Joye
fb6778c241
- let try to fix pecl header install so we can do the same than unix, install them in ext/<extname> instead of pecl<extname>
2011-01-09 14:01:21 +00:00
Pierre Joye
f3a4bfee8f
- enable ASLR and NXCOMPAT by default
2011-01-07 20:50:33 +00:00
Pierre Joye
55077a81f5
- define the php*.lib/dll names
2011-01-07 15:51:36 +00:00
Pierre Joye
cc6bb66dcd
- define the php*.lib/dll names
2011-01-07 15:51:36 +00:00
Pierre Joye
84b854a603
- revert rev. 307044
2011-01-05 00:59:31 +00:00
Pierre Joye
09d73b67e2
- revert rev. 307044
2011-01-05 00:59:31 +00:00
Kalle Sommer Nielsen
ec040e9657
Fixed linking of extensions that would use a static .lib file (libname_a.lib rather than libname.lib)
...
# This fixes `configure --with-mcrypt=shared' to properly find and
# link against libmcrypt.lib rather than libmcrypt_a.lib
2011-01-03 23:08:47 +00:00
Kalle Sommer Nielsen
79b997d7ba
Fixed linking of extensions that would use a static .lib file (libname_a.lib rather than libname.lib)
...
# This fixes `configure --with-mcrypt=shared' to properly find and
# link against libmcrypt.lib rather than libmcrypt_a.lib
2011-01-03 23:08:47 +00:00
Pierre Joye
b059dfa1e7
- prevent php(version)lib.(dll|lib) to be overriden
2011-01-03 01:22:07 +00:00
Pierre Joye
e9bb7bbbd1
- missing file
2011-01-03 01:22:00 +00:00
Pierre Joye
b4ae112dae
- we need the core config.w32 only once
2011-01-03 01:08:21 +00:00
Pierre Joye
7444576047
- we need the core config.w32 only once
2011-01-03 01:08:21 +00:00
Pierre Joye
f7176f9cf0
- silent copy
2011-01-03 01:07:28 +00:00
Pierre Joye
bfb9b6d06e
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
2011-01-02 18:29:56 +00:00
Pierre Joye
17d05d0d57
- use the ext deps list for phpize's ADD_EXTENSION_DEP function
2011-01-02 18:29:56 +00:00
Pierre Joye
ec3003ade1
- typo, and remove undesired committed part
2011-01-02 18:14:50 +00:00
Pierre Joye
6008152caa
- typo
2011-01-02 18:13:20 +00:00
Pierre Joye
5bd1fd410f
- typo
2011-01-02 18:13:20 +00:00
Pierre Joye
163780af56
- generate a list of ext and how they are built, should be updated by phpize'd make (un)install as well, later
2011-01-02 18:03:00 +00:00
Pierre Joye
f62ca3e4bf
- generate a list of ext and how they are built, should be updated by phpize'd make (un)install as well, later
2011-01-02 18:03:00 +00:00
Pierre Joye
e13c26a141
- fix ADD_EXTENSION_DEP detection
2011-01-01 20:00:21 +00:00
Pierre Joye
97c5d74d78
- missing file
2011-01-01 20:00:10 +00:00
Felipe Pena
927bf09c29
- Year++
2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Pierre Joye
c4f631b275
- we don't bundled fbclient, system version is used
2010-12-15 02:01:21 +00:00
Pierre Joye
18deebed4b
- we don't bundled fbclient, system version is used
2010-12-15 02:01:21 +00:00
Pierre Joye
c05b1228db
- typo
2010-12-15 00:39:07 +00:00
Pierre Joye
b25ded66ea
- sync with 5.3
2010-12-14 23:21:53 +00:00
Pierre Joye
f56ab54feb
- devel must be done before dist
2010-12-14 23:21:01 +00:00
Pierre Joye
f7b5a73383
- fix build with out of src obj dir
2010-12-14 23:09:31 +00:00
Pierre Joye
e2ea0f5d98
- we just reached the tiny cmd lenght limit, let reduce the size of dirs
2010-12-14 18:49:15 +00:00
Pierre Joye
e79ed6359d
- add nmake install-sdk (create the devel package) and related sub rules
2010-12-14 02:55:26 +00:00
Pierre Joye
d14417f8ea
- add nmake install-sdk (create the devel package) and related sub rules
2010-12-14 02:55:26 +00:00
Pierre Joye
12a3e339f4
- MFH trailing slashes detection
2010-12-13 20:57:06 +00:00
Pierre Joye
31f97e2440
- no need to diplay that
2010-12-13 20:56:44 +00:00
Pierre Joye
4df03c1ded
- phpize support merge from 5.3
2010-12-13 20:55:13 +00:00
Kalle Sommer Nielsen
15ee70e8e0
* Don't print the shared headers table after enabling each extension (cleaner configure output)
...
* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
2010-12-13 20:46:57 +00:00